Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect'

分享触发时间问题和积分规则回显问题

See merge request !52

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -51,12 +51,12 @@
       <el-row :gutter="10">
         <el-col :span="12">
           <el-form-item :label="$t('中文封面图')" prop="coverImageZh">
-            <image-upload v-model="queryParams.coverImageZh" />
+            <image-upload v-model="queryParams.coverImageZh" :isShowEditButton="!showViewTime"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('英文封面图')" prop="coverImageEn">
-            <image-upload v-model="queryParams.coverImageEn" />
+            <image-upload v-model="queryParams.coverImageEn" :isShowEditButton="!showViewTime"/>
           </el-form-item>
         </el-col>
       </el-row>
@@ -473,6 +473,7 @@
       </el-col>
       <el-col :span="3">
         <el-button
+        v-if="$route.query.pageStatus != 'view'"
           type="primary"
           style="width: 100%"
           @click="handleResetIntegralRule"
@@ -997,7 +998,7 @@ export default {
     } else {
       this.handleGetRegionTreeList();
     }
-    this.queryParams.extraShare.activityUrl = process.env.NODE_ENV == 'production' ?'https://app2.groupage.cn/#/pages/activityShare/index':"https://apptest.groupage.cn/#/pages/activityShare/index"
+    this.queryParams.extraShare.activityUrl = '/pages/activityShare/index'
   },
   activated() {},
   methods: {

src/views/ecw/memberManagement/sharingStatistics/index.vue

@@ -141,7 +141,7 @@
         width="180"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) || "--" }}</span>
+          <span>{{ parseTime(scope.row.lastTriggerTime) || "--" }}</span>
         </template>
       </el-table-column>
     </el-table>