Skip to content

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

优化

parent e842c26c
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 29 deletions
index.html
View file @ a048648b
......@@ -18,5 +18,5 @@
</head>
<body>
<div id="root"></div>
<script type="text/javascript" src="/dist/main.8c8aaa.js"></script></body>
<script type="text/javascript" src="/dist/main.176234.js"></script></body>
</html>
\ No newline at end of file
src/models/createtheme.js
View file @ a048648b
......@@ -35,7 +35,7 @@ export default {
{ type: 'text', value: '' },
],
is_encrypt: 0,
end_time: moment(moment().add(7, 'days')),
end_time: moment(moment().add(7, 'days').endOf('day')),
start_time: moment(moment(), 'YYYY/MM/DD HH:mm'),
push_status: 2,
push_time: '09:00',
......@@ -60,7 +60,7 @@ export default {
{ type: 'text', value: '' },
],
is_encrypt: 0,
end_time: moment(moment().add(7, 'days')),
end_time: moment(moment().add(7, 'days').endOf('day')),
start_time: moment(moment(), 'YYYY/MM/DD HH:mm'),
push_status: 2,
push_time: '09:00',
......@@ -105,7 +105,7 @@ export default {
// 闯关打卡新
customsParams: {
title: '',
subject_count: 1,
subject_count: 10,
max_clock_count: 1,
join_rule_type: 1,
password: '',
......@@ -427,7 +427,7 @@ export default {
{ type: 'text', value: '' },
],
is_encrypt: 0,
end_time: moment(moment().add(7, 'days')),
end_time: moment(moment().add(7, 'days').endOf('day')),
start_time: moment(moment(), 'YYYY/MM/DD HH:mm'),
push_status: 2,
push_time: '09:00',
......@@ -459,7 +459,7 @@ export default {
{ type: 'text', value: '' },
],
is_encrypt: 0,
end_time: moment(moment().add(7, 'days')),
end_time: moment(moment().add(7, 'days').endOf('day')),
start_time: moment(moment(), 'YYYY/MM/DD HH:mm'),
push_status: 2,
push_time: '09:00',
......@@ -1889,7 +1889,7 @@ export default {
type: 'getStoreImg',
payload: {
record: {
class_id: data.data.class_id,
school_id: data.data.school.id,
id: data.data.id,
},
},
......@@ -1927,7 +1927,7 @@ export default {
const { record } = payload;
const loadmessage = message.loading('小程序码生成中...', 0);
const data = yield call(commonAjax.generateQrcode, {
scene: `i=${record.class_id}&t=${record.id}`,
scene: `t=${record.id}&s=${record.school_id}&w=0`,
page: 'src/pages/sharemoretheme/index',
width: 430,
});
......@@ -2419,7 +2419,7 @@ export default {
{ type: 'text', value: '' },
],
is_encrypt: 0,
end_time: moment(moment().add(7, 'days')),
end_time: moment(moment().add(7, 'days').endOf('day')),
start_time: moment(moment(), 'YYYY/MM/DD HH:mm'),
push_status: 2,
push_time: '09:00',
......@@ -2444,7 +2444,7 @@ export default {
{ type: 'text', value: '' },
],
is_encrypt: 0,
end_time: moment(moment().add(7, 'days')),
end_time: moment(moment().add(7, 'days').endOf('day')),
start_time: moment(moment(), 'YYYY/MM/DD HH:mm'),
push_status: 2,
push_time: '09:00',
......@@ -2488,7 +2488,7 @@ export default {
// 闯关打卡新
customsParams: {
title: '',
subject_count: 1,
subject_count: 10,
max_clock_count: 1,
join_rule_type: 1,
password: '',
......
src/models/newthemelist.js
View file @ a048648b
......@@ -76,7 +76,7 @@ export default {
}
},
* savePublish({ payload }, { call, put, select }) {
const { record } = payload;
const { record, type } = payload;
const { sid } = yield select(state => state.webapp);
const data = yield call(themeAjax.saveRelease, {
status: 2,
......@@ -85,13 +85,22 @@ export default {
});
if (data.code === 200) {
message.success('发布成功', 0.5);
yield put({
type: 'queryList',
payload: {
params: {
if (type == 1) {
yield put({
type: 'createtheme/createThemeModalfindEmigrated',
payload: {
store_id: data.data.id,
},
},
});
});
} else {
yield put({
type: 'queryList',
payload: {
params: {
},
},
});
}
} else {
yield put({
type: 'webapp/errorrequestresolve',
......@@ -150,14 +159,14 @@ export default {
case 1:
params = {
scene: `t=${record.id}&s=${record.school_id}&w=0`,
page: 'src/pages/themeindex/index',
page: 'src/pages/themeindex/landpage',
width: 430,
};
break;
case 2:
params = {
scene: `t=${record.id}&s=${record.school_id}&w=0`,
page: 'src/pages/calendarthemeindex/index',
page: 'src/pages/calendarthemeindex/landpage',
width: 430,
};
break;
......
src/pages/index/index.js
View file @ a048648b
......@@ -1160,7 +1160,7 @@ class StaticCenter extends React.Component {
<Col xs={{ span: 8, offset: 0 }} sm={{ span: 8, offset: 0 }} md={{ span: 8, offset: 0 }} lg={{ span: 4, offset: 0 }} xl={{ span: 4, offset: 0 }} xxl={{ span: 4, offset: 0 }}>
<div className={pageStyle.fasterItem} onClick={this.goClockList}>
<div className={pageStyle.fasterLeft}>
<img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon11.png?v=1`} alt="" />
<img className={pageStyle.fasterImg} src={`${__IMGCDN__}index/index_icon12.png?v=1`} alt="" />
</div>
<span>打卡列表</span>
</div>
......
src/pages/newtheme/calendarclock/index.js
View file @ a048648b
......@@ -592,10 +592,9 @@ class CalendarClockForm extends React.Component {
</FormItem>
<Divider />
<div className={pageStyle.title} >打卡营销页</div>
<FormItem required {...formItemModalLineLayout} label="打卡营销页" style={{ marginBottom: 0 }}>
<FormItem required {...formItemModalLineLayout} label="打卡营销页" style={{ marginBottom: 20 }}>
<span onClick={this.handleClickMarketing}>{themeAdInfo.title ? themeAdInfo.title : '请选择营销页'}<Icon type="right" /></span>
</FormItem>
<p className={pageStyle.markeTip}>可在学生加入打卡前展示, 此功能可收集有意向学生的联系方式 <span>了解详情</span></p>
<div className={pageStyle.title}>更多设置 <span onClick={this.handleClickShow} className={pageStyle.pack}>{isShow ? '收起' : '展开'}</span></div>
<div className={isShow ? pageStyle.panpelBox : pageStyle.panpelhideBox}>
<div className={pageStyle.commonwrap}>
......
src/pages/newtheme/customsclock/detail.js
View file @ a048648b
......@@ -171,6 +171,7 @@ class SuccessStoreForm extends React.Component {
type: 'newthemelist/savePublish',
payload: {
record,
type: 1,
},
});
}
......@@ -309,7 +310,7 @@ class SuccessStoreForm extends React.Component {
key: 'value',
render: (text, record) => {
return (
<span>{ record.infoCollection && record.infoCollection.content ? JSON.parse(record.infoCollection.content).value : '-' }</span>
<span>{ record.subjectStudent && record.subjectStudent.content ? JSON.parse(record.subjectStudent.content).value : '-' }</span>
);
},
},
......
src/pages/newtheme/jobclock/index.js
View file @ a048648b
......@@ -491,10 +491,9 @@ class JobClockForm extends React.Component {
</div>
<Divider />
<div className={pageStyle.title} >打卡营销页</div>
<FormItem {...formItemModalLineLayout} required label="打卡营销页" style={{ marginBottom: 0 }}>
<FormItem {...formItemModalLineLayout} required label="打卡营销页" style={{ marginBottom: 20 }}>
<span onClick={this.handleClickMarketing}>{themeAdInfo.title ? themeAdInfo.title : '请选择营销页'}<Icon type="right" /></span>
</FormItem>
<p className={pageStyle.markeTip}>可在学生加入打卡前展示, 此功能可收集有意向学生的联系方式 <span>了解详情</span></p>
<div className={pageStyle.title}>更多设置 <span onClick={this.handleClickShow} className={pageStyle.pack}>{isShow ? '收起' : '展开'}</span></div>
<div className={isShow ? pageStyle.panpelBox : pageStyle.panpelhideBox}>
<div className={pageStyle.commonwrap}>
......
src/utils/exportexcel.js
View file @ a048648b
......@@ -47,9 +47,9 @@ function exportExcel(headers, data, fileName = 'XXX.xlsx', type) {
passive_like_count: item.passive_like_count,
place_top_at_count: item.place_top_at_count,
total_share_uv: item.total_share_uv,
name: item.infoCollection && item.infoCollection.name ? item.infoCollection.name : '',
mobile: item.infoCollection && item.infoCollection.mobile ? item.infoCollection.mobile : '',
value: item.infoCollection && item.infoCollection.content ? JSON.parse(item.infoCollection.content).value : '',
name: item.subjectStudent && item.subjectStudent.name ? item.subjectStudent.name : '',
mobile: item.subjectStudent && item.subjectStudent.mobile ? item.subjectStudent.mobile : '',
value: item.subjectStudent && item.subjectStudent.content ? JSON.parse(item.subjectStudent.content).value : '',
};
});
break;
......
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