update: 短信营销

src/views/message/form.vue

@@ -148,6 +148,10 @@ export default {
           groupType: this.info.memberType === 0 ? 0 : 1
         };
         const res = await checkMessageSendCount(params);
+        if (res.result <= 0) {
+          this.$alert('抱歉，您当前所选人群数量为0，请重新选择人群', '提示');
+          return;
+        }
         if (res.errorCode === 0) {
           this.$confirm(
             `<div>

src/views/message/record.vue

@@ -22,7 +22,12 @@
       <el-table-column label="状态" prop="sendStatus" align="left" width="140px">
         <template slot-scope="scope">
           <span v-if="scope.row.sendStatus === 5"><span class="dm-status--primary--flash"></span>执行中</span>
-          <span v-else :class="'dm-status--' + filterStatus(scope.row.sendStatus).type">{{ filterStatus(scope.row.sendStatus).label }}</span>
+          <span v-else-if="filterStatus(scope.row.sendStatus)" :class="'dm-status--' + filterStatus(scope.row.sendStatus).type">
+            {{ filterStatus(scope.row.sendStatus).label }}
+            <el-tooltip v-if="scope.row.sendStatus == 2" :content="scope.row.failReason" placement="top">
+              <i class="el-icon-warning" style="color:#f56c6c;cursor:pointer;margin-left:3px;"></i>
+            </el-tooltip>
+          </span>
           <time-counts v-if="scope.row.sendStatus == 0" :key="scope.row.smsId" class="primary-color fz12" :defaultVal="scope.row.sendTime" :autoStart="true"></time-counts>
         </template>
       </el-table-column>
@@ -51,7 +56,7 @@ export default {
   mixins: [tableMethods],
   data() {
     return {
-      sendStatusOptions: [{ value: '', label: '所有状态', type: '' }, { value: 0, label: '定时执行', type: 'warning' }, { value: 1, label: '执行完毕', type: 'success' }, { value: 2, label: '执行失败', type: 'danger' }, { value: 3, label: '无可用模板', type: 'danger' }, { value: 5, label: '执行中', type: 'primary--flash' }, { value: -1, label: '已失效', type: 'danger' }], // eslint-disable-line
+      sendStatusOptions: [{ value: '', label: '所有状态', type: '' }, { value: 0, label: '定时执行', type: 'warning' }, { value: 1, label: '已执行', type: 'success' }, { value: 2, label: '执行失败', type: 'danger' }, { value: 5, label: '执行中', type: 'primary--flash' }, { value: -1, label: '已失效', type: 'danger' }], // eslint-disable-line
       recordLoading: false,
       messageList: [],
       recordHeader: [
@@ -159,7 +164,7 @@ export default {
         });
     },
     filterStatus(val) {
-      let result = { label: '执行错误', type: 'warning' };
+      let result = null;
       this.sendStatusOptions.forEach(v => {
         if (val === v.value) result = v;
       });

src/views/recharge/consume.vue

@@ -46,7 +46,7 @@
         <el-table-column align="left" width="100" prop="countNum" label="计费条数">
           <template slot-scope="scope">{{ scope.row.countNum }}条 </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="服务门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="gray">{{ scope.row.storeGroupName }}</p>
@@ -75,7 +75,7 @@
           </template>
         </el-table-column>
         <el-table-column align="left" width="150" prop="receivePhone" label="接收号码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="服务门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
@@ -101,7 +101,7 @@
           </template>
         </el-table-column>
         <el-table-column align="left" prop="receivePhone" label="接收号码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="服务门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" width="320" prop="storeName" label="门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
@@ -123,7 +123,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" min-width="320" prop="storeName" label="任务门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" min-width="320" prop="storeName" label="门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
@@ -168,7 +168,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" align="left" prop="storeName" width="350" label="任务门店">
+        <el-table-column :show-overflow-tooltip="true" align="left" prop="storeName" width="350" label="门店">
           <template slot-scope="scope">
             <p>{{ scope.row.storeName }}</p>
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>