Merge branch 'cx' into 'dev'

fix:找你马策略保存bug

See merge request !8

src/views/ecm/batch-list.vue

@@ -80,9 +80,7 @@ export default {
         { label: '营销内容', prop: 'title', minWidth: '120', align: 'left', fixed: 'left' },
         { label: '批次人次', prop: 'totalCount', width: '120', align: 'left' },
         { label: '预计发送人次', prop: 'filterCount', 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' }
+        { label: '实际送达人次', prop: 'successCount', width: '120', align: 'left' }
       ],
       tableList: [],
       dialogShow: false,

src/views/game/dzp/form.vue

@@ -129,7 +129,7 @@ import dmThreshold from '../common/threshold.vue';
 export default {
   mixins: [editAlertMixin],
   data() {
-    const that = this;
+    // const that = this;
     return {
       loading: false,
       // 参与门槛组件传递的数据
@@ -221,9 +221,9 @@ export default {
       isEdit: this.$route.meta.type === 'edit',
       isAdd: this.$route.meta.type === 'add',
       pickerOptions: {
-        disabledDate(now) {
-          return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
-        }
+        // disabledDate(now) {
+        //   return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
+        // }
       }
     };
   },

src/views/game/ggk/form.vue

@@ -115,7 +115,7 @@ import dmThreshold from '../common/threshold.vue';
 export default {
   mixins: [editAlertMixin],
   data() {
-    const that = this;
+    // const that = this;
     return {
       loading: false,
       // 参与门槛组件传递的数据
@@ -189,9 +189,9 @@ export default {
       isEdit: this.$route.meta.type === 'edit',
       isAdd: this.$route.meta.type === 'add',
       pickerOptions: {
-        disabledDate(now) {
-          return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
-        }
+        // disabledDate(now) {
+        //   return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
+        // }
       }
     };
   },

src/views/game/klfl/form.vue

@@ -200,7 +200,7 @@ let result = {};
 export default {
   mixins: [editAlertMixin],
   data() {
-    const that = this;
+    // const that = this;
     return {
       loading: false,
       tableLoading: false,
@@ -290,9 +290,9 @@ export default {
       isEdit: this.$route.meta.type === 'edit',
       isAdd: this.$route.meta.type === 'add',
       pickerOptions: {
-        disabledDate(now) {
-          return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
-        }
+        // disabledDate(now) {
+        //   return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
+        // }
       }
     };
   },

src/views/game/ptyx/form.vue

@@ -160,7 +160,7 @@ export default {
   name: 'ptyx-form',
   mixins: [editAlertMixin],
   data() {
-    const that = this;
+    // const that = this;
     return {
       // eslint-disable-next-line
       defaultImg: require('../../../assets/img/loaderror.png'),
@@ -242,9 +242,9 @@ export default {
       startGame: {},
       shareGame: {},
       pickerOptions: {
-        disabledDate(now) {
-          return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
-        }
+        // disabledDate(now) {
+        //   return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
+        // }
       }
     };
   },

src/views/game/znm/form.vue

@@ -80,7 +80,7 @@ let cardType = 'firstStrategy';
 export default {
   mixins: [editAlertMixin],
   data() {
-    const that = this;
+    // const that = this;
     return {
       loading: false,
       tableLoading: false,
@@ -139,9 +139,9 @@ export default {
       isAdd: this.$route.meta.type === 'add',
       isInfo: this.$route.meta.type === 'info',
       pickerOptions: {
-        disabledDate(now) {
-          return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
-        }
+        // disabledDate(now) {
+        //   return now.getTime() < Date.now() - 24 * 60 * 60 * 1000 && that.isAdd;
+        // }
       }
     };
   },
@@ -217,12 +217,12 @@ export default {
       this.loading = true;
       let res = await znmDetail({ gameActivityId: isAdd ? '' : this.$route.params.id });
       this.loading = false;
-      console.log(res);
-      const gameDetail = res.result.gameDetail;
-      if (typeof gameDetail === 'string') {
-        this.form.gameActivityId = gameDetail;
+
+      if (typeof res.result === 'string') {
+        this.form.gameActivityId = res.result;
         return;
       }
+      const gameDetail = res.result.gameDetail;
 
       this.form = Object.assign(this.form, {
         gameActivityId: gameDetail.gameActivityId,

src/views/message/detail.vue

@@ -220,7 +220,6 @@ export default {
     //     window.location = downLoadUrl;
     //   });
     // },
-    // TODO
     exportExcel() {
       this.dialogVisible = true;
       this.excelUrl = exportSmsExcel;

src/views/recharge/board.vue

@@ -8,8 +8,8 @@
     </div>
     <div class="dm-wrap">
       <h3 class="dm-title__label--outer">今日消费</h3>
-      <el-row :gutter="20" class="recharge-today">
-        <el-col :span="6">
+      <el-row class="recharge-today" :gutter="20">
+        <el-col :span="5">
           <div class="recharge-today-item border2 clearfix">
             <div class="text-center fl">
               <div class="icon-box">
@@ -25,7 +25,7 @@
             </div>
           </div>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <div class="recharge-today-item border2 clearfix">
             <div class="text-center fl">
               <div class="icon-box color2">
@@ -41,7 +41,7 @@
             </div>
           </div>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <div class="recharge-today-item border2 clearfix">
             <div class="text-center fl">
               <div class="icon-box color3">
@@ -57,7 +57,7 @@
             </div>
           </div>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <div class="recharge-today-item border2 clearfix">
             <div class="text-center fl">
               <div class="icon-box color4">
@@ -73,6 +73,22 @@
             </div>
           </div>
         </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>
     </div>
     <div class="dm-wrap">
@@ -165,6 +181,9 @@ export default {
   margin: 24px;
 }
 .recharge-today {
+  .el-col-5 {
+    width: 20% !important;
+  }
   &-item {
     padding: 20px;
     margin: 4px;
@@ -182,6 +201,9 @@ export default {
       &.color4 {
         background: #4fa6f1;
       }
+      &.color5 {
+        background: #f39925;
+      }
       i {
         line-height: 60px;
         color: #fff;