Skip to content

B
biz.qingxiao.com
Commit 84aae436 authored by baixian's avatar baixian
Browse files
Options

微官网

parents 58c308ed 042b63f0
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 19 deletions
index.html
View file @ 84aae436
...@@ -11,12 +11,11 @@ ...@@ -11,12 +11,11 @@
<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>
<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="/js/ueeditor/ueditor.config.js?20200107" charset="utf-8"></script><script src="/js/ueeditor/ueditor.all.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> <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>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script type="text/javascript" src="/dist/main.35599f.js"></script></body> <script type="text/javascript" src="/dist/main.1e2883.js"></script></body>
</html> </html>
src/models/onlineclasses.js
View file @ 84aae436
...@@ -568,7 +568,6 @@ export default { ...@@ -568,7 +568,6 @@ export default {
}); });
if (qrcodeData.code == 200) { if (qrcodeData.code == 200) {
message.success('小程序码生成成功', 1); message.success('小程序码生成成功', 1);
console.log('dsadsad');
yield put({ yield put({
type: 'updateState', type: 'updateState',
payload: { payload: {
...@@ -1272,7 +1271,6 @@ export default { ...@@ -1272,7 +1271,6 @@ export default {
coursewareSubmitting: false, coursewareSubmitting: false,
}, },
}); });
console.log(1111111111111);
if (data.code == 200) { if (data.code == 200) {
yield put({ yield put({
type: 'uploadcourseware/updateState', type: 'uploadcourseware/updateState',
......
src/models/thememgt.js
View file @ 84aae436
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
return; return;
} }
yield put(routerRedux.push({ yield put(routerRedux.push({
pathname: `/sjd/clockmgt/${payload.subject_type}/${classId}/${payload.subject_id}`, pathname: `/sjd/clockmgt/${payload.subject_type}/${payload.subject_id}`,
})); }));
}, },
* subjecttypechange({ payload }, { call, put, select }) { * subjecttypechange({ payload }, { call, put, select }) {
......
src/pages/officialweb/pagecomponent/AdCarousel.less
View file @ 84aae436
@import '../../../less/variables.less'; @import '../../../less/variables.less';
.switchWrap { .switchWrap {
margin: 10px 0; padding: 10px;
} }
.carouselWrap { .carouselWrap {
width: 100%; width: 100%;
......
src/pages/officialweb/pagecomponent/SchoolInfo.js
View file @ 84aae436
...@@ -30,12 +30,9 @@ class SchoolInfo extends React.Component { ...@@ -30,12 +30,9 @@ class SchoolInfo extends React.Component {
<img className={PageStyle.shareicon} src={`${__IMGCDN__}shareicon.png`} alt="" /> <img className={PageStyle.shareicon} src={`${__IMGCDN__}shareicon.png`} alt="" />
</div> </div>
</div> </div>
{ <div className={PageStyle.soundBox}>
schoolInfo.notice && <Icon type="sound" />&nbsp;&nbsp;&nbsp; <div className={PageStyle.notice}>{schoolInfo.notice}</div>
<div className={PageStyle.soundBox}> </div>
<Icon type="sound" />&nbsp;&nbsp;&nbsp;{schoolInfo.notice}
</div>
}
<div className={PageStyle.schoolocationbox}> <div className={PageStyle.schoolocationbox}>
<img src={`${__IMGCDN__}locationicon.png`} className={PageStyle.locationicon} alt="" /> <img src={`${__IMGCDN__}locationicon.png`} className={PageStyle.locationicon} alt="" />
<span className={PageStyle.schoolocation}>{schoolInfo.location_address || ''}</span> <span className={PageStyle.schoolocation}>{schoolInfo.location_address || ''}</span>
......
src/pages/officialweb/pagecomponent/SchoolInfo.less
View file @ 84aae436
...@@ -39,6 +39,16 @@ ...@@ -39,6 +39,16 @@
white-space: nowrap; white-space: nowrap;
margin-bottom: 5px; margin-bottom: 5px;
} }
@keyframes around {
from {
margin-left: 100%;
}
to {
/* var接受传入的变量 */
margin-left: var(--marqueeWidth--);
}
}
.wantlearnstatic { .wantlearnstatic {
width: 80%; width: 80%;
:global { :global {
...@@ -71,8 +81,13 @@ ...@@ -71,8 +81,13 @@
height: 22px; height: 22px;
font-size: 12px; font-size: 12px;
color:rgba(0,0,0,0.65); color:rgba(0,0,0,0.65);
white-space: nowrap; display: flex;
overflow: hidden; align-items: center;
text-overflow: ellipsis;
margin-bottom: 10px; margin-bottom: 10px;
.notice {
white-space: nowrap;
width: max-content;
overflow: hidden;
text-overflow: ellipsis;
}
} }
src/pages/officialweb/pagecomponent/SchoolIntro.js
View file @ 84aae436
...@@ -25,7 +25,6 @@ class SchoolIntro extends React.Component { ...@@ -25,7 +25,6 @@ class SchoolIntro extends React.Component {
} }
render() { render() {
const { data, schoolInfo, showStatus } = this.props; const { data, schoolInfo, showStatus } = this.props;
console.log(data, 'data');
return ( return (
<div className={PageStyle.Bannercontainer}> <div className={PageStyle.Bannercontainer}>
{ {
......
src/pages/officialweb/pagecomponent/StudentClock.less
View file @ 84aae436
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
padding: 18px 0 0 12px; padding: 18px 0 0 12px;
} }
.switchWrap { .switchWrap {
margin: 10px 0; margin-bottom: 10px;
padding-left: 10px;
} }
.headertitle { .headertitle {
width: 100px; width: 100px;
......
src/pages/pushsetting/index.js
View file @ 84aae436
...@@ -40,7 +40,6 @@ class PushSetting extends React.Component { ...@@ -40,7 +40,6 @@ class PushSetting extends React.Component {
sid, sid,
hasPushAuth, hasPushAuth,
} = this.props; } = this.props;
console.log(wxInfo, 'wxInfo');
const data = [ const data = [
{ {
title: 'Ant Design Title 1', title: 'Ant Design Title 1',
......
src/pages/student/index.js
View file @ 84aae436
...@@ -658,7 +658,7 @@ class StudentMgt extends React.Component { ...@@ -658,7 +658,7 @@ class StudentMgt extends React.Component {
wechat_status: '', wechat_status: '',
assign_class_status: '', assign_class_status: '',
schedule_id: '', schedule_id: '',
extra: 'time,recently_course,leaves_count', extra: 'time,recently_course,leaves_count,integral_count',
birthday_start: '', birthday_start: '',
birthday_end: '', birthday_end: '',
}, },
......
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