Skip to content

B
biz.qingxiao.com
Commit 2234ddbd authored by wangxuelai's avatar wangxuelai
Browse files
Options

Merge branch 'master' into wxl-develop

parents c2a226cd 1c8aa9a3
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 3 deletions
index.ejs
View file @ 2234ddbd
......@@ -14,7 +14,7 @@
</head>
</head>
<body>
<div id="root">sssssssssss</div>
<div id="root"></div>
<%= htmlWebpackPlugin.options.files.footer.js.map((item) => {
return `<script src="${_CDN_}${item}" charset="utf-8"></script>`
}) %>
......
index.html
View file @ 2234ddbd
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>轻校</title><link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0;" name="viewport"><meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills --><!--[if lt IE 10]>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>轻校</title>
<link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png">
<meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0;" name="viewport">
<meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills -->
<!--[if lt IE 10]>
<script src="js/console-polyfill.js"></script>
<![endif]--><script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1571385192191" rel="stylesheet"><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20191012" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20191012" charset="utf-8"></script></head><body><div id="root"></div><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?1571385192191" charset="utf-8"></script></body></html>
\ No newline at end of file
<![endif]-->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script>
<link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1571465588776" rel="stylesheet">
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20191012" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20191012" charset="utf-8"></script>
</head>
<body>
<div id="root"></div>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.js?1571465588776" charset="utf-8"></script>
</body>
</html>
\ No newline at end of file
src/pages/classmgt/index.js
View file @ 2234ddbd
......@@ -385,6 +385,8 @@ class ClassMgtForm extends React.Component {
payload: {
inviteClassInfo: {},
classrRgistrationShow: false,
classInviteqrcodeUrl: '',
classInviteqrcodeUrl2: '',
},
});
}
......
src/pages/student/RepeatStudent.js 0 → 100644
View file @ 2234ddbd
import { connect } from 'dva';
import React from 'react';
import { Button, Row, Col, Input, InputNumber, Select, Table, Modal, Form } from 'antd';
import pageStyle from './RepeatStudent.less';
import { pageIn, imagify } from '../../utils/index';
const { Option } = Select;
const { TextArea } = Input;
class RepeatStudent extends React.Component {
state = {
};
componentDidMount() { // 挂载
}
componentDidUpdate() {
}
componentWillUnmount() { // 卸载
}
render() {
const { visible, onCancel, onOk } = this.props;
const columns = [
{
title: '姓名',
dataIndex: 'name',
key: 'name',
},
{
title: '性别',
dataIndex: 'sex',
key: 'sex',
},
{
title: '手机号',
dataIndex: 'mobile',
key: 'mobile',
},
{
title: '课程',
dataIndex: 'course',
key: 'course',
},
{
title: '班级',
dataIndex: 'class',
key: 'class',
},
{
title: '录入时间',
dataIndex: 'time',
key: 'time',
},
];
const courseModuleList = [{
name: '汪雪来',
sex: '男',
mobile: '15258813926',
course: '课程',
class: '班级',
time: '2015-09-08',
}];
return (
<div>
<Modal
visible={visible}
title="发现可能重复的学员"
zIndex={110}
cancelText="是新学员，继续录入"
okText="和所选学员是同一人"
width={800}
bodyStyle={{ paddingBottom: 0 }}
onOk={onOk}
onCancel={onCancel}
>
<Table
dataSource={courseModuleList}
columns={columns}
pagination={false}
className={`${pageStyle.repeatStudentTable} repeatStudentTable`}
/>
</Modal>
</div>
);
}
}
RepeatStudent.propTypes = {
};
export default RepeatStudent;
src/pages/student/RepeatStudent.less 0 → 100644
View file @ 2234ddbd
:global {
.repeatStudentTable {
.ant-table-tbody {
.ant-table-row {
td {
border-bottom: none;
}
}
}
}
}
\ No newline at end of file
src/pages/student/index.js
View file @ 2234ddbd
......@@ -12,6 +12,7 @@ import StudentAdd from './StudentAdd';
import Cropper from '../../components/Cropper';
import QrcodeShow from '../../components/qrcodeShow';
import InviteCodeDialog from '../../components/InviteCodeDialog';
import RepeatStudent from './RepeatStudent';
const { Option } = Select;
const { TextArea } = Input;
class StudentMgt extends React.Component {
......@@ -576,6 +577,7 @@ class StudentMgt extends React.Component {
inviteCodeShow,
inviteCode,
Inviteloading,
repeatStudentShow,
} = this.props;
const { qrCodeTitle, isExpendMore } = this.state;
const columns = [
......@@ -930,6 +932,11 @@ class StudentMgt extends React.Component {
previewQrcode={inviteCode}
type={2}
/>
<RepeatStudent
visible={repeatStudentShow}
onCancel={this.cancelAddRepeatStudent}
onOk={this.sureAddRepeatStudent}
/>
</div>
);
......@@ -986,6 +993,7 @@ function mapStateToProps(state) {
inviteCode,
Inviteloading,
// 续课的逻辑代码
repeatStudentShow,
} = state.students;
const {
schoolUserInfo,
......@@ -1035,6 +1043,7 @@ function mapStateToProps(state) {
inviteCode,
Inviteloading,
// 续课的逻辑代码
repeatStudentShow,
};
}
export default connect(mapStateToProps)(ForgotPassword);
......
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