Skip to content

B
biz.qingxiao.com
Commit 34ce7633 authored by baixian's avatar baixian
Browse files
Options

微官网

parent 371d834a
Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 233 deletions
index.html
View file @ 34ce7633
......@@ -11,13 +11,12 @@
<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>
<script src="/js/ueeditor/ueditor.config.js?20200107" charset="utf-8"></script><script src="/js/ueeditor/ueditor.all.js?20200107" charset="utf-8"></script>
<script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/console-polyfill.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es6-shim.min.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-shim.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/es5-sham.min.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/json3.min.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/html5shiv.min.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/js/polyfill.js?20200107" charset="utf-8"></script><script src="https://cdn.img.shangjiadao.cn/qingxiao/biz/lib/vendor.dll.js?20200107" charset="utf-8"></script>
<script src="js/console-polyfill.js?20200107" charset="utf-8"></script><script src="js/es6-shim.min.js?20200107" charset="utf-8"></script><script src="js/es5-shim.js?20200107" charset="utf-8"></script><script src="js/es5-sham.min.js?20200107" charset="utf-8"></script><script src="js/json3.min.js?20200107" charset="utf-8"></script><script src="js/html5shiv.min.js?20200107" charset="utf-8"></script><script src="js/polyfill.js?20200107" charset="utf-8"></script><script src="lib/vendor.dll.js?20200107" charset="utf-8"></script>
</head>
</head>
<body>
<div id="root"></div>
<script type="text/javascript" src="/dist/main.31c1eb.js"></script></body>
</html>
</html>
<script type="text/javascript" src="/dist/main.f651b7.js"></script></body>
</html>
\ No newline at end of file
src/common/api.js
View file @ 34ce7633
......@@ -134,6 +134,7 @@ export default {
subjectMixtureSave: `${dakaapi}member/website/subject_mixture/save`,
teacher: `${dakaapi}member/website/teachers`,
teacherSave: `${dakaapi}member/website/teacher/save`,
mixed_simple: `${dakaapi}member/subject/mixed_simple`,
},
schedule: `${dakaapi}member/erp/schedules`,
scheduleMgt: {
......
src/components/CommonEditor.js
View file @ 34ce7633
......@@ -103,7 +103,6 @@ class CommonEditor extends React.Component {
commentParams,
editorAdd,
} = this.props;
console.log(commentParams, 'commentParams');
return (
<div className={pageStyle.container}>
<div className={pageStyle.editor}>
......
src/models/officialweb.js
View file @ 34ce7633
......@@ -13,8 +13,6 @@ import * as officialwebajax from '../services/officialweb';
import * as commonajax from '../services/common';
import * as onlineAjax from '../services/onlineclasses';
import errorcode from '../common/errorcode';
import * as themeListAjax from '../services/newthemelist';
import * as goodsAjax from '../services/integral';
export default {
namespace: 'officialweb',
state: {
......@@ -177,31 +175,31 @@ export default {
pageInfo, moduleSort, sid, moduleSelect,
} = yield select(state => state.officialweb);
let newmoduleSelect = moduleSelect;
const newpageInfo = JSON.parse(JSON.stringify(pageInfo));
const newmoduleSort = JSON.parse(JSON.stringify(moduleSort));
const currentpageInfo = newpageInfo[index];
const prepageInfo = newpageInfo[index - 1];
const afterpageInfo = newpageInfo[index + 1];
const currentmoduleSort = moduleSort[index];
const premoduleSort = moduleSort[index - 1];
const aftermoduleSort = moduleSort[index + 1];
const newModuleSort = JSON.parse(JSON.stringify(moduleSort));
const newPageInfo = JSON.parse(JSON.stringify(pageInfo));
const currentModuleSort = moduleSort[index];
const preModuleSort = moduleSort[index - 1];
const afterModuleSort = moduleSort[index + 1];
const currentPageInfo = pageInfo[index];
const prePageInfo = pageInfo[index - 1];
const afterPageInfo = pageInfo[index + 1];
if (direction == 'up') {
newpageInfo.splice(index - 1, 2, currentpageInfo, prepageInfo);
newmoduleSort.splice(index - 1, 2, currentmoduleSort, premoduleSort);
newModuleSort.splice(index - 1, 2, currentModuleSort, preModuleSort);
newPageInfo.splice(index - 1, 2, currentPageInfo, prePageInfo);
newmoduleSelect--;
} else if (direction == 'down') {
newpageInfo.splice(index, 2, afterpageInfo, currentpageInfo);
newmoduleSort.splice(index, 2, aftermoduleSort, currentmoduleSort);
newModuleSort.splice(index, 2, afterModuleSort, currentModuleSort);
newPageInfo.splice(index, 2, afterPageInfo, currentPageInfo);
newmoduleSelect++;
}
const pageblockmoveLoading = message.loading('模块移动中');
const moduleSortAjax = yield call(officialwebajax.moduleSort, { school_id: sid, sort: JSON.stringify(newmoduleSort) });
const moduleSortAjax = yield call(officialwebajax.moduleSort, { school_id: sid, sort: JSON.stringify(newModuleSort) });
setTimeout(pageblockmoveLoading);
yield put({
type: 'updateState',
payload: {
pageInfo: newpageInfo,
moduleSort: newmoduleSort,
pageInfo: newPageInfo,
moduleSort: newModuleSort,
moduleSelect: newmoduleSelect,
},
});
......@@ -268,7 +266,6 @@ export default {
}
const infoLoad = message.loading('数据加载中...');
let newpageInfo = JSON.parse(JSON.stringify(pageInfo));
console.log(newpageInfo, 'newpageInfo11111111111');
const schoolDetail = yield call(officialwebajax.schoolDetail, { schoolId: sid });
let newCourse = JSON.stringify(course);
let newbannerVideo = bannerVideo;
......@@ -329,15 +326,39 @@ export default {
const sortnewpageInfo = [];
try {
moduleSort = JSON.parse(schoolDetail.data.sort);
moduleSort.forEach((item, index) => {
if (item.name.indexOf('adCarousel') == -1) {
for (let k = 0, mlength = moduleSort.length; k < mlength; k++) {
if (moduleSort[k].name.indexOf('adCarousel') == -1) {
moduleSort.push({
name: 'adCarousel',
desc: '广告轮播',
});
}
});
console.log(newpageInfo, 'trynewpageInfo');
if (moduleSort[k].name.indexOf('teacher') == -1) {
moduleSort.push({
name: 'teacher',
desc: '名师风采',
});
}
if (moduleSort[k].name.indexOf('classmoments') == -1) {
moduleSort.push({
name: 'classmoments',
desc: '课堂瞬间',
});
}
if (moduleSort[k].name.indexOf('onlineclass') == -1) {
moduleSort.push({
name: 'onlineclass',
desc: '在线课堂',
});
}
if (moduleSort[k].name.indexOf('togetherclock') == -1) {
moduleSort.push({
name: 'togetherclock',
desc: '一起打卡',
});
}
break;
}
for (let i = 0, sLength = moduleSort.length; i < sLength; i++) {
for (let j = 0, blockLength = newpageInfo.length; i < blockLength; j++) {
if (moduleSort[i].name == newpageInfo[j].type) {
......@@ -362,8 +383,10 @@ export default {
if (element.type == 'schoolinfo') {
if (schoolDetail.data.module_switch == null) {
schoolDetail.data.module_switch = {
adCarousel: true, orgdesc: true, teacher: true, clocklist: true, classmoments: true, onlineclass: true, togetherclock: true,
adCarousel: false, orgdesc: false, teacher: false, clocklist: false, classmoments: false, onlineclass: false, togetherclock: false,
};
} else {
schoolDetail.data.module_switch = JSON.parse(schoolDetail.data.module_switch);
}
schoolDetail.data.tags = JSON.parse(schoolDetail.data.tags);
element.data = schoolDetail.data;
......@@ -395,7 +418,6 @@ export default {
const adData = yield call(officialwebajax.adsList, { school_id: sid, page: 1, perPage: 100 });
let newAdData = [];
if (adData.code == 200) {
console.log(adData, 'adData');
if (!adData.data) {
newpageInfo.forEach((ele) => {
const element = ele;
......@@ -530,7 +552,6 @@ export default {
}
});
} else {
console.log('11数据');
newpageInfo.forEach((ele) => {
const element = ele;
newCourse = courseDetail.data;
......@@ -593,12 +614,6 @@ export default {
} else {
message.error(schoolIntro.msg, 1);
}
yield put({
type: 'queryOnlineClassList',
});
yield put({
type: 'queryTogetherClockList',
});
setTimeout(infoLoad);
yield put({
type: 'updateState',
......@@ -619,6 +634,14 @@ export default {
togetherClockTargetKeys: newTogetherClockKeys,
},
});
yield put({
type: 'queryOnlineClassList',
});
yield put({
type: 'queryTogetherClockList',
payload: {
},
});
},
* bannertypechoose({ payload }, { call, put, select }) {
const { type } = payload;
......@@ -1305,7 +1328,7 @@ export default {
},
* saveofficialweb({ payload }, { call, put, select }) {
const {
sid, schoolInfo, schoolTags, bannerType, bannerImg, officialwebPostStatus, bannerVideo, orgdescs,
sid, schoolInfo, schoolTags, moduleSort, course, officialwebPostStatus, moduleSelect, orgdescs,
} = yield select(state => state.officialweb);
if (officialwebPostStatus) {
return;
......@@ -1329,71 +1352,25 @@ export default {
tel_phone: schoolInfo.tel_phone,
tags: JSON.stringify(schoolTags),
notice: schoolInfo.notice,
module_switch: schoolInfo.module_switch,
});
// if (course.id == 0) {
// yield call(officialwebajax.courseInfoAdd, {
// school_id: sid,
// title: course.title,
// remark: course.remark,
// cover: course.cover,
// });
// } else {
// yield call(officialwebajax.courseInfoUpdate, {
// school_id: sid,
// title: course.title,
// remark: course.remark,
// id: course.id,
// cover: course.cover,
// });
// }
// let banner = {};
// if (bannerType == 1) {
// if (bannerVideo.length == 0) {
// message.error('请上传视频', 1);
// return;
// }
// banner = {
// type: 'video',
// src: bannerVideo,
// };
// }
// if (bannerType == 2) {
// if (bannerImg.length == 0) {
// message.error('请上传图片', 1);
// return;
// }
// banner = {
// type: 'img',
// src: bannerImg,
// };
// }
// yield call(officialwebajax.setBanner, {
// school_id: sid,
// banner: JSON.stringify(banner),
// });
// const Length = orgdescs.length;
// let i = 0;
// while (i < Length) {
// if (orgdescs[i].id) {
// yield call(officialwebajax.schoolIntroUpdate, {
// id: orgdescs[i].id,
// school_id: orgdescs[i].school_id,
// title: orgdescs[i].title,
// type: orgdescs[i].type,
// content: JSON.stringify(orgdescs[i].content),
// });
// } else {
// yield call(officialwebajax.schoolIntroAdd, {
// id: orgdescs[i].id,
// school_id: orgdescs[i].school_id,
// title: orgdescs[i].title,
// type: orgdescs[i].type,
// content: JSON.stringify(orgdescs[i].content),
// });
// }
// i++;
// }
module_switch: JSON.stringify(schoolInfo.module_switch),
sort: JSON.stringify(moduleSort),
});
if (course.id == 0) {
yield call(officialwebajax.courseInfoAdd, {
school_id: sid,
title: course.title,
remark: course.remark,
cover: course.cover,
});
} else {
yield call(officialwebajax.courseInfoUpdate, {
school_id: sid,
title: course.title,
remark: course.remark,
id: course.id,
cover: course.cover,
});
}
setTimeout(officialwebloading);
message.success('保存成功', 1);
yield put({
......@@ -1402,9 +1379,9 @@ export default {
officialwebPostStatus: false,
},
});
// yield put(routerRedux.push({
// pathname: '/sjd/officialweb',
// }));
yield put(routerRedux.push({
pathname: '/sjd/officialweb',
}));
},
* previewofficialweb({ payload }, { call, put, select }) {
const { previewQrcode } = yield select(state => state.officialweb);
......@@ -1755,9 +1732,7 @@ export default {
// 一起来打卡模块
* queryTogetherClockList({ payload }, { call, put, select }) {
const { sid } = yield select(state => state.webapp);
const data = yield call(themeListAjax.clockList, {
school_id: sid,
});
const data = yield call(officialwebajax.getMixedSimple, { school_id: sid });
if (data.code === 200) {
yield put({
type: 'updateState',
......@@ -2135,6 +2110,9 @@ export default {
},
});
},
* goBack({ payload }, { call, put, select }) {
yield put(routerRedux.goBack());
},
* pageInit({ payload }, { call, put, select }) {
yield put({
type: 'updateState',
......
src/models/uploader.js
View file @ 34ce7633
......@@ -64,7 +64,6 @@ export default {
signature, avatorUploader, files, uploaderLoading, uploadtype, orgIndex, imgIndex, orgType, action,
} = payload;
const file = files.files ? files.files[0] : null;
console.log(file, 'file');
uploaderLoading();
const filename = `${signature.dir}${getRandomFilename(file.name)}`;
const params = {
......
src/models/webapp.js
View file @ 34ce7633
......@@ -171,6 +171,9 @@ export default {
});
}
if (pathname === '/sjd/officialweb' || pathname === '/sjd/officialwebeditor') {
dispatch({
type: 'officialweb/pageInit',
});
dispatch({
type: 'officialweb/queryinfo',
payload: {
......
src/pages/officialweb/RichText.js
View file @ 34ce7633
......@@ -31,7 +31,6 @@ class RichText extends React.Component {
Authorization: `Bearer ${user.token}}`,
},
}).then(response => response.json());
console.log(res.data, 'access');
const {
accessid,
policy,
......@@ -56,7 +55,6 @@ class RichText extends React.Component {
body: formData2,
}).then(response => response.json());
if (res2.status == 'ok') {
console.log(res2, 'res21111111');
param.success({
url: `${host}/${filename}`,
meta: {
......@@ -73,7 +71,6 @@ class RichText extends React.Component {
}
handleChangeEditor = (editorState) => {
const { handleChangeEditor, index } = this.props;
console.log(editorState, 'editorState');
handleChangeEditor(editorState, index);
}
render() {
......@@ -96,7 +93,6 @@ class RichText extends React.Component {
'size',
'remove',
];
console.log(editorValue, 'editorValue');
const newValue = BraftEditor.createEditorState(editorValue);
return (
<div className={pageStyle.container}>
......
src/pages/officialweb/editor.js
View file @ 34ce7633
......@@ -107,6 +107,14 @@ class Officialweb extends React.Component {
},
});
}
goBack = () => {
const { dispatch } = this.props;
dispatch({
type: 'officialweb/goBack',
payload: {
},
});
}
render() {
const {
pageInfo,
......@@ -119,11 +127,12 @@ class Officialweb extends React.Component {
course,
coursePostStatus,
schoolInfo,
collapsed,
screenIsBig,
} = this.props;
let renderDom;
const newPageInfo = pageInfo;
console.log(newPageInfo, 'newPageInfo');
console.log(schoolInfo, '1111111111111111111111');
const qrcodeBox = (
<div>
<img className={pageStyle.qrcodebox} src={imagify(previewQrcode)} alt="" />
......@@ -132,13 +141,6 @@ class Officialweb extends React.Component {
return (
<div className={pageStyle.container}>
<div className={pageStyle.mobilecontainer}>
{/*
<div className={pageStyle.floatcoursebox}>
<Course
course={course}
/>
</div>
*/}
{
newPageInfo.map((ele, index) => {
switch (ele.type) {
......@@ -185,7 +187,6 @@ class Officialweb extends React.Component {
);
break;
case 'adCarousel':
console.log(index, 'adCarousel');
renderDom = (
<div className={pageStyle.box} key={ele.type}>
<div
......@@ -196,6 +197,7 @@ class Officialweb extends React.Component {
<AdCarousel
data={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
......@@ -203,8 +205,8 @@ class Officialweb extends React.Component {
<div className={pageStyle.blockOperateBox}>
{index == 2 && <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 < (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 - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
{moduleSelect == index &&
......@@ -226,15 +228,16 @@ class Officialweb extends React.Component {
<SchoolIntro
data={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
{moduleSelect == index &&
<div className={pageStyle.blockOperateBox}>
{index == 3 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><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} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == 2 && <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 < (newPageInfo.length - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
{moduleSelect == index &&
......@@ -256,15 +259,16 @@ class Officialweb extends React.Component {
<Teacher
data={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
{moduleSelect == index &&
<div className={pageStyle.blockOperateBox}>
{index == 4 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 4 && <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} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == 2 && <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 < (newPageInfo.length - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
{moduleSelect == index &&
......@@ -286,15 +290,16 @@ class Officialweb extends React.Component {
<StudentClock
clockList={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
{moduleSelect == index &&
<div className={pageStyle.blockOperateBox}>
{index == 5 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 5 && <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} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == 2 && <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 < (newPageInfo.length - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
</div>
......@@ -311,15 +316,16 @@ class Officialweb extends React.Component {
<ClassMoments
data={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
{moduleSelect == index &&
<div className={pageStyle.blockOperateBox}>
{index == 6 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 6 && <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} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == 2 && <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 < (newPageInfo.length - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
{moduleSelect == index &&
......@@ -331,7 +337,6 @@ class Officialweb extends React.Component {
);
break;
case 'onlineclass':
console.log(index, 'index');
renderDom = (
<div className={pageStyle.box} key={ele.type}>
<div
......@@ -342,15 +347,16 @@ class Officialweb extends React.Component {
<OnlineClass
data={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
{moduleSelect == index &&
<div className={pageStyle.blockOperateBox}>
{index == 7 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 7 && <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} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == 2 && <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 < (newPageInfo.length - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
{moduleSelect == index &&
......@@ -372,15 +378,16 @@ class Officialweb extends React.Component {
<TogetherClock
data={ele.data}
schoolInfo={schoolInfo}
showStatus
/>
{dragoverindex == index && <div className={pageStyle.dropendbox}>松开鼠标，模块会放在这里</div>}
</div>
{moduleSelect == index &&
<div className={pageStyle.blockOperateBox}>
{index == 8 && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-up" /></div>}
{index > 8 && <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} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == 2 && <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 < (newPageInfo.length - 2) && <div className={pageStyle.blockOperateItem} onClick={() => this.pageBlockMove(index, 'down')}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
{index == (newPageInfo.length - 2) && <div className={`${pageStyle.blockOperateItem} ${pageStyle.blockOperateItemGrey}`}><Icon className={pageStyle.blockOperateItemIcon} type="arrow-down" /></div>}
</div>
}
{moduleSelect == index &&
......@@ -417,11 +424,18 @@ class Officialweb extends React.Component {
})
}
</div>
<div className={pageStyle.savebtnbox}>
<Popover placement="bottomRight" title="微信扫码预览" content={qrcodeBox} trigger="click">
<div
className={pageStyle.savebtnbox}
style={{
left: screenIsBig ? (!collapsed ? '193px' : '102px') : 0, // eslint-disable-line
width: screenIsBig ? (`calc(100% - ${!collapsed ? '214px' : '122px'})`) : '100%', // eslint-disable-line
}}
>
<Popover placement="topRight" title="微信扫码预览" content={qrcodeBox} trigger="click">
<Button className={pageStyle.previewbtnbox} onClick={this.previewOfficialweb}>预览</Button>
</Popover>
<Button type="primary" className={pageStyle.savebtn} loading={officialwebPostStatus} onClick={this.saveOfficialWeb}>保存</Button>
<Button type="primary" className={pageStyle.savebtn} onClick={this.goBack}>返回</Button>
{/* <Button type="primary" className={pageStyle.savebtn} loading={officialwebPostStatus} onClick={this.saveOfficialWeb}>保存</Button> */}
</div>
{cropperboxShow && <Cropper
{...this.props}
......@@ -453,6 +467,7 @@ function mapStateToProps(state) {
avatorUploader,
uploadImgUrl,
} = state.uploader;
const { collapsed, screenIsBig } = state.webapp;
return {
pageInfo,
moduleSelect,
......@@ -465,6 +480,8 @@ function mapStateToProps(state) {
course,
coursePostStatus,
schoolInfo,
collapsed,
screenIsBig,
};
}
export default connect(mapStateToProps)(Officialweb);
......
src/pages/officialweb/index.js
View file @ 34ce7633
......@@ -4,18 +4,16 @@ import { Icon, Button } from 'antd';
import pageStyle from './index.less';
import { pageIn, hasBtnPower } from '../../utils/index';
import SchoolInfo from './pagecomponent/SchoolInfo';
import SchoolInfoEditor from './pagecomponent/SchoolInfoEditor';
import Banner from './pagecomponent/Banner';
import BannerEditor from './pagecomponent/BannerEditor';
import Course from './pagecomponent/Course';
import CourseEditor from './pagecomponent/CourseEditor';
import Orgdesc from './pagecomponent/Orgdesc';
import OrgdescEditor from './pagecomponent/OrgdescEditor';
import StudentClock from './pagecomponent/StudentClock';
import BtnPermission from '../../components/BtnPermission';
import AdCarousel from './pagecomponent/AdCarousel';
import ClassMoments from './pagecomponent/ClassMoments';
import SchoolIntro from './pagecomponent/SchoolIntro';
import OnlineClass from './pagecomponent/OnlineClass';
import TogetherClock from './pagecomponent/TogetherClock';
import Teacher from './pagecomponent/Teacher';
import Cropper from '../../components/Cropper';
class Officialweb extends React.Component {
componentDidMount() { // 挂载
......@@ -104,13 +102,13 @@ class Officialweb extends React.Component {
return (
<div className={pageStyle.container}>
<div className={pageStyle.mobilecontainer}>
{course.switch == 1 &&
<div className={pageStyle.floatcoursebox}>
<Course
course={course}
/>
</div>
}
{/* {course.switch == 1 && */}
{/* <div className={pageStyle.floatcoursebox}> */}
{/* <Course */}
{/* course={course} */}
{/* /> */}
{/* </div> */}
{/* } */}
{
newPageInfo.map((ele, index) => {
switch (ele.type) {
......@@ -143,7 +141,7 @@ class Officialweb extends React.Component {
);
break;
case 'adCarousel':
renderDom = (
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.adCarousel &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
......@@ -157,23 +155,53 @@ class Officialweb extends React.Component {
</div>
);
break;
case 'clocklist':
renderDom = (
case 'orgdesc':
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.orgdesc &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
key={ele.type}
>
<StudentClock
clockList={ele.data}
<SchoolIntro
data={ele.data}
schoolInfo={schoolInfo}
/>
</div>
</div>
);
break;
case 'teacher':
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.teacher &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
key={ele.type}
>
<Teacher
data={ele.data}
schoolInfo={schoolInfo}
/>
</div>
</div>
);
break;
case 'clocklist':
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.clocklist &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
key={ele.type}
>
<StudentClock
clockList={ele.data}
schoolInfo={schoolInfo}
/>
</div>
</div>
);
break;
case 'classmoments':
renderDom = (
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.classmoments &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
......@@ -187,21 +215,36 @@ class Officialweb extends React.Component {
</div>
);
break;
case 'orgdesc':
renderDom = (
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
key={ele.type}
>
<SchoolIntro
data={ele.data}
schoolInfo={schoolInfo}
/>
</div>
case 'onlineclass':
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.onlineclass &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
key={ele.type}
>
<OnlineClass
data={ele.data}
schoolInfo={schoolInfo}
/>
</div>
);
break;
</div>
);
break;
case 'togetherclock':
renderDom = (schoolInfo.module_switch && schoolInfo.module_switch.togetherclock &&
<div className={pageStyle.box} key={ele.type}>
<div
className={`${pageStyle.ContentBox}`}
key={ele.type}
>
<TogetherClock
data={ele.data}
schoolInfo={schoolInfo}
/>
</div>
</div>
);
break;
case 'course':
renderDom = (ele.data.switch == 1 &&
<div className={pageStyle.box} key={ele.type}>
......
src/pages/officialweb/index.less
View file @ 34ce7633
@import '../../less/variables.less';
.container {
background-color: #fff;
padding: 63px 0 750px 63px;
padding: 63px 0 200px 63px;
display: flex;
position: relative;
overflow-y: hidden;
......@@ -93,12 +93,21 @@
border: none;
}
.savebtnbox {
position: absolute;
right: 34px;
top: 55px;
width: 200px;
display: flex;
justify-content: flex-end;
position: fixed;
bottom: 0;
background-color: #fff;
padding: 20px 20px 14px 20px;
width: 100%;
box-shadow:1px -6px 6px 0px rgba(0, 0, 0, 0.04);
transition: 0.2s left;
transition: 0.1s width;
z-index: 20;
text-align: center;
:global {
.ant-popover {
position: fixed;
}
}
}
.qrcodebox {
width: 200px;
......
src/pages/officialweb/pagecomponent/AdCarousel.js
View file @ 34ce7633
......@@ -24,13 +24,15 @@ class adCarousel extends React.Component {
});
}
render() {
const { data, schoolInfo } = this.props;
console.log(schoolInfo, 'schoolInfo');
const { data, schoolInfo, showStatus } = this.props;
return (
<div className={PageStyle.Bannercontainer}>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.adCarousel} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'adCarousel')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.adCarousel} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'adCarousel')} />
</div>
}
<div className={PageStyle.carouselWrap}>
{
data.length > 0 ?
......@@ -40,7 +42,7 @@ class adCarousel extends React.Component {
{
data.map((item, index) => {
return (
<img className={PageStyle.img} src={imagify(item.cover)} alt="" />
<img key={item.id} className={PageStyle.img} src={imagify(item.cover)} alt="" />
);
})
}
......
src/pages/officialweb/pagecomponent/ClassMoments.js
View file @ 34ce7633
......@@ -24,13 +24,15 @@ class ClassMoments extends React.Component {
});
}
render() {
const { data, schoolInfo } = this.props;
console.log(data, 'datadatadatadata');
const { data, schoolInfo, showStatus } = this.props;
return (
<div className={PageStyle.Bannercontainer}>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.classmoments} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'classmoments')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.classmoments} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'classmoments')} />
</div>
}
<div className={PageStyle.commonTitle}>
<div>课堂瞬间</div>
<div className={PageStyle.right}>更多<Icon type="right" /></div>
......
src/pages/officialweb/pagecomponent/ClassMomentsEditor.js
View file @ 34ce7633
......@@ -200,7 +200,7 @@ class ClassMomentsEditor extends React.Component {
switch (ele.type) {
case 'img':
return (
<div className={PageStyle.imgItem} key={ele.type}>
<div className={PageStyle.imgItem} key={ele.value}>
<img className={PageStyle.img} src={imagify(ele.value)} alt="图片" />
<div className={PageStyle.closeAdIcon} onClick={() => this.deleteClassMomentImg(index, i)}>
<Icon type="close" />
......
src/pages/officialweb/pagecomponent/OnlineClass.js
View file @ 34ce7633
......@@ -3,6 +3,7 @@ import { connect } from 'dva';
import { Carousel, Empty, Icon, Switch } from 'antd';
import PageStyle from './OnlineClass.less';
import { ossVideofy, imagify, videoPoster } from '../../../utils/index';
import Course from './Course';
class OnlineClass extends React.Component {
constructor(props) {
super(props);
......@@ -24,12 +25,15 @@ class OnlineClass extends React.Component {
});
}
render() {
const { data, schoolInfo } = this.props;
const { data, schoolInfo, showStatus } = this.props;
return (
<div className={PageStyle.Bannercontainer}>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.onlineclass} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'togetherclock')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.onlineclass} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'onlineclass')} />
</div>
}
<div className={PageStyle.commonTitle}>
<div>在线课堂</div>
<div className={PageStyle.right}>更多<Icon type="right" /></div>
......
src/pages/officialweb/pagecomponent/OnlineClassEditor.js
View file @ 34ce7633
......@@ -40,7 +40,6 @@ class OnlineClassEditor extends React.Component {
onlineClassStatus,
onlineClassTargetKeys,
} = this.props;
console.log(onlineClassTargetKeys, 'onlineClassTargetKeys');
return (
<div className={`${PageStyle.SchoolInfoEditorcontainer} SchoolInfoEditorcontainer`}>
<div className={PageStyle.header}><span>在线课堂 </span><p>您可以从课堂列表中最多选择4个课程在微官网首页【在线课堂】展示</p></div>
......@@ -55,6 +54,7 @@ class OnlineClassEditor extends React.Component {
rowKey={record => record.id}
showSearch
lazy
showSelectAll={false}
/>
</div>
</div>
......
src/pages/officialweb/pagecomponent/SchoolInfo.js
View file @ 34ce7633
......@@ -5,7 +5,6 @@ import PageStyle from './SchoolInfo.less';
const { Sider } = Layout;
function SchoolInfo(props) {
const { schoolinfo } = props;
console.log(schoolinfo, 'schoolinfo');
return (
<div className={PageStyle.SchoolInfocontainer}>
<div className={PageStyle.schoolinfo}>
......@@ -13,7 +12,7 @@ function SchoolInfo(props) {
<div className={PageStyle.name}>{schoolinfo.title || ''}</div>
<div className={PageStyle.wantlearnstatic}>
{schoolinfo.tags && schoolinfo.tags.length > 0 && schoolinfo.tags.map((item, index) => {
return (<span>{index < 4 && <Tag>{item}</Tag>} {index > 4 && '...'}</span>);
return (<span key={item}>{index < 4 && <Tag>{item}</Tag>} {index > 4 && '...'}</span>);
})}
</div>
</div>
......
src/pages/officialweb/pagecomponent/SchoolInfoEditor.js
View file @ 34ce7633
......@@ -142,7 +142,6 @@ class SchoolInfoEditorForm extends React.Component {
labelCol: { span: 6 },
wrapperCol: { span: 18 },
};
console.log(schoolTags, 'schoolTags');
return (
<div className={`${PageStyle.SchoolInfoEditorcontainer} SchoolInfoEditorcontainer`}>
<div className={PageStyle.header}>机构信息</div>
......
src/pages/officialweb/pagecomponent/SchoolIntro.js
View file @ 34ce7633
......@@ -24,12 +24,15 @@ class SchoolIntro extends React.Component {
});
}
render() {
const { data, schoolInfo } = this.props;
const { data, schoolInfo, showStatus } = this.props;
return (
<div className={PageStyle.Bannercontainer}>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.orgdesc} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'orgdesc')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.orgdesc} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'orgdesc')} />
</div>
}
<div className={PageStyle.commonTitle}>
学校介绍
</div>
......@@ -45,7 +48,7 @@ class SchoolIntro extends React.Component {
{
data.map((item, index) => {
return (
<div>
<div key={item.id}>
{
item.type == 1 && <img className={PageStyle.img} src={imagify(item.content)} alt="" />
}
......
src/pages/officialweb/pagecomponent/SchoolIntroEditor.js
View file @ 34ce7633
......@@ -187,7 +187,7 @@ class SchoolIntroEditor extends React.Component {
{
schoolIntro.length > 0 && schoolIntro.map((item, index) => {
return (
<div className={PageStyle.formItem} key={item}>
<div className={PageStyle.formItem} key={item.id}>
<div className={PageStyle.formLeft}>
{index == 0 && <div className={`${PageStyle.formItemIcon} ${PageStyle.formItemIconGray}`}><Icon className={PageStyle.itemIcon} type="arrow-up" /></div>}
{ index > 0 && <div className={PageStyle.formItemIcon} onClick={() => this.moveSchoolIntroPlate(index, 'up')}><Icon className={PageStyle.itemIcon} type="arrow-up" /></div> }
......
src/pages/officialweb/pagecomponent/StudentClock.js
View file @ 34ce7633
......@@ -34,6 +34,7 @@ class StudentClock extends React.Component {
const {
menus, defaultMenu, collapsed, clockList,
schoolInfo,
showStatus,
} = this.props;
const menuItemStyle = {
fontSize: '16px',
......@@ -45,9 +46,12 @@ class StudentClock extends React.Component {
学生动态
</div>
</div>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.clocklist} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'clocklist')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.clocklist} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'clocklist')} />
</div>
}
<div className={PageStyle.clockListBox}>
{clockList.list && clockList.list.length > 0 && clockList.list.map(ele => (
<div className={PageStyle.clockitem} key={ele.id}>
......
src/pages/officialweb/pagecomponent/Teacher.js
View file @ 34ce7633
......@@ -24,13 +24,16 @@ class Teacher extends React.Component {
});
}
render() {
const { data, schoolInfo } = this.props;
const { data, schoolInfo, showStatus } = this.props;
console.log(data, 'data111');
return (
<div className={PageStyle.Bannercontainer}>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.teacher} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'teacher')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.teacher} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'teacher')} />
</div>
}
<div className={PageStyle.commonTitle}>
<div>名师风采</div>
<div className={PageStyle.right}>更多<Icon type="right" /></div>
......@@ -41,7 +44,7 @@ class Teacher extends React.Component {
{
data.map((item, index) => {
return (
<div className={PageStyle.commonItem}>
<div className={PageStyle.commonItem} key={item.id}>
<div className={PageStyle.commonLeft}>
<img src={imagify(item.avatar)} alt="" />
</div>
......
src/pages/officialweb/pagecomponent/TogetherClock.js
View file @ 34ce7633
......@@ -24,13 +24,15 @@ class TogetherClock extends React.Component {
});
}
render() {
const { data, schoolInfo } = this.props;
console.log(data, '一起来打卡');
const { data, schoolInfo, showStatus } = this.props;
return (
<div className={PageStyle.Bannercontainer}>
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.togetherclock} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'togetherclock')} />
</div>
{
showStatus &&
<div className={PageStyle.switchWrap}>
<Switch checked={schoolInfo.module_switch && schoolInfo.module_switch.togetherclock} checkedChildren="开" unCheckedChildren="关" onChange={e => this.handleChangeSwitch(e, 'togetherclock')} />
</div>
}
<div className={PageStyle.commonTitle}>
<div>一起打卡</div>
<div className={PageStyle.right}>更多<Icon type="right" /></div>
......
src/pages/officialweb/pagecomponent/TogetherClockEditor.js
View file @ 34ce7633
import React from 'react';
import { connect } from 'dva';
import { Form, Layout, Transfer, Button, Icon, message, Modal, Popconfirm, Progress } from 'antd';
import { Form, Layout, Transfer, Button, Icon, message, Pagination, Popconfirm, Progress } from 'antd';
import { videoPoster, imagify, ossVideofy } from '../../../utils/index';
import PageStyle from './TogetherClockEditor.less';
const FormItem = Form.Item;
......@@ -51,9 +51,10 @@ class TogetherClockEditor extends React.Component {
onChange={this.handleChangeClock}
targetKeys={togetherClockTargetKeys}
render={item => item.title}
rowKey={record => record.subject_mixed_id}
rowKey={record => record.id}
showSearch
lazy
showSelectAll={false}
/>
</div>
</div>
......
src/services/officialweb.js
View file @ 34ce7633
......@@ -187,3 +187,10 @@ export function teacherSave(params) {
data,
});
}
export function getMixedSimple(params) {
const data = qs.stringify(params);
return request({
url: `${api.officaialweb.mixed_simple}?${data}`,
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