Skip to content

B
biz.qingxiao.com
Commit 00f5596e authored by wangxuelai's avatar wangxuelai
Browse files
Options

'课表样式修改loading修改'

parent 8128e139
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 36 deletions
index.html
View file @ 00f5596e
<!DOCTYPE html> <!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]>
<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> <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><link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1571277411449" 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?1571277411449" charset="utf-8"></script></body></html>
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=XSZBZ-5LHCV-5I2P7-UQHPW-6456F-JBB3B"></script> \ No newline at end of file
<link href="https://cdn.img.shangjiadao.cn/qingxiao/biz/dist/index.css?1571120171115" 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?1571120171115" charset="utf-8"></script>
</body>
</html>
\ No newline at end of file
src/components/CourseChart.js
View file @ 00f5596e
...@@ -488,7 +488,7 @@ class CourseChart extends React.Component { ...@@ -488,7 +488,7 @@ class CourseChart extends React.Component {
{ele.class_room && ele.class_room.title && <div className={pageStyle.name}>{ele.class_room && ele.class_room.title}</div>} {ele.class_room && ele.class_room.title && <div className={pageStyle.name}>{ele.class_room && ele.class_room.title}</div>}
<div>{ele.class.class_student_count}/{ele.class.capacity}</div> <div>{ele.class.class_student_count}/{ele.class.capacity}</div>
</div> </div>
<div className={pageStyle.titlebox}> <div className={pageStyle.classtitlebox}>
{ele.class.title} {ele.class.title}
</div> </div>
</div> </div>
......
src/models/course.js
View file @ 00f5596e
...@@ -61,6 +61,7 @@ export default { ...@@ -61,6 +61,7 @@ export default {
rule_absent: 1, rule_absent: 1,
}, },
editCourseModalShow: false, editCourseModalShow: false,
courseLoading: false,
}, },
subscriptions: { subscriptions: {
setup({ dispatch, history }) { // eslint-disable-line setup({ dispatch, history }) { // eslint-disable-line
...@@ -80,6 +81,7 @@ export default { ...@@ -80,6 +81,7 @@ export default {
}, },
* courseModelList({ payload }, { call, put, select }) { * courseModelList({ payload }, { call, put, select }) {
const { sid } = yield select(state => state.webapp); const { sid } = yield select(state => state.webapp);
const { courseLoading } = yield select(state => state.course);
const loadmessage = message.loading('数据加载中...', 0); const loadmessage = message.loading('数据加载中...', 0);
const courselistinfo = yield call(courseAjax.courseList, { const courselistinfo = yield call(courseAjax.courseList, {
school_id: sid, school_id: sid,
......
src/models/institutions.js
View file @ 00f5596e
...@@ -31,10 +31,10 @@ export default { ...@@ -31,10 +31,10 @@ export default {
}, },
* queryinfo({ payload }, { call, put, select }) { * queryinfo({ payload }, { call, put, select }) {
const { sid } = yield select(state => state.webapp); const { sid } = yield select(state => state.webapp);
const loading = message.loading('信息加载中...');
yield put({ yield put({
type: 'getcategorys', type: 'getcategorys',
}); });
const loading = message.loading('数据加载中...', 0);
const schoolDetailData = yield call(usersAjax.schoolDetail, { const schoolDetailData = yield call(usersAjax.schoolDetail, {
id: sid, id: sid,
}); });
......
src/models/students.js
View file @ 00f5596e
...@@ -672,13 +672,13 @@ export default { ...@@ -672,13 +672,13 @@ export default {
* queryClassList({ payload }, { call, put, select }) { * queryClassList({ payload }, { call, put, select }) {
const { params, action } = payload; const { params, action } = payload;
const { sid } = yield select(state => state.webapp); const { sid } = yield select(state => state.webapp);
const loading = message.loading('数据加载中...', 1); // const loading = message.loading('数据加载中...', 1);
const classListData = yield call(classMgtAjax.getClassList, { const classListData = yield call(classMgtAjax.getClassList, {
school_id: sid, school_id: sid,
page: 1, page: 1,
perPage: 1000, perPage: 1000,
}); });
setTimeout(loading); // setTimeout(loading);
if (action == 'search') { if (action == 'search') {
yield put({ yield put({
type: 'updateState', type: 'updateState',
......
src/models/studentsinfo.js
View file @ 00f5596e
...@@ -442,14 +442,14 @@ export default { ...@@ -442,14 +442,14 @@ export default {
}, },
* studentsModelClassRecords({ payload }, { call, put, select }) { * studentsModelClassRecords({ payload }, { call, put, select }) {
const { params } = payload; const { params } = payload;
const loadmessage = message.loading('数据加载中...', 0); // const loadmessage = message.loading('数据加载中...', 0);
const { studentId, classRecordQueryParams, classRecordsTotal } = yield select(state => state.studentsinfo); const { studentId, classRecordQueryParams, classRecordsTotal } = yield select(state => state.studentsinfo);
let newclassRecordsTotal = classRecordsTotal; let newclassRecordsTotal = classRecordsTotal;
const newclassRecordQueryParams = Object.assign({}, classRecordQueryParams, params, { const newclassRecordQueryParams = Object.assign({}, classRecordQueryParams, params, {
student_id: studentId, student_id: studentId,
}); });
const studentsClassRecordsData = yield call(studentsAjax.studentClassRecords, newclassRecordQueryParams); const studentsClassRecordsData = yield call(studentsAjax.studentClassRecords, newclassRecordQueryParams);
setTimeout(loadmessage); // setTimeout(loadmessage);
if (studentsClassRecordsData.code == 200) { if (studentsClassRecordsData.code == 200) {
if (studentsClassRecordsData.data.total != undefined) { if (studentsClassRecordsData.data.total != undefined) {
newclassRecordsTotal = studentsClassRecordsData.data.total; newclassRecordsTotal = studentsClassRecordsData.data.total;
...@@ -596,7 +596,6 @@ export default { ...@@ -596,7 +596,6 @@ export default {
* unbindWxPost({ payload }, { call, put, select }) { * unbindWxPost({ payload }, { call, put, select }) {
const { studentsdetail, checkoutVerifyCode } = yield select(state => state.studentsinfo); const { studentsdetail, checkoutVerifyCode } = yield select(state => state.studentsinfo);
const { verify_code, callBack, student_id } = payload; const { verify_code, callBack, student_id } = payload;
console.log('进来了');
if (checkoutVerifyCode) { if (checkoutVerifyCode) {
return; return;
} }
......
src/models/webapp.js
View file @ 00f5596e
...@@ -772,6 +772,7 @@ export default { ...@@ -772,6 +772,7 @@ export default {
pathname: currentMenu.path, pathname: currentMenu.path,
})); }));
} }
message.destroy();
}, },
* changeRoute({ payload }, { put, select }) { * changeRoute({ payload }, { put, select }) {
const { path } = payload; const { path } = payload;
......
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