Merge branch 'feature/act-code' into dev

config/proxyList.js

@@ -85,5 +85,12 @@ module.exports = {
         '^/haoban-app-aggregation-web/': ''
       }
     },
+    '/dmHbApi': {
+      target: 'https://haoban.gicdev.com',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/dmHbApi': ''
+      }
+    },
   }
 }

src/api/api.js

@@ -18,6 +18,7 @@ Vue.axios.defaults.withCredentials = true; // cookie访问
 Vue.axios.defaults.headers.common['platform'] = 'haoban';
 
 Vue.axios.defaults.timeout = 500000;
+
 let local = window.location.origin;
 const userInfos = JSON.parse(sessionStorage.getItem('userInfos') || '{}');
 let gicHost = typeof userInfos.gicHost == 'string' ? userInfos.gicHost.replace(/\/$/, '') : '';

src/views/salesleads/actCodeManage/attractFlowLink/detail.vue

@@ -17,11 +17,13 @@
         <el-form-item label="链接描述" prop="remark">
           <el-input placeholder="请输入链接描述" type="textarea" class="w-340" :maxlength="100" :autosize="{ minRow: 3, maxRow: 5 }" show-word-limit v-model="form.remark"></el-input>
         </el-form-item>
-        <el-form-item label="链接标签" required prop="memberLabelId">
+        <el-form-item label="链接标签" required prop="memberLabelId" class="memberTag-form-item">
           <el-button plain v-if="!form.memberLabelId" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
-          <el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag>
+          <el-tooltip :disabled="!isEdit || form.memberLabelStatus != 0" content="已删除" placement="top" v-else>
+            <el-tag closable @close="handleTagCloseTag" :type="isEdit && form.memberLabelStatus == 0 ? 'warning' : ''">{{ form.memberLabelName }}</el-tag>
+          </el-tooltip>
         </el-form-item>
-        <dm-memberTag-group :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
+        <dm-memberTag-group isHb :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
       </div>
       <dm-sub-title type="line">分配规则</dm-sub-title>
       <p class="tips-info">
