Skip to content

X
xiaomai-cloud-class-web
Commit 5a7187a9 by zhangleyuan
Options

feat:处理选择同一张图片不被触发的问题

parent a5bd3f1c
Showing with 39 additions and 231 deletions
src/modules/course-manage/components/LiveCourseFilter.jsx
......@@ -178,7 +178,7 @@ class LiveCourseFilter extends React.Component {
<span>讲师：</span>
<Select
placeholder="请选择讲师"
style={{ width: 240, marginTop: 6 }}
style={{ width: 240}}
showSearch
allowClear
filterOption={(input, option) => option}
......@@ -214,7 +214,7 @@ class LiveCourseFilter extends React.Component {
value={courseState}
onChange={(value) => { this.handleChangeQuery('courseState', value) }}
>
<Option value="UN_START">待上课</Option>
<Option value="UN_START">待开课</Option>
<Option value="STARTING">上课中</Option>
<Option value="FINISH">已完成</Option>
<Option value="EXPIRED">未成功开课</Option>
......
src/modules/course-manage/components/LiveCourseFilter.less
......@@ -11,6 +11,12 @@
width: 30%;
margin-right: 3%;
margin-bottom: 12px;
.search-name{
vertical-align: middle;
display:inline-block;
height:32px;
line-height:32px;
}
}
}
.reset-fold-area {
......
src/modules/course-manage/components/LiveCourseList.jsx
......@@ -36,7 +36,7 @@ const { confirm } = Modal;
const courseStateShow = {
UN_START: {
code: 1,
title: "待上课",
title: "待开课",
color: "#FDBE31",
},
STARTING: {
......@@ -47,12 +47,12 @@ const courseStateShow = {
FINISH: {
code: 3,
title: "已完成",
color: "#2FC83C",
color: "#3BBDAA",
},
EXPIRED: {
code: 4,
title: "未成功开课",
color: "#CCCCCC",
color: "#999",
},
};
class LiveCourseList extends React.Component {
......@@ -181,6 +181,7 @@ class LiveCourseList extends React.Component {
<>
<span className="split"> | </span>
<span className="assistant">助教：
{ record.admins.map((item,index)=>{
return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
})
......@@ -218,7 +219,7 @@ class LiveCourseList extends React.Component {
editData: item,
openCoursewareModal: true,
});
}}>{item.courseDocumentCount}</span>
}}>{item.courseDocumentCount}个</span>
);
},
},
......
src/modules/course-manage/components/LiveCourseList.less
......@@ -17,6 +17,10 @@
color: #333333;
line-height: 20px;
font-weight: bold;
max-width:238px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.course-time{
font-size: 12px;
......@@ -35,12 +39,28 @@
.teacher{
font-size: 12px;
color: #666666;
line-height: 20px;
// .teacher-name{
// max-width:60px;
// display:inline-block;
// overflow: hidden;
// text-overflow:ellipsis;
// white-space: nowrap;
// height:16px;
// line-height:16px;
// }
}
.assistant{
font-size: 12px;
color: #666666;
line-height: 20px;
// .assistant-name{
// max-width:60px;
// display:inline-block;
// overflow: hidden;
// text-overflow:ellipsis;
// white-space: nowrap;
// height:16px;
// line-height:16px;
// }
}
.split {
margin: 0 4px;
......@@ -56,6 +76,7 @@
font-size: 14px;
color: #5289FA;
line-height: 20px;
text-align:right;
}
.quota-icon{
color:#5289FA;
......
src/modules/course-manage/modal/PreviewCourseModal.jsx
......@@ -14,7 +14,7 @@ import './PreviewCourseModal.less';
const courseStateShow = {
UN_START: {
title: "待上课",
title: "待开课",
},
STARTING: {
title: "上课中",
......
src/modules/personalInfo/index.tsx
......@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-22 15:29:22
* @LastEditTime: 2020-12-28 14:27:02
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -113,6 +113,7 @@ function PersonalInfoPage() {
<input
type="file"
accept="image/*"
value={''}
id="CrpperAvatarPic"
style={{ display: 'none' }}
onChange={_handleUpdateAvatar} />
......
src/modules/store-manege/StoreDecorationPage.tsx deleted 100644 → 0
/*
* @Author: wufan
* @Date: 2020-11-30 10:47:38
* @LastEditors: wufan
* @LastEditTime: 2020-11-30 17:35:24
* @Description: 员工管理页面
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
import React, { useEffect, useState } from "react";
import { withRouter } from "react-router-dom";
import _ from "underscore";
import PageControl from "@/components/PageControl";
import {
Table,
Modal,
message,
Row,
Col,
Input,
DatePicker,
Button,
} from "antd";
import { QuestionCircleOutlined } from "@ant-design/icons";
import StoreService from "@/domains/store-domain/storeService";
import "./StoreDecorationPage.less";
import moment from "moment";
const { confirm } = Modal;
const { Search } = Input;
const { RangePicker } = DatePicker;
declare var window: any;
interface RecordTypes {
storeUserId: string;
role: string;
}
function StoreDecorationPage() {
const [storeDecorationlist, setStoreDecorationlist] = useState([
{
name: "赵云",
phone: "18767118672",
role: "0",
storeUserId: "",
},
{
name: "吕布",
phone: "18767118672",
role: "0",
storeUserId: "",
},
]);
const [query, setQuery] = useState({
current: 0,
size: 10,
name: "",
phone: "",
identity: "ALL",
instId: "1837447" || window.currentUserInstInfo.instId,
registerStartDate: null,
registerEndDate: null,
});
const [total, setTotal] = useState(0);
const [model, setModel] = useState(null);
const [isModalOpen, setIsModalOpen] = useState(false);
const [isManager, setIsManager] = useState(true);
const [isNormal, setIsNormal] = useState(true);
const [choosedItem, setChooseItem] = useState({});
useEffect(() => {
// getStoreDecorationList();
}, [query]);
function getStoreDecorationList() {
let _query = _.clone(query);
_query.current = query.current + 1;
StoreService.getStoreDecorationList(_query).then((res: any) => {
console.log(res.result.records);
setStoreDecorationlist(res.result.records);
setTotal(res.result.total);
});
}
function handleReplaceDecoration(record: RecordTypes) {}
function handleDeleteDecoration(record: RecordTypes) {}
function handleDeleteDecorationConfirm(record: RecordTypes) {
return confirm({
title: "你确定要删除这个banner吗？",
icon: <span className="icon iconfont default-confirm-icon">&#xe839; </span>,
okText: "删除",
cancelText: "取消",
onOk: () => {
handleDeleteDecoration(record);
},
});
}
function parseColumn() {
return [
{
title: "用户姓名",
dataIndex: "name",
render: (val: string) => {
return (
<div className="coupon-info">
<span className="title">{val}</span>
</div>
);
},
},
{
title: "手机号",
dataIndex: "phone",
key: "phone",
render: (val: string) => {
return <div>{val}</div>;
},
},
{
title: "注册时间",
dataIndex: "registerDate",
key: "registerDate",
render: (val: string) => {
return <div>{moment(val).format("YYYY-MM-DD HH:mm:ss")}</div>;
},
},
{
title: "操作",
dataIndex: "operation",
render: (val: string, record: RecordTypes) => {
return record.role === "" || record.role === "1" ? (
<div className="no-operate">-</div>
) : (
<div className="operation">
<span
className="edit"
onClick={() => handleReplaceDecoration(record)}
>
替换
</span>
<span className="divider-line">{" | "}</span>
<span
className="delete"
onClick={() => handleDeleteDecoration(record)}
>
删除
</span>
</div>
);
},
},
];
}
function handleQuery(name: string, value: any) {
const _query = _.clone(query);
// _query[name] = value;
setQuery(_query);
}
function handleToAddStoreDecoration() {}
return (
<div className="page user-manage-page">
<div className="page-content">
<div className="content-header">店铺装修</div>
<div className="box">
<div className="box-header">
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "space-between",
padding: "15px 0 10px",
}}
>
<div style={{ flex: 1 }}>banner设置</div>
</div>
<Button
onClick={() => {
handleToAddStoreDecoration();
}}
type="primary"
className="add-show-btn"
>
添加Banner
</Button>
</div>
<div className="box-body">
<Table
size={"middle"}
pagination={false}
dataSource={storeDecorationlist}
columns={parseColumn()}
rowKey={(item: any) => item.id}
bordered
/>
</div>
<div className="box-footer">
<PageControl
current={query.current}
pageSize={query.size}
total={total}
toPage={(page) => {
const queryStates = _.clone(query);
queryStates.current = page;
setQuery(queryStates);
}}
/>
</div>
</div>
</div>
</div>
);
}
export default withRouter(StoreDecorationPage);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment