update: dist

src/api/api.js

@@ -76,7 +76,7 @@ Vue.axios.interceptors.request.use(
 Vue.axios.interceptors.response.use(
   data => {
     removePending(data.config); //在一个ajax响应后再执行一下取消操作，把已经完成的请求从pending中移除
-    if (data.status && data.status == 200 && (data.data.errorCode != 1 || data.data.code != 1)) {
+    if (data.status && data.status == 200 && data.data.errorCode != 1 && data.data.code != 0) {
       if (data.data.errorCode == 4) {
         if (window.location.href.indexOf('gic-error') != -1) {
           return false;
@@ -86,6 +86,7 @@ Vue.axios.interceptors.response.use(
       if (data.data.errorCode == 10 || data.data.errorCode == 7) {
         window.location.href = gicHost + '/haoban-3/#/index';
       }
+      Message.error({ message: data.data.message });
       return data;
     }
     return data;

src/views/enterprise/salutatory.vue

@@ -211,11 +211,11 @@ export default {
         let str = '';
         if (result) {
           if (result.qrCodeReferNum && result.linkReferNum) {
-            str = `当前模板已关联状态为正常的活码（${result.qrCodeReferNum}）、链接（${result.linkReferNum}），请确认相关活码是否不再使用该欢迎语以及链接已投放结束，取消关联后才可删除该模板`;
+            str = `当前欢迎语已关联状态为正常的活码（${result.qrCodeReferNum}）、链接（${result.linkReferNum}），请确认相关活码是否不再使用该欢迎语以及链接已投放结束，解除关联后才可删除该模板`;
           } else if (result.qrCodeReferNum) {
-            str = `当前模板已关联状态为正常的活码（${result.qrCodeReferNum}），请确认相关活码是否不再使用该欢迎语，取消关联后才可删除该模板`;
+            str = `当前欢迎语已关联状态为正常的活码（${result.qrCodeReferNum}），请确认相关活码是否不再使用该欢迎语，解除关联后才可删除该模板`;
           } else if (result.linkReferNum) {
-            str = `当前模板已关联链接（${result.linkReferNum}），请确认相关链接已投放结束，取消关联后才可删除该模板`;
+            str = `当前欢迎语已关联链接（${result.linkReferNum}），请确认相关链接已投放结束，解除关联后才可删除该模板`;
           }
           this.$confirm(str, '无法删除该欢迎语', {
             confirmButtonText: '关联详情',
@@ -248,11 +248,10 @@ export default {
       this.welcomeId = item.welcomeId;
     },
     goLinkDetail(row) {
-      this.dialogVisible = false;
       if (row.type == 2) {
-        this.$router.push('/actCodeDetail?hmId=' + row.referId);
+        window.open(`/haoban-3/#/actCodeDetail?hmId='${row.referId}`);
       } else {
-        this.$router.push(`/attractFlowLinkInfo/${row.referId}`);
+        window.open(`/haoban-3/#/attractFlowLinkInfo/${row.referId}`);
       }
     },
     /**

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

 <template>
+  <div>
     <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>
@@ -132,10 +133,11 @@
             <p class="previewBottom">此二维码只是样式预览效果，请勿直接使用</p>
           </div>
         </div>
+      </el-form>
+    </div>
     <div class="footBtn">
       <el-button type="primary" @click="save" :loading="btnLoading">保存</el-button>
     </div>
-    </el-form>
   </div>
 </template>
 
@@ -592,7 +594,7 @@ export default {
   }
 }
 .footBtn {
-  width: 100%;
+  width: calc(100vw - 190px);
   height: 56px;
   background: #ffffff;
   box-shadow: 1px -2px 8px 0px rgba(220, 223, 230, 0.6);

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

@@ -147,7 +147,8 @@ export default {
         pageNum: 1,
         linkType: '',
         searchParams: '',
-        dateRange: []
+        dateRange: [],
+        sortColumn: ''
       },
       options: [
         {

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

@@ -221,7 +221,7 @@ export default {
       let link = document.createElement('a');
       let url = img.getAttribute('src');
       link.setAttribute('href', url);
-      link.setAttribute('download', `${this.link.linkId}_${this.link.name}.png`);
+      link.setAttribute('download', `${this.link.shortCode}_${this.link.name}.png`);
       link.click();
     },
     goEdit() {

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

@@ -125,7 +125,7 @@ export default {
       this.btnLoading = true;
       guidePageEdit(this.form)
         .then(_ => {
-          this.$router.push('/ladingPageList');
+          this.$router.go(-1);
           this.$message.success('保存成功');
         })
         .finally(_ => {
@@ -136,7 +136,7 @@ export default {
       this.btnLoading = true;
       guidePageSave(this.form)
         .then(_ => {
-          this.$router.push('/ladingPageList');
+          this.$router.go(-1);
           this.$route.meta.refresh = true;
           this.$message.success('保存成功');
         })
@@ -160,6 +160,7 @@ export default {
 <style type="text/scss" lang="scss" scoped>
 .daily-set-content {
   padding: 20px;
+  margin-bottom: 56px;
 }
 .form {
   float: left;
@@ -182,7 +183,7 @@ export default {
   margin-bottom: 20px;
 }
 .footBtn {
-  width: 100%;
+  width: calc(100vw - 190px);
   height: 56px;
   background: #ffffff;
   box-shadow: 1px -2px 8px 0px rgba(220, 223, 230, 0.6);

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

@@ -170,7 +170,7 @@ export default {
       guidePageRelation({ pageId: item.pageId }).then(res => {
         const { totalCount } = res.data.result;
         if (totalCount) {
-          this.$confirm(`当前模板已关联链接（${totalCount}），请确认投放链接已投放结束，取消关联后才可删除该模板`, '无法删除该模板', {
+          this.$confirm(`当前模板已关联链接（${totalCount}），请确认投放链接已投放结束，解除关联后才可删除该模板`, '无法删除该模板', {
             confirmButtonText: '关联详情',
             cancelButtonText: '取消',
             type: 'warning'
@@ -198,8 +198,7 @@ export default {
       this.$router.push(`/ladingPageEdit/${item.pageId}`);
     },
     goLinkDetail(referId) {
-      this.dialogVisible = false;
-      this.$router.push(`/attractFlowLinkInfo/${referId}`);
+      window.open(`/haoban-3/#/attractFlowLinkInfo/${referId}`);
     }
   }
 };