Commit fe33b876 authored by wangxuelai's avatar wangxuelai

''

parent 55fc20c1
<!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="/dist/index.css?1568635868013" rel="stylesheet">
<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>
<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>
<body>
<div id="root"></div>
<script src="/dist/index.js?1568635868013" 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="/dist/index.css?1568709830922" rel="stylesheet"><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><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><body><div id="root"></div><script src="/dist/index.js?1568709830922" charset="utf-8"></script></body></html>
\ No newline at end of file
......@@ -4,15 +4,15 @@ const basepath = `${location.protocol}//${pathify(window.location.host)}/`;
let api = '';
let dakaapi = '';
if (ENVIRONMENT == 'pro') {
// api = 'https://test.wp53.cn/v2/api/';
// dakaapi = 'https:clock.wp53.cn/v3/';
api = 'https://wx.m.shangjiadao.cn/v2/api/';
dakaapi = 'https://qxapi.qingxiao.online/daka/v3/';
} else if (ENVIRONMENT == 'dev') {
// api = 'https://wx.m.shangjiadao.cn/v2/api/';
// dakaapi = 'https://qxapi.qingxiao.online/daka/v3/';
api = 'https://test.wp53.cn/v2/api/';
dakaapi = 'https:clock.wp53.cn/v3/';
// api = 'https://wx.m.shangjiadao.cn/v2/api/';
// dakaapi = 'https://qxapi.qingxiao.online/daka/v3/';
} else if (ENVIRONMENT == 'dev') {
api = 'https://wx.m.shangjiadao.cn/v2/api/';
dakaapi = 'https://qxapi.qingxiao.online/daka/v3/';
// api = 'https://test.wp53.cn/v2/api/';
// dakaapi = 'https:clock.wp53.cn/v3/';
} else if (ENVIRONMENT == 'testenv') {
api = 'https://test.wp53.cn/v2/api/';
dakaapi = 'https:clock.wp53.cn/v3/';
......
......@@ -102,11 +102,18 @@ export default {
id: departmentid,
});
setTimeout(loadmessage);
yield put({
type: 'updateState',
payload: {
datetime: headquarterDetailData.datetime,
},
});
if (headquarterDetailData.code == 200) {
yield put({
type: 'updateState',
payload: {
sid,
datetime: headquarterDetailData.datetime,
headquarterDetail: headquarterDetailData.data.list || {},
},
});
......@@ -129,7 +136,7 @@ export default {
setTimeout(loadmessage);
if (headquarterDeteleData.code == 200) {
yield put({
type: 'updateState',
type: 'headquarterModelDetail',
payload: {
},
});
......
......@@ -25,6 +25,7 @@ export default {
school_titles: [],
expend_count: [0, 0, 0, 0, 0, 0, 0],
},
datetime: '',
},
subscriptions: {
setup({ dispatch, history }) { // eslint-disable-line
......
......@@ -46,7 +46,35 @@ class HeadquarterMgtForm extends React.Component {
});
}
goSchoolSystem = (school) => {
const { dispatch } = this.props;
const { dispatch, datetime } = this.props;
if (school.school.expire_time && new Date(datetime.replace(/\-/g, '/')).getTime() >= new Date(school.school.expire_time.replace(/\-/g, '/')).getTime()) {
Modal.error({
title: '该校区已过期',
okText: '确 定',
closable: false,
maskClosable: false,
centered: true,
okButtonProps: {
type: 'danger',
style: {
color: '#fff',
backgroundColor: '#ff4d4f',
borderColor: '#ff4d4f',
},
},
icon: <Icon type="exclamation-circle" style={{ color: 'red' }} />,
onOk: () => {
// const { dispatch } = this.props;
// dispatch(routerRedux.replace({
// pathname: '/rechargedesc',
// }));
// window.open('http://website.clock.wp53.cn/?page=7');
},
onCancel: () => {
},
});
return;
}
dispatch({
type: 'schoollist/goSchoolSystem',
payload: {
......@@ -125,7 +153,7 @@ class HeadquarterMgtForm extends React.Component {
<div>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.goSchoolSystem(record)}>查看校区</a>
<span className={pageStyle.divideline}>|</span>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.showDeleteConfirm(record.stronghold_id)}>移除校区</a>
<a className={pageStyle.alink} href="javascript:;" onClick={() => this.showDeleteConfirm(record.id)}>移除校区</a>
</div>
)}
</div>
......@@ -188,9 +216,10 @@ const ClassMgt = Form.create()(HeadquarterMgtForm);
function mapStateToProps(state) {
const {
headquarterDetail,
datetime,
} = state.headquarters;
return {
datetime,
headquarterDetail,
};
}
......
......@@ -12,6 +12,7 @@ class RechargeDesc extends React.Component {
constructor(props) {
super(props);
this.state = {
previewQrcodeShow: false,
};
}
componentDidMount() {
......@@ -28,16 +29,30 @@ class RechargeDesc extends React.Component {
}));
}
goUse = () => {
const { dispatch } = this.props;
dispatch(routerRedux.replace({
pathname: '/erp/schoollist',
}));
this.setState({
previewQrcodeShow: true,
});
}
closeQrcodeShow = () => {
this.setState({
previewQrcodeShow: false,
});
}
render() {
const { previewQrcodeShow } = this.state;
return (
<div>
<QrcodeShow
previewQrcodeShow={previewQrcodeShow}
closeQrcodeShow={this.closeQrcodeShow}
previewQrcode="qingxiao/biz/image/kfqrcode.png"
title="微信扫描二维码添加客服充值"
/>
<div className={pageStyles.header}>
<span onClick={this.goSchoolList}>返回</span>
<Button type="primary" onClick={this.goSchoolList}>
<Icon type="left" />
返回
</Button>
</div>
<div className={`${pageStyles.packagebox} clearfix`}>
<div className={`${pageStyles.packageitem} ${pageStyles.typea}`}>
......@@ -51,6 +66,7 @@ class RechargeDesc extends React.Component {
<span className={pageStyles.pricebefore}>原价¥5999</span>
<span className={pageStyles.discountprice}>节省¥2399</span>
</div>
<a href="javascript:;" rel="noopener noreferrer" onClick={this.goUse} target="_blank" className={pageStyles.tousebtn}>充值</a>
<ul className={pageStyles.packagedetail}>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
......@@ -58,7 +74,7 @@ class RechargeDesc extends React.Component {
</li>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
<div className={pageStyles.detailinfo}>全年7*24小时专业团队问题解答。</div>
<div className={pageStyles.detailinfo}>全年7*12小时专业团队问题解答。</div>
</li>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
......@@ -82,6 +98,7 @@ class RechargeDesc extends React.Component {
<span className={pageStyles.pricebefore}>原价¥9999</span>
<span className={pageStyles.discountprice}>节省¥3199</span>
</div>
<a href="javascript:;" rel="noopener noreferrer" onClick={this.goUse} target="_blank" className={pageStyles.tousebtn}>充值</a>
<ul className={pageStyles.packagedetail}>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
......@@ -89,7 +106,7 @@ class RechargeDesc extends React.Component {
</li>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
<div className={pageStyles.detailinfo}>全年7*24小时专业团队问题解答。</div>
<div className={pageStyles.detailinfo}>全年7*12小时专业团队问题解答。</div>
</li>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
......@@ -121,6 +138,7 @@ class RechargeDesc extends React.Component {
<span className={pageStyles.pricebefore}>原价¥29999</span>
<span className={pageStyles.discountprice}>节省¥14000</span>
</div>
<a href="javascript:;" rel="noopener noreferrer" target="_blank" onClick={this.goUse} className={pageStyles.tousebtn}>充值</a>
<ul className={pageStyles.packagedetail}>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
......@@ -132,7 +150,7 @@ class RechargeDesc extends React.Component {
</li>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
<div className={pageStyles.detailinfo}>全年7*24小时四对一专业团队问题解答。</div>
<div className={pageStyles.detailinfo}>全年7*12小时四对一专业团队问题解答。</div>
</li>
<li className="clearfix">
<div className={pageStyles.detailitemicon}></div>
......
......@@ -22,8 +22,14 @@
float: left;
margin-right: 70px;
cursor: pointer;
transition: 0.2s;
&.typea {
box-shadow: 0px 13px 29px 0px rgba(0,196,255,0.2);
box-shadow: 0px 6px 15px 0px rgba(0,196,255,0.2);
&:hover {
box-shadow: 0px 13px 29px 0px rgba(0,196,255,0.2);
transform: scale(1.01);
transform-origin: 50% 50%;
}
.packageheader {
background-image: url('@{imagesroot}packagea-title.png');
}
......@@ -46,7 +52,12 @@
}
}
&.typeb {
box-shadow: 0px 13px 29px 0px rgba(228,192,134,0.2);
box-shadow: 0px 6px 15px 0px rgba(228,192,134,0.2);
&:hover {
box-shadow: 0px 13px 29px 0px rgba(228,192,134,0.2);
transform: scale(1.01);
transform-origin: 50% 50%;
}
.packageheader {
background-image: url('@{imagesroot}packageb-title.png');
}
......@@ -63,13 +74,18 @@
background-image: url('@{imagesroot}packageb-icon.png');
}
.detailinfo {
margin-bottom: 24px;
margin-bottom: 10px;
}
}
}
}
&.typec {
box-shadow: 0px 13px 29px 0px rgba(242,109,78,0.2);
box-shadow: 0px 6px 15px 0px rgba(242,109,78,0.2);
&:hover {
box-shadow: 0px 13px 29px 0px rgba(242,109,78,0.2);
transform: scale(1.01);
transform-origin: 50% 50%;
}
.packageheader {
background-image: url('@{imagesroot}packagec-title.png');
}
......@@ -86,7 +102,7 @@
background-image: url('@{imagesroot}packagec-icon.png');
}
.detailinfo {
margin-bottom: 24px;
margin-bottom: 10px;
}
}
}
......@@ -102,7 +118,7 @@
}
.packagecontent {
border-radius: 0 0 10px 10px;
padding-top: 40px;
padding-top: 20px;
height: 546px;
.nowprice {
text-align: center;
......
......@@ -439,7 +439,7 @@ class SchoolAddForm extends React.Component {
});
return (
<div className={`${pageStyles.container} schooladdcontainer`}>
<div className={pageStyles.header} onClick={this.addMobile}>
<div className={pageStyles.header}>
<img src={`${__IMGCDN__}qxlogo.png`} className={pageStyles.headerlogo} alt="轻校" />
</div>
<div className={pageStyles.content}>
......
......@@ -27,7 +27,7 @@ class JoinSchoolAddForm extends React.Component {
}
goSchoolSystem = (school) => {
const { dispatch, datetime } = this.props;
if (new Date(datetime.replace(/\-/g, '/')).getTime() >= new Date(school.expire_time.replace(/\-/g, '/')).getTime()) {
if (school.expire_time && new Date(datetime.replace(/\-/g, '/')).getTime() >= new Date(school.expire_time.replace(/\-/g, '/')).getTime()) {
Modal.error({
title: '您的账户已到期',
content: '请尽快联系客服充值',
......@@ -148,6 +148,7 @@ class JoinSchoolAddForm extends React.Component {
userInfo,
stronghold,
globalErrorType,
datetime,
} = this.props;
return (
<Row className={`${pageStyles.container} schoollistcontainer`}>
......@@ -185,7 +186,10 @@ class JoinSchoolAddForm extends React.Component {
</Row>
<Row className={`${pageStyles.logintimebox} ${pageStyles.expiretimebox}`} type="flex" justify="space-between" align="middle">
<Col span={12} className={pageStyles.timetitle}>套餐到期时间:</Col>
<Col span={12} className={pageStyles.time}>{ele.expire_time}</Col>
{!ele.expire_time && <Col span={12} className={pageStyles.time}>终身包</Col>}
{ele.expire_time && ele.trial_status == 1 && (new Date(datetime.replace(/\-/, '/')).getTime() >= new Date(ele.expire_time.replace(/\-/, '/')).getTime()) && <Col span={12} className={pageStyles.time}>试用期已过</Col>}
{ele.expire_time && ele.trial_status == 2 && (new Date(datetime.replace(/\-/, '/')).getTime() >= new Date(ele.expire_time.replace(/\-/, '/')).getTime()) && <Col span={12} className={pageStyles.time}>账号已到期</Col>}
{ele.expire_time && (new Date(datetime.replace(/\-/, '/')).getTime() < new Date(ele.expire_time.replace(/\-/, '/')).getTime()) && <Col span={12} className={pageStyles.time}>{ele.expire_time}</Col>}
</Row>
{ele.school_teacher && ele.school_teacher.last_login_time &&
<Row className={pageStyles.logintimebox} type="flex" justify="space-between" align="middle">
......
......@@ -55,9 +55,14 @@ class SelfJoinForm extends React.Component {
if (selectedCourse.mode_class == 1) {
this.props.form.setFieldsValue({
mode_type: 3,
class_ids: [],
});
const courseModuleInfo = Object.assign({}, this.state.courseModuleInfo, {
class_ids: [],
});
this.setState({
modeType: 3,
courseModuleInfo,
});
searchCourseRelateClass(selectedCourse.id || 0);
}
......@@ -72,6 +77,15 @@ class SelfJoinForm extends React.Component {
mode_type: value,
});
if (value == 3) {
this.props.form.setFieldsValue({
class_ids: [],
});
const courseModuleInfo = Object.assign({}, this.state.courseModuleInfo, {
class_ids: [],
});
this.setState({
courseModuleInfo,
});
searchCourseRelateClass(selectedCourse.id || 0);
}
}
......
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