Merge branch 'feature/6月迭代-抖音' into dev

# Conflicts:
#	dist/static/js/manifest.cdeb591d1beb41b20702.js.map

index.html

@@ -32,5 +32,6 @@
     <script src="//web-1251519181.file.myqcloud.com/components/input.2.0.00.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/export.1.0.1.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script> -->
+    <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script>
   </body>
 </html>

src/router/index.js

@@ -93,7 +93,10 @@ export const constantRouterMap = [
       {
         path: '/pointSystem',
         name: '积分制度',
-        component: _import('companyGroup/membershipSystem', 'pointSystem')
+        component: _import('companyGroup/membershipSystem', 'pointSystem'),
+        meta: {
+          keepAlive: true
+        }
       },
       {
         path: '/addPointSystem',

src/view/companyGroup/membershipSystem/components/MemberCardTable.vue

@@ -73,7 +73,7 @@
   </div>
 </template>
 <script>
-import { postRequest, postJson } from '@/api/api';
+import { postRequest, postJson, getRequest } from '@/api/api';
 import showMsg from '@/common/js/showmsg';
 import errMsg  from '@/common/js/error';
 import Sortable from 'sortablejs';
@@ -131,6 +131,7 @@ export default {
   mounted() {
     if (this.type==1) {
       this.rowDrop();//行拖拽排序
+      this.getOpenThird();
     }
   },
   data() {
@@ -139,9 +140,32 @@ export default {
       loading: false,
       isEditSort: false,
       sortTable: null,
+      isExist: false,
     };
   },
   methods: {
+    getOpenThird() {
+      getRequest('/api-admin/judge-enterprise-third-channel', {}).then(res => {
+        res.data.result.isExist = true
+        const { result } = res.data || {};
+        this.isExist = result.isExist;
+      });
+    },
+    checkOpenThird() {
+      // 未开通的商户，不提示
+      // 开通的商户才提示
+      // 点击已完成才进行下一步操作
+      return new Promise((resolve, reject) => {
+        if (this.isExist && this.type == 1) {
+          this.$confirm('您已对接「天猫」、「抖音」渠道的会员等级，为确保每个渠道的会员等级对应关系一致，在调整会员等级顺序或者新增会员等级前请联系运营经理确认是否对应渠道的会员等级关系已维护完成！', '提示', {
+            cancelButtonText: '未完成',
+            confirmButtonText: '已完成'
+          }).then(resolve);
+          return;
+        }
+        resolve();
+      });
+    },
     // 编辑集团
     editCliqueLevel(index, row, obj, type) {
       this.$emit('edit', row, type);
@@ -167,13 +191,17 @@ export default {
         });
     },
     addCard(type) {
-      if (this.tableData.length >= 20) return this.$message.warning('每个卡类型最多可创建20张会员卡')
-      this.$emit('add', type);
+      this.checkOpenThird().then(() => {
+        if (this.tableData.length >= 20) return this.$message.warning('每个卡类型最多可创建20张会员卡')
+        this.$emit('add', type);
+      });
     },
     editSort() {
-      if (!this.list.length) return this.$message.warning(`暂无${this.$options.filters.typeFilter(this.type)}！`);
-      this.isEditSort = true;
-      this.sortTable.option('sort', true);
+      this.checkOpenThird().then(() => {
+        if (!this.list.length) return this.$message.warning(`暂无${this.$options.filters.typeFilter(this.type)}！`);
+        this.isEditSort = true;
+        this.sortTable.option('sort', true);
+      });
     },
     cancelEditSort() {
       this.isEditSort = false;

src/view/companyGroup/membershipSystem/memberCardSet.vue

@@ -716,6 +716,7 @@ export default {
     that.getMemberSetInfo();
     that.getTempInfo();
     that.getEnterprise();
+    this.getOpenThird();
   }
 };
 </script>

src/view/index/index.vue

@@ -8,7 +8,10 @@
           <vue-gic-aside-menu :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag="collapseFlag"></vue-gic-aside-menu>
         </div>
         <div class="right-right" :class="{ margin64: collapseFlag }">
-          <router-view></router-view>
+          <keep-alive>
+            <router-view v-if="$route.meta.keepAlive"></router-view>
+          </keep-alive>
+          <router-view v-if="!$route.meta.keepAlive"></router-view>
         </div>
         <!-- <transition name="fade" mode="out-in">
             <router-view></router-view>