Commit 4ea82d25 by chenxin

fix:找你马策略保存bug

parent cdfbe425
...@@ -80,9 +80,7 @@ export default { ...@@ -80,9 +80,7 @@ export default {
{ label: '营销内容', prop: 'title', minWidth: '120', align: 'left', fixed: 'left' }, { label: '营销内容', prop: 'title', minWidth: '120', align: 'left', fixed: 'left' },
{ label: '批次人次', prop: 'totalCount', width: '120', align: 'left' }, { label: '批次人次', prop: 'totalCount', width: '120', align: 'left' },
{ label: '预计发送人次', prop: 'filterCount', width: '120', align: 'left' }, { label: '预计发送人次', prop: 'filterCount', width: '120', align: 'left' },
{ label: '实际送达人次', prop: 'successCount', width: '120', align: 'left' }, { label: '实际送达人次', prop: 'successCount', width: '120', align: 'left' }
{ label: '主门店', prop: 'mainClerkCode', minWidth: '120', align: 'left' },
{ label: '专属导购', prop: 'mainStoreName', minWidth: '120', align: 'left' }
], ],
tableList: [], tableList: [],
dialogShow: false, dialogShow: false,
......
...@@ -129,7 +129,7 @@ import dmThreshold from '../common/threshold.vue'; ...@@ -129,7 +129,7 @@ import dmThreshold from '../common/threshold.vue';
export default { export default {
mixins: [editAlertMixin], mixins: [editAlertMixin],
data() { data() {
const that = this; // const that = this;
return { return {
loading: false, loading: false,
// 参与门槛组件传递的数据 // 参与门槛组件传递的数据
...@@ -221,9 +221,9 @@ export default { ...@@ -221,9 +221,9 @@ export default {
isEdit: this.$route.meta.type === 'edit', isEdit: this.$route.meta.type === 'edit',
isAdd: this.$route.meta.type === 'add', isAdd: this.$route.meta.type === 'add',
pickerOptions: { pickerOptions: {
disabledDate(now) { // disabledDate(now) {
return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd; // return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
} // }
} }
}; };
}, },
......
...@@ -115,7 +115,7 @@ import dmThreshold from '../common/threshold.vue'; ...@@ -115,7 +115,7 @@ import dmThreshold from '../common/threshold.vue';
export default { export default {
mixins: [editAlertMixin], mixins: [editAlertMixin],
data() { data() {
const that = this; // const that = this;
return { return {
loading: false, loading: false,
// 参与门槛组件传递的数据 // 参与门槛组件传递的数据
...@@ -189,9 +189,9 @@ export default { ...@@ -189,9 +189,9 @@ export default {
isEdit: this.$route.meta.type === 'edit', isEdit: this.$route.meta.type === 'edit',
isAdd: this.$route.meta.type === 'add', isAdd: this.$route.meta.type === 'add',
pickerOptions: { pickerOptions: {
disabledDate(now) { // disabledDate(now) {
return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd; // return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
} // }
} }
}; };
}, },
......
...@@ -200,7 +200,7 @@ let result = {}; ...@@ -200,7 +200,7 @@ let result = {};
export default { export default {
mixins: [editAlertMixin], mixins: [editAlertMixin],
data() { data() {
const that = this; // const that = this;
return { return {
loading: false, loading: false,
tableLoading: false, tableLoading: false,
...@@ -290,9 +290,9 @@ export default { ...@@ -290,9 +290,9 @@ export default {
isEdit: this.$route.meta.type === 'edit', isEdit: this.$route.meta.type === 'edit',
isAdd: this.$route.meta.type === 'add', isAdd: this.$route.meta.type === 'add',
pickerOptions: { pickerOptions: {
disabledDate(now) { // disabledDate(now) {
return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd; // return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
} // }
} }
}; };
}, },
......
...@@ -160,7 +160,7 @@ export default { ...@@ -160,7 +160,7 @@ export default {
name: 'ptyx-form', name: 'ptyx-form',
mixins: [editAlertMixin], mixins: [editAlertMixin],
data() { data() {
const that = this; // const that = this;
return { return {
// eslint-disable-next-line // eslint-disable-next-line
defaultImg: require('../../../assets/img/loaderror.png'), defaultImg: require('../../../assets/img/loaderror.png'),
...@@ -242,9 +242,9 @@ export default { ...@@ -242,9 +242,9 @@ export default {
startGame: {}, startGame: {},
shareGame: {}, shareGame: {},
pickerOptions: { pickerOptions: {
disabledDate(now) { // disabledDate(now) {
return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd; // return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
} // }
} }
}; };
}, },
......
...@@ -80,7 +80,7 @@ let cardType = 'firstStrategy'; ...@@ -80,7 +80,7 @@ let cardType = 'firstStrategy';
export default { export default {
mixins: [editAlertMixin], mixins: [editAlertMixin],
data() { data() {
const that = this; // const that = this;
return { return {
loading: false, loading: false,
tableLoading: false, tableLoading: false,
...@@ -139,9 +139,9 @@ export default { ...@@ -139,9 +139,9 @@ export default {
isAdd: this.$route.meta.type === 'add', isAdd: this.$route.meta.type === 'add',
isInfo: this.$route.meta.type === 'info', isInfo: this.$route.meta.type === 'info',
pickerOptions: { pickerOptions: {
disabledDate(now) { // disabledDate(now) {
return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd; // return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
} // }
} }
}; };
}, },
...@@ -217,12 +217,12 @@ export default { ...@@ -217,12 +217,12 @@ export default {
this.loading = true; this.loading = true;
let res = await znmDetail({ gameActivityId: isAdd ? '' : this.$route.params.id }); let res = await znmDetail({ gameActivityId: isAdd ? '' : this.$route.params.id });
this.loading = false; this.loading = false;
console.log(res);
const gameDetail = res.result.gameDetail; if (typeof res.result === 'string') {
if (typeof gameDetail === 'string') { this.form.gameActivityId = res.result;
this.form.gameActivityId = gameDetail;
return; return;
} }
const gameDetail = res.result.gameDetail;
this.form = Object.assign(this.form, { this.form = Object.assign(this.form, {
gameActivityId: gameDetail.gameActivityId, gameActivityId: gameDetail.gameActivityId,
......
...@@ -220,7 +220,6 @@ export default { ...@@ -220,7 +220,6 @@ export default {
// window.location = downLoadUrl; // window.location = downLoadUrl;
// }); // });
// }, // },
// TODO
exportExcel() { exportExcel() {
this.dialogVisible = true; this.dialogVisible = true;
this.excelUrl = exportSmsExcel; this.excelUrl = exportSmsExcel;
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
</div> </div>
<div class="dm-wrap"> <div class="dm-wrap">
<h3 class="dm-title__label--outer">今日消费</h3> <h3 class="dm-title__label--outer">今日消费</h3>
<el-row :gutter="20" class="recharge-today"> <el-row class="recharge-today" :gutter="20">
<el-col :span="6"> <el-col :span="5">
<div class="recharge-today-item border2 clearfix"> <div class="recharge-today-item border2 clearfix">
<div class="text-center fl"> <div class="text-center fl">
<div class="icon-box"> <div class="icon-box">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div class="recharge-today-item border2 clearfix"> <div class="recharge-today-item border2 clearfix">
<div class="text-center fl"> <div class="text-center fl">
<div class="icon-box color2"> <div class="icon-box color2">
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div class="recharge-today-item border2 clearfix"> <div class="recharge-today-item border2 clearfix">
<div class="text-center fl"> <div class="text-center fl">
<div class="icon-box color3"> <div class="icon-box color3">
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="5">
<div class="recharge-today-item border2 clearfix"> <div class="recharge-today-item border2 clearfix">
<div class="text-center fl"> <div class="text-center fl">
<div class="icon-box color4"> <div class="icon-box color4">
...@@ -73,6 +73,22 @@ ...@@ -73,6 +73,22 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="5">
<div class="recharge-today-item border2 clearfix">
<div class="text-center fl">
<div class="icon-box color5">
<i class="iconfont icon-luyinzhong fz26"></i>
</div>
<p>通话录音</p>
</div>
<div class="text-center fr">
<p class="text-right">
<span class="fz30">{{ recharge.callTime || 0 }}</span> 分钟
</p>
<p class="regular-font-color">合计费用:¥{{ (recharge.callFee / 1000).toFixed(2) || 0 }}</p>
</div>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
<div class="dm-wrap"> <div class="dm-wrap">
...@@ -165,6 +181,9 @@ export default { ...@@ -165,6 +181,9 @@ export default {
margin: 24px; margin: 24px;
} }
.recharge-today { .recharge-today {
.el-col-5 {
width: 20% !important;
}
&-item { &-item {
padding: 20px; padding: 20px;
margin: 4px; margin: 4px;
...@@ -182,6 +201,9 @@ export default { ...@@ -182,6 +201,9 @@ export default {
&.color4 { &.color4 {
background: #4fa6f1; background: #4fa6f1;
} }
&.color5 {
background: #f39925;
}
i { i {
line-height: 60px; line-height: 60px;
color: #fff; color: #fff;
......
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