Skip to content

B
biz.qingxiao.com
Commit 82157be3 authored by wangxuelai's avatar wangxuelai
Browse files
Options

''

parent 1f13bb04
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 56 deletions
index.html
View file @ 82157be3
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>轻校</title> <title>轻校</title>
<link rel="shortcut icon" href="https://cdn.img.shangjiadao.cn/qingxiao/biz/image/qxlogo4.png"> <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 content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"><!-- Polyfills --> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Polyfills -->
<!--[if lt IE 10]> <!--[if lt IE 10]>
<script src="js/console-polyfill.js"></script> <script src="js/console-polyfill.js"></script>
<![endif]--> <![endif]-->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script> <script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script>
<link href="/dist/index.css?1567756008842" rel="stylesheet"> <link href="dist/index.css?1567838609609" rel="stylesheet">
<script src="/lib/vendor.dll.js?3" charset="utf-8"></script> <script src="lib/vendor.dll.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?3" charset="utf-8"></script> </head>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?3" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?3" charset="utf-8"></script>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script src="/dist/index.js?1567756008842" charset="utf-8"></script> <script src="dist/index.js?1567838609609" charset="utf-8"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/models/officialweb.js
View file @ 82157be3
...@@ -540,7 +540,7 @@ export default { ...@@ -540,7 +540,7 @@ export default {
}); });
} }
if (data.code == 200) { if (data.code == 200) {
message.success('保存成功', 1); message.success(`${values.switch == 1 ? '开启' : '关闭'}成功`, 1);
course.id = data.data.id; course.id = data.data.id;
newpageInfo.forEach((ele) => { newpageInfo.forEach((ele) => {
const element = ele; const element = ele;
......
src/models/usersetting.js
View file @ 82157be3
...@@ -58,6 +58,13 @@ export default { ...@@ -58,6 +58,13 @@ export default {
businessIsBind: businessInfoData.data.consumer_id != 0, businessIsBind: businessInfoData.data.consumer_id != 0,
}, },
}); });
} else {
yield put({
type: 'webapp/errorrequestresolve',
payload: {
data: businessInfoData,
},
});
} }
}, },
* getverifycode({ payload }, { call, put, select }) { * getverifycode({ payload }, { call, put, select }) {
......
src/pages/SjdIndex.js
View file @ 82157be3
...@@ -103,20 +103,6 @@ class SjdIndex extends React.Component { ...@@ -103,20 +103,6 @@ class SjdIndex extends React.Component {
</Content> </Content>
</Layout> </Layout>
</Layout> </Layout>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 2}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.goSchoollist}>确定</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>暂无权限</span>
</div>
</Modal>
<Modal <Modal
title="温馨提示" title="温馨提示"
style={{ top: 20 }} style={{ top: 20 }}
......
src/pages/index/index.js
View file @ 82157be3
...@@ -523,11 +523,11 @@ class StaticCenter extends React.Component { ...@@ -523,11 +523,11 @@ class StaticCenter extends React.Component {
<span>待办事项</span> <span>待办事项</span>
</div> </div>
<div className={pageStyle.items}> <div className={pageStyle.items}>
{renew.total > -1 && <div className={pageStyle.renew} onClick={this.goDeadlineStudent}><span>续费</span>有{renew.total || 0}名学员的课时即将到期</div>} {renew.total > 0 && <div className={pageStyle.renew} onClick={this.goDeadlineStudent}><span>续费</span>有{renew.total || 0}名学员的课时即将到期</div>}
{birthday.total > -1 && <div className={pageStyle.birthday} onClick={this.goBirthStudent}><span>生日</span>本日有{birthday.total || 0}名学员生日待祝福</div>} {birthday.total > 0 && <div className={pageStyle.birthday} onClick={this.goBirthStudent}><span>生日</span>本日有{birthday.total || 0}名学员生日待祝福</div>}
{callData.total > -1 && <div className={pageStyle.birthday} onClick={this.goCallStudent}><span>点名</span>本周有{callData.total || 0}个课时尚未点名</div>} {callData.total > 0 && <div className={pageStyle.birthday} onClick={this.goCallStudent}><span>点名</span>本周有{callData.total || 0}个课时尚未点名</div>}
{assign.total > -1 && <div className={pageStyle.birthday} onClick={this.goPlanStudent}><span>分配</span>有{assign.total || 0}名学员未安排班级</div>} {assign.total > 0 && <div className={pageStyle.birthday} onClick={this.goPlanStudent}><span>分配</span>有{assign.total || 0}名学员未安排班级</div>}
{scheduleCount > -1 && <div className={pageStyle.birthday} onClick={this.goPlanClass}><span>排课</span>有{scheduleCount}个班级课表即将结束</div>} {scheduleCount > 0 && <div className={pageStyle.birthday} onClick={this.goPlanClass}><span>排课</span>有{scheduleCount}个班级课表即将结束</div>}
</div> </div>
</div> </div>
</div> </div>
......
src/pages/joinschooladd/index.js
View file @ 82157be3
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Row, Col, Form, Input, Button } from 'antd'; import { Row, Col, Form, Input, Button, Modal, Icon } from 'antd';
import pageStyles from './index.less'; import pageStyles from './index.less';
import { pageIn } from '../../utils/index'; import { pageIn } from '../../utils/index';
const { Search } = Input; const { Search } = Input;
...@@ -74,7 +74,9 @@ class JoinSchoolAddForm extends React.Component { ...@@ -74,7 +74,9 @@ class JoinSchoolAddForm extends React.Component {
} }
render() { render() {
const { getFieldDecorator, getFieldValue } = this.props.form; const { getFieldDecorator, getFieldValue } = this.props.form;
const { codeArr, title, schoolSubmiting } = this.props; const {
codeArr, title, schoolSubmiting, globalErrorType,
} = this.props;
const { pwdvisible, thistitle } = this.state; const { pwdvisible, thistitle } = this.state;
const formItemLayout = { const formItemLayout = {
labelCol: { labelCol: {
...@@ -178,6 +180,34 @@ class JoinSchoolAddForm extends React.Component { ...@@ -178,6 +180,34 @@ class JoinSchoolAddForm extends React.Component {
</Row> </Row>
</Form> </Form>
</div> </div>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 1}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>重新登录</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>登录信息过期，请重新登录</span>
</div>
</Modal>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 3}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>退出</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>账号已关闭</span>
</div>
</Modal>
</div> </div>
); );
} }
...@@ -193,10 +223,12 @@ function mapStateToProps(state) { ...@@ -193,10 +223,12 @@ function mapStateToProps(state) {
title, title,
schoolSubmiting, schoolSubmiting,
} = state.joinschooladd; } = state.joinschooladd;
const { globalErrorType } = state.webapp;
return { return {
codeArr, codeArr,
title, title,
schoolSubmiting, schoolSubmiting,
globalErrorType,
}; };
} }
export default connect(mapStateToProps)(JoinSchoolAdd); export default connect(mapStateToProps)(JoinSchoolAdd);
src/pages/officialweb/editor.js
View file @ 82157be3
...@@ -84,6 +84,17 @@ class Officialweb extends React.Component { ...@@ -84,6 +84,17 @@ class Officialweb extends React.Component {
type: 'officialweb/previewofficialweb', type: 'officialweb/previewofficialweb',
}); });
} }
courseSwitch = (e) => {
const { dispatch } = this.props;
dispatch({
type: 'officialweb/courseinfopost',
payload: {
values: {
switch: e ? 1 : 2,
},
},
});
}
render() { render() {
const { const {
pageInfo, pageInfo,
...@@ -94,6 +105,7 @@ class Officialweb extends React.Component { ...@@ -94,6 +105,7 @@ class Officialweb extends React.Component {
previewQrcodeShow, previewQrcodeShow,
previewQrcode, previewQrcode,
course, course,
coursePostStatus,
} = this.props; } = this.props;
let renderDom; let renderDom;
const newPageInfo = pageInfo; const newPageInfo = pageInfo;
...@@ -105,11 +117,13 @@ class Officialweb extends React.Component { ...@@ -105,11 +117,13 @@ class Officialweb extends React.Component {
return ( return (
<div className={pageStyle.container}> <div className={pageStyle.container}>
<div className={pageStyle.mobilecontainer}> <div className={pageStyle.mobilecontainer}>
<div className={pageStyle.floatcoursebox}> {/*
<div className={pageStyle.floatcoursebox}>
<Course <Course
course={course} course={course}
/> />
</div> </div>
*/}
{ {
newPageInfo.map((ele, index) => { newPageInfo.map((ele, index) => {
switch (ele.type) { switch (ele.type) {
...@@ -182,6 +196,8 @@ class Officialweb extends React.Component { ...@@ -182,6 +196,8 @@ class Officialweb extends React.Component {
<Course <Course
course={ele.data} course={ele.data}
showStatus showStatus
courseSwitch={this.courseSwitch}
coursePostStatus={coursePostStatus}
/> />
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>} {dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div> </div>
...@@ -193,11 +209,11 @@ class Officialweb extends React.Component { ...@@ -193,11 +209,11 @@ class Officialweb extends React.Component {
{index == (newPageInfo.length - 1) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>} {index == (newPageInfo.length - 1) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div> </div>
*/} */}
{moduleSelect == index && {/* moduleSelect == index &&
<div className={pageStyle.editbox}> <div className={pageStyle.editbox}>
<CourseEditor /> <CourseEditor />
</div> </div>
} */}
</div> </div>
); );
break; break;
...@@ -216,8 +232,8 @@ class Officialweb extends React.Component { ...@@ -216,8 +232,8 @@ class Officialweb extends React.Component {
</div> </div>
{moduleSelect == index && {moduleSelect == index &&
<div className={pageStyle.blockOperateBox}> <div className={pageStyle.blockOperateBox}>
{index == 2 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>} {index == 3 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 2 && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'up')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>} {index > 3 && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'up')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index < (newPageInfo.length - 1) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>} {index < (newPageInfo.length - 1) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 1) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>} {index == (newPageInfo.length - 1) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div> </div>
...@@ -240,8 +256,8 @@ class Officialweb extends React.Component { ...@@ -240,8 +256,8 @@ class Officialweb extends React.Component {
</div> </div>
{moduleSelect == index && {moduleSelect == index &&
<div className={pageStyle.blockOperateBox}> <div className={pageStyle.blockOperateBox}>
{index == 2 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>} {index == 3 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 2 && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'up')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>} {index > 3 && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'up')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index < (newPageInfo.length - 1) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>} {index < (newPageInfo.length - 1) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 1) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>} {index == (newPageInfo.length - 1) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div> </div>
...@@ -289,6 +305,7 @@ function mapStateToProps(state) { ...@@ -289,6 +305,7 @@ function mapStateToProps(state) {
previewQrcodeShow, previewQrcodeShow,
previewQrcode, previewQrcode,
course, course,
coursePostStatus,
} = state.officialweb; } = state.officialweb;
const { const {
cropperboxShow, cropperboxShow,
...@@ -305,6 +322,7 @@ function mapStateToProps(state) { ...@@ -305,6 +322,7 @@ function mapStateToProps(state) {
previewQrcodeShow, previewQrcodeShow,
previewQrcode, previewQrcode,
course, course,
coursePostStatus,
}; };
} }
export default connect(mapStateToProps)(Officialweb); export default connect(mapStateToProps)(Officialweb);
......
src/pages/officialweb/pagecomponent/Course.js
View file @ 82157be3
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Carousel } from 'antd'; import { Carousel, Switch } from 'antd';
import PageStyle from './Course.less'; import PageStyle from './Course.less';
import { imagify } from '../../../utils'; import { imagify } from '../../../utils';
function Course(props) { function Course(props) {
const { course, showStatus } = props; const {
course, showStatus, courseSwitch, coursePostStatus,
} = props;
// {showStatus && <div className={`${PageStyle.courseStatue} ${course.switch == 1 ? PageStyle.courseopen : PageStyle.courseclose}`}>{course.switch == 1 && '开启'}{course.switch == 2 && '关闭'}</div>}
return ( return (
<div className={PageStyle.Coursecontainer}> <div className={PageStyle.Coursecontainer}>
{showStatus && <div className={`${PageStyle.courseStatue} ${course.switch == 1 ? PageStyle.courseopen : PageStyle.courseclose}`}>{course.switch == 1 && '开启'}{course.switch == 2 && '关闭'}</div>} {showStatus &&
<div className={PageStyle.courseStatue}>
<Switch
onChange={courseSwitch}
checked={course.switch == 1}
checkedChildren="开"
unCheckedChildren="关"
loading={coursePostStatus}
/>
</div>
}
<div className={PageStyle.Coursebox}> <div className={PageStyle.Coursebox}>
<img className={PageStyle.clockicon} src={`${__IMGCDN__}floatclockicon.png`} alt="" /> <img className={PageStyle.clockicon} src={`${__IMGCDN__}floatclockicon.png`} alt="" />
<span>立即预约，免费领取试听课</span> <span>立即预约，免费领取试听课</span>
......
src/pages/officialweb/pagecomponent/Course.less
View file @ 82157be3
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
} }
.courseStatue { .courseStatue {
position: absolute; position: absolute;
top: 50%; top: 4px;
transform: translateY(-50%); // transform: translateY(-50%);
right: 4px; left: 4px;
width: 40px; width: 40px;
height: 24px; height: 24px;
font-size: 12px; font-size: 12px;
......
src/pages/schooladd/index.js
View file @ 82157be3
import fetchJsonp from 'fetch-jsonp'; import fetchJsonp from 'fetch-jsonp';
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Row, Col, Form, Input, Button, Checkbox, message, Modal, Cascader } from 'antd'; import { Row, Col, Form, Input, Button, Checkbox, message, Modal, Cascader, Icon } from 'antd';
import pageStyles from './index.less'; import pageStyles from './index.less';
import { LocalStorage, SessionStorage, pageIn, getRandomString } from '../../utils/index'; import { LocalStorage, SessionStorage, pageIn, getRandomString } from '../../utils/index';
import disData from '../../common/dis.data'; import disData from '../../common/dis.data';
...@@ -380,6 +380,7 @@ class SchoolAddForm extends React.Component { ...@@ -380,6 +380,7 @@ class SchoolAddForm extends React.Component {
locationAddress, locationAddress,
mobile, mobile,
form, form,
globalErrorType,
} = this.props; } = this.props;
const { const {
location, location,
...@@ -584,6 +585,34 @@ class SchoolAddForm extends React.Component { ...@@ -584,6 +585,34 @@ class SchoolAddForm extends React.Component {
</div> </div>
</Form> </Form>
</Modal> </Modal>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 1}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>重新登录</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>登录信息过期，请重新登录</span>
</div>
</Modal>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 3}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>退出</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>账号已关闭</span>
</div>
</Modal>
</div> </div>
); );
} }
...@@ -602,6 +631,7 @@ function mapStateToProps(state) { ...@@ -602,6 +631,7 @@ function mapStateToProps(state) {
latitude, latitude,
mobile, mobile,
} = state.schooladd; } = state.schooladd;
const { globalErrorType } = state.webapp;
return { return {
categorys, categorys,
selectcategorys, selectcategorys,
...@@ -609,6 +639,7 @@ function mapStateToProps(state) { ...@@ -609,6 +639,7 @@ function mapStateToProps(state) {
longitude, longitude,
latitude, latitude,
mobile, mobile,
globalErrorType,
}; };
} }
export default connect(mapStateToProps)(SchoolAdd); export default connect(mapStateToProps)(SchoolAdd);
src/pages/schoollist/index.js
View file @ 82157be3
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Row, Col, Form, Input, Button, Modal } from 'antd'; import { Row, Col, Form, Input, Button, Modal, Icon } from 'antd';
import pageStyles from './index.less'; import pageStyles from './index.less';
import { pageIn, imagify } from '../../utils/index'; import { pageIn, imagify } from '../../utils/index';
const { Search } = Input; const { Search } = Input;
...@@ -101,6 +101,15 @@ class JoinSchoolAddForm extends React.Component { ...@@ -101,6 +101,15 @@ class JoinSchoolAddForm extends React.Component {
}, },
}); });
} }
signout = () => {
const { dispatch } = this.props;
dispatch({
type: 'webapp/signout',
payload: {
dispatch,
},
});
}
render() { render() {
const { const {
schoolList, schoolList,
...@@ -108,6 +117,7 @@ class JoinSchoolAddForm extends React.Component { ...@@ -108,6 +117,7 @@ class JoinSchoolAddForm extends React.Component {
inviateTeacherList, inviateTeacherList,
userInfo, userInfo,
stronghold, stronghold,
globalErrorType,
} = this.props; } = this.props;
return ( return (
<Row className={`${pageStyles.container} schoollistcontainer`}> <Row className={`${pageStyles.container} schoollistcontainer`}>
...@@ -211,6 +221,34 @@ class JoinSchoolAddForm extends React.Component { ...@@ -211,6 +221,34 @@ class JoinSchoolAddForm extends React.Component {
</Row> </Row>
</Row> </Row>
</Row> </Row>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 1}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>重新登录</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>登录信息过期，请重新登录</span>
</div>
</Modal>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 3}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>退出</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>账号已关闭</span>
</div>
</Modal>
</Row> </Row>
); );
} }
...@@ -229,6 +267,7 @@ function mapStateToProps(state) { ...@@ -229,6 +267,7 @@ function mapStateToProps(state) {
} = state.schoollist; } = state.schoollist;
const { const {
userInfo, userInfo,
globalErrorType,
} = state.webapp; } = state.webapp;
return { return {
schoolList, schoolList,
...@@ -236,6 +275,7 @@ function mapStateToProps(state) { ...@@ -236,6 +275,7 @@ function mapStateToProps(state) {
inviateTeacherList, inviateTeacherList,
userInfo, userInfo,
stronghold, stronghold,
globalErrorType,
}; };
} }
export default connect(mapStateToProps)(JoinSchoolAdd); export default connect(mapStateToProps)(JoinSchoolAdd);
src/pages/usersetting/index.js
View file @ 82157be3
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { Row, Col, Modal, Form, Input, Button, message } from 'antd'; import { Row, Col, Modal, Form, Input, Button, message, Icon } from 'antd';
import pageStyles from './index.less'; import pageStyles from './index.less';
import BindWx from './BindWx'; import BindWx from './BindWx';
import UpdateNickname from './UpdateNickname'; import UpdateNickname from './UpdateNickname';
...@@ -240,6 +240,7 @@ class UserSettingForm extends React.Component { ...@@ -240,6 +240,7 @@ class UserSettingForm extends React.Component {
checkoutVerifyCode, checkoutVerifyCode,
nicknameChangeShow, nicknameChangeShow,
nicknameSubmitting, nicknameSubmitting,
globalErrorType,
} = this.props; } = this.props;
const { getFieldDecorator } = this.props.form; const { getFieldDecorator } = this.props.form;
return ( return (
...@@ -411,6 +412,34 @@ class UserSettingForm extends React.Component { ...@@ -411,6 +412,34 @@ class UserSettingForm extends React.Component {
onCancel={() => this.toupdateNickanem(false)} onCancel={() => this.toupdateNickanem(false)}
nicknameSubmitting={nicknameSubmitting} nicknameSubmitting={nicknameSubmitting}
/> />
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 1}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>重新登录</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>登录信息过期，请重新登录</span>
</div>
</Modal>
<Modal
title="温馨提示"
style={{ top: 20 }}
visible={globalErrorType == 3}
maskStyle={{ zIndex: 1003 }}
zIndex={1004}
closable={false}
footer={<div><Button onClick={this.signout}>退出</Button></div>}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Icon type="info-circle" style={{ color: '#faad14', fontSize: '30px', marginRight: '10px' }} />
<span>账号已关闭</span>
</div>
</Modal>
</Row> </Row>
); );
} }
...@@ -429,6 +458,7 @@ function mapStateToProps(state) { ...@@ -429,6 +458,7 @@ function mapStateToProps(state) {
} = state.uploader; } = state.uploader;
const { const {
userInfo, userInfo,
globalErrorType,
} = state.webapp; } = state.webapp;
const { const {
counting, counting,
...@@ -467,6 +497,7 @@ function mapStateToProps(state) { ...@@ -467,6 +497,7 @@ function mapStateToProps(state) {
checkoutVerifyCode, checkoutVerifyCode,
nicknameChangeShow, nicknameChangeShow,
nicknameSubmitting, nicknameSubmitting,
globalErrorType,
}; };
} }
export default connect(mapStateToProps)(UserSetting); export default connect(mapStateToProps)(UserSetting);
src/services/indexstaic.js
View file @ 82157be3
...@@ -25,9 +25,10 @@ export function birthday({ schoolId }) { ...@@ -25,9 +25,10 @@ export function birthday({ schoolId }) {
method: 'GET', method: 'GET',
}); });
} }
export function todoSchedule({ school_id }) { export function todoSchedule(params) {
const data = qs.stringify(params);
return request({ return request({
url: `${api.todo.todoSchedule}?school_id=${school_id}`, url: `${api.todo.todoSchedule}?${data}`,
method: 'GET', method: 'GET',
}); });
} }
......
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