Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

src/views/ai/ai-data-detail.vue

@@ -2,7 +2,7 @@
   <div class="data-detail">
     <dm-sub-title style="margin-bottom: 5px">客户明细</dm-sub-title>
     <div class="page-tip">消费金额字段每天更新 1 次</div>
-    <el-input v-model="search.search" @change="handleCurrentChange" type="text" placeholder="请输入姓名/昵称/手机号/会员卡号" prefix-icon="el-icon-search" clearable class="search-bar"></el-input>
+    <el-input v-model="search.search" @change="handleCurrentChange(1)" type="text" placeholder="请输入姓名/昵称/手机号/会员卡号" prefix-icon="el-icon-search" clearable class="search-bar"></el-input>
     <el-table :data="tableData" v-loading="loading" tooltipEffect="light">
       <el-table-column label="基本信息" min-width="200px" show-overflow-tooltip>
         <div slot-scope="{ row }" class="member-info">
@@ -79,6 +79,7 @@ export default {
     },
     handleCurrentChange(pageNum) {
       this.search.pageNum = pageNum;
+      this.getData();
     },
     handleSizeChange(pageSize) {
       this.search.pageSize = pageSize;
@@ -103,7 +104,7 @@ export default {
   padding: 20px;
   .search-bar {
     margin-bottom: 20px;
-    width: 260px;
+    width: 290px;
   }
   .member-info {
     display: flex;

src/views/ai/ai-data-report/ai-data.vue

@@ -199,8 +199,8 @@ export default {
                 break;
             }
             // 活动不发送挂机短信时，数据指标不展示短信发送总数的字段
-            // 活动未开启活动分析时，数据指标不展示活动费用
-            return !((this.aiDataShow.smsFlag == 0 && item.key == 'sentMessagesNumber') || (this.aiDataShow.analyseFlag == 0 && item.key == 'activityCost'));
+            // 活动未开启活动分析时，数据指标展示活动费用
+            return !((this.aiDataShow.smsFlag == 0 && item.key == 'sentSuccessfullyNumber') || (this.aiDataShow.analyseFlag != 0 && item.key == 'activityCost'));
           });
         })
         .filter(el => el.length > 0);

src/views/ai/logs-unrun.vue

@@ -91,7 +91,7 @@ export default {
       }
     },
     handleSelectionChange(val) {
-      this.exportData.logIdList = val.map(v => v.planId).join(',');
+      this.exportData.logIdList = val.map(v => v.eventExecLogId).join(',');
     }
   }
 };