@@ -225,8 +227,6 @@ export default {
   },
   mounted() {
     this.getList();
-    console.log('mounted');
-    console.log(this.form);
     document.addEventListener('visibilitychange', () => {
       if (document.visibilityState == 'visible') {
         this.landingPage = {
@@ -280,6 +280,7 @@ export default {
       const { tagItemId, tagItemName } = data;
       this.form.memberLabelName = tagItemName;
       this.form.memberLabelId = tagItemId;
+      this.form.memberLabelStatus = 1;
     },
     handleTagCloseTag() {
       this.form.memberLabelName = '';
@@ -327,6 +328,25 @@ export default {
         this.$message.error('请选择落地页模板');
         return;
       }
+      if (this.isEdit && this.form.memberLabelStatus == 0) {
+        this.$confirm('关联的标签在GIC中已被删除，无法统计和查看添加好友客户数据，为确保后续客户数据统计，请重新关联标签', '关联的标签已被删除，请重新关联标签', {
+          confirmButtonText: '选择标签',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(res => {
+          this.form.memberLabelId = '';
+          this.form.memberLabelName = '';
+          this.$refs.form.validateField('memberLabelId');
+          this.$nextTick(_ => {
+            const isError = document.getElementsByClassName('memberTag-form-item');
+            isError[0].scrollIntoView({
+              block: 'center',
+              behavior: 'smooth'
+            });
+          });
+        });
+        return;
+      }
       const data = JSON.parse(JSON.stringify(this.form));
       data.storeRuleJson = JSON.stringify(data.storeRuleJson);
       data.customRuleJson = JSON.stringify(data.customRuleJson);

src/views/salesleads/actCodeManage/attractFlowLink/info.vue

@@ -12,7 +12,9 @@
           <el-descriptions-item label="创建人">{{ link.creatorName }}</el-descriptions-item>
           <el-descriptions-item label="创建时间">{{ filters.formatTimeStamp(link.createTime) }}</el-descriptions-item>
           <el-descriptions-item label="链接标签">
-            <el-tag size="mini" type="info">{{ link.memberLabelName }}</el-tag>
+            <el-tooltip :disabled="link.memberLabelStatus != 0" content="已删除" placement="top">
+              <el-tag size="mini" :type="link.memberLabelStatus == 0 ? 'warning' : 'info'">{{ link.memberLabelName }}</el-tag>
+            </el-tooltip>
           </el-descriptions-item>
           <el-descriptions-item label="链接描述">{{ link.remark }}</el-descriptions-item>
         </el-descriptions>

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -27,7 +27,10 @@
           </div>
           <div class="flex flex-1">
             <div class="font-14 line-22">活码标签：</div>
-            <el-tag size="small" type="info">{{ codeInfo.memberLabelName || '--' }}</el-tag>
+            <el-tooltip :disabled="codeInfo.memberLabelStatus != 0" content="已删除" placement="top">
+              <el-tag size="small" :type="codeInfo.memberLabelStatus == 0 ? 'warning' : 'info'">{{ codeInfo.memberLabelName || '--' }}</el-tag>
+            </el-tooltip>
+            <!-- <el-tag size="small" type="info">{{ codeInfo.memberLabelName || '--' }}</el-tag> -->
           </div>
         </div>
         <div v-if="codeInfo.statusFlag != 2" class="flex" style="padding-top:20px;">
@@ -199,7 +202,7 @@ export default {
   padding-bottom: 0;
   height: 40px;
   background: white;
-  width: 100%;
+  width: calc(100% - 180px);
   // left: 50px;
 }
 .button-discard {

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -230,10 +230,10 @@ export default {
         {
           text: '编辑',
           visible: row => {
-            if (row.hmType == 2 || row.statusFlag != 2) {
-              return true;
-            } else {
+            if (row.statusFlag == 2) {
               return false;
+            } else {
+              return true;
             }
           },
           handler: row => {

src/views/salesleads/components/act-code-set.vue

@@ -15,10 +15,13 @@
           <el-switch v-model="form.passFlag" class="mr15"></el-switch>
           <span class="tabs">开启后，客户添加该企业微信时，无需好友验证，将会自动添加成功</span>
         </el-form-item>
-        <el-form-item label="活码标签" prop="memberLabelId">
+        <el-form-item label="活码标签" prop="memberLabelId" class="memberTag-form-item">
           <el-button v-if="!form.memberLabelId" plain class="ylbtn" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
-          <el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag>
-          <dm-memberTag-group :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
+          <!-- <el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag> -->
+          <el-tooltip :disabled="form.memberLabelStatus != 0" content="已删除" placement="top" v-else>
+            <el-tag closable @close="handleTagCloseTag" :type="isEdit && form.memberLabelStatus == 0 ? 'warning' : ''">{{ form.memberLabelName }}</el-tag>
+          </el-tooltip>
+          <dm-memberTag-group isHb :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
         </el-form-item>
         <dm-sub-title text="欢迎语设置" type="line" class="mt40b20" />
         <welcomeItem @getWelcomeId="getWelcomeId" :welcomeIdP="form.welcomeId" ref="welcomeItem"></welcomeItem>
@@ -64,10 +67,11 @@ export default {
         passFlag: true, // 1自动通过 0否
         memberLabelId: '', //会员活动标签id
         memberLabelName: '',
-        welcomeId: '' // 欢迎语id
+        welcomeId: '', // 欢迎语id
         // clerkIdList: '', // 选择导购id
         // storeId: '' //门店id
         // hmUserNum: null //多人活码人数
+        memberLabelStatus: -1
       },
       rules: {
         hmGroupId: [{ required: true, message: '请选择活码分组', trigger: 'blur' }]
@@ -86,7 +90,6 @@ export default {
   },
   created() {
     this.searchGroup();
-    console.log(this.form, 400);
   },
   methods: {
     handleTagCloseTag() {
@@ -94,7 +97,6 @@ export default {
       this.form.memberLabelId = '';
     },
     saveTagPop(data) {
-      console.log(data, 'tagItemId');
       const { tagItemId, tagItemName } = data;
       this.form.memberLabelId = tagItemId;
       this.form.memberLabelName = tagItemName;
@@ -141,9 +143,27 @@ export default {
     },
     // 保存按钮
     save() {
-      if (!this.$refs.welcomeItem.submit()) {
+      if (this.form.memberLabelStatus == 0) {
+        this.$confirm('关联的标签在GIC中已被删除，无法统计和查看添加好友客户数据，为确保后续客户数据统计，请重新关联标签', '关联的标签已被删除，请重新关联标签', {
+          confirmButtonText: '选择标签',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(res => {
+          this.form.memberLabelId = '';
+          this.form.memberLabelName = '';
+          this.$nextTick(_ => {
+            const isError = document.getElementsByClassName('memberTag-form-item');
+            isError[0].scrollIntoView({
+              block: 'center',
+              behavior: 'smooth'
+            });
+          });
+        });
         return;
       }
+      // if (!this.$refs.welcomeItem.submit()) {
+      //   return;
+      // }
       this.$refs.form.validate(async valid => {
         if (valid) {
           this.form.passFlag = this.form.passFlag ? 1 : 0;