Merge branch 'feature/act-code' into dev

src/views/enterprise/salutatory.vue

@@ -248,7 +248,7 @@ export default {
       this.welcomeId = item.welcomeId;
     },
     goLinkDetail(row) {
-      console.log(row);
+      this.dialogVisible = false;
       if (row.type == 2) {
         this.$router.push('/actCodeDetail?hmId=' + row.referId);
       } else {

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

 <template>
-  <div class="p-20">
+  <div class="p-20" v-loading="loading">
     <el-form label-width="100px" :model="form" size="small" :rules="rules" ref="form">
       <dm-sub-title type="line">基础信息</dm-sub-title>
       <div class="section">
@@ -164,6 +164,7 @@ export default {
       },
       link: 'link',
       landingLoading: false,
+      loading: false,
       landingData: [],
       total: 0,
       landingForm: {},
@@ -264,25 +265,31 @@ export default {
       });
     },
     getDetail() {
-      linkDetail({ linkId: this.$route.params.id }).then(res => {
-        const { result } = res.data;
-        if (result) {
-          const { link, page } = result;
-          link.customRuleJson = JSON.parse(link.customRuleJson);
-          link.storeRuleJson = JSON.parse(link.storeRuleJson);
-          link.storeList = link.storeList ? link.storeList : [];
-          this.form = link;
-          this.landingForm = page;
-          this.getStoreList();
-        }
-        console.log(result);
-      });
+      this.loading = true;
+      linkDetail({ linkId: this.$route.params.id })
+        .then(res => {
+          const { result } = res.data;
+          if (result) {
+            const { link, page } = result;
+            link.customRuleJson = JSON.parse(link.customRuleJson);
+            link.storeRuleJson = JSON.parse(link.storeRuleJson);
+            link.storeList = link.storeList ? link.storeList : [];
+            this.form = link;
+            this.landingForm = page;
+            this.getStoreList();
+          }
+          console.log(result);
+        })
+        .finally(_ => {
+          this.loading = false;
+        });
     },
     saveTagPop(data) {
       const { tagItemId, tagItemName } = data;
       this.form.memberLabelName = tagItemName;
       this.form.memberLabelId = tagItemId;
       this.form.memberLabelStatus = 1;
+      this.$refs.form.validateField('memberLabelId');
     },
     handleTagCloseTag() {
       this.form.memberLabelName = '';

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

@@ -11,7 +11,7 @@
 
     <div class="flex flex-space-between m-b-16">
       <div class="flex flex-align-center">
-        <el-input placeholder="请输入模板ID/名称、创建人" class="w-260" v-model="form.searchParams" @keyup.native="value => toInput(value, searchInput)" clearable @clear="getList"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
+        <el-input placeholder="请输入链接ID/名称、创建人" class="w-260" v-model="form.searchParams" @keyup.native="value => toInput(value, searchInput)" clearable @clear="getList"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
         <el-select class="m-l-10 w-160" v-model="form.linkType" placeholder="全部类型" @change="getList" clearable @clear="clear">
           <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.key"> </el-option>
         </el-select>

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

@@ -25,7 +25,7 @@
         </div>
       </div>
     </div>
-    <div class="fixed-tab" v-if="scrollTop > 300">
+    <div class="fixed-tab" v-if="scrollTop >= fixedHeight">
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="详情信息" name="first"> <div></div> </el-tab-pane>
         <el-tab-pane label="数据统计" name="second">
@@ -115,6 +115,7 @@ export default {
   mixins: [mixin],
   data() {
     return {
+      fixedHeight: 280,
       filters,
       statisticsClerk,
       loading: false,
@@ -277,11 +278,12 @@ export default {
 
 .fixed-tab {
   position: absolute;
-  top: 80px;
+  top: 110px;
   z-index: 1;
   padding-bottom: 0;
   height: 40px;
   background: white;
+  width: calc(100% - 180px);
 }
 .welcome-left-view {
   width: 639px;

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

 <template>
   <div>
-    <div class="daily-set-content">
+    <div class="daily-set-content" v-loading="loading">
       <el-form label-width="100px" ref="form" :model="form" :rules="rules" class="form">
         <el-form-item label="模板名称" prop="pageName" required>
           <el-input show-word-limit placeholder="请输入模板名称" type="text" v-model="form.pageName" maxlength="20" class="w-340"></el-input>
@@ -33,7 +33,7 @@
       </div>
     </div>
     <div class="footBtn">
-      <el-button type="primary" @click="save">保存</el-button>
+      <el-button type="primary" @click="save" :loading="btnLoading">保存</el-button>
     </div>
   </div>
 </template>
@@ -77,6 +77,7 @@ export default {
       isEdit: this.$route.meta.type == 'edit',
       isAdd: this.$route.meta.type == 'add',
       loading: false,
+      btnLoading: false,
       rules: {
         merchantPhoneNumber: [{ validator: merchantPhoneNumberVal }]
       }
@@ -92,12 +93,17 @@ export default {
   methods: {
     getDetail() {
       console.log(this.$route);
-      guidePageDetail({ pageId: this.$route.params.id }).then(res => {
-        if (res.data.result) {
-          const result = res.data.result;
-          this.form = result;
-        }
-      });
+      this.loading = true;
+      guidePageDetail({ pageId: this.$route.params.id })
+        .then(res => {
+          if (res.data.result) {
+            const result = res.data.result;
+            this.form = result;
+          }
+        })
+        .finally(_ => {
+          this.loading = false;
+        });
     },
     getEchoEnterpriseInfo() {
       wxEnterpriseList({}).then(res => {
@@ -111,18 +117,18 @@ export default {
       });
     },
     guidePageEdit() {
-      this.loading = true;
+      this.btnLoading = true;
       guidePageEdit(this.form)
         .then(_ => {
           this.$router.go(-1);
           this.$message.success('保存成功');
         })
         .finally(_ => {
-          this.loading = false;
+          this.btnLoading = false;
         });
     },
     guidePageSave() {
-      this.loading = true;
+      this.btnLoading = true;
       guidePageSave(this.form)
         .then(_ => {
           this.$router.go(-1);
@@ -130,7 +136,7 @@ export default {
           this.$message.success('保存成功');
         })
         .finally(_ => {
-          this.loading = false;
+          this.btnLoading = false;
         });
     },
     save() {