Merge branch 'feature/act-code' into dev

src/views/enterprise/salutatorySet.vue

@@ -75,7 +75,7 @@
             </div>
           </el-form-item>
           <el-button type="primary" style="margin-left:117px;margin-bottom:20px" :loading="submitbtnLoading" @click="submit">保存</el-button>
-          <el-button style="margin-bottom:20px" @click="$router.go(-1)">返回</el-button>
+          <el-button style="margin-bottom:20px" @click="$router.push('salutatory')">返回</el-button>
         </el-form>
         <preview :welcomeContent="form.welcomeContent" :mediaList="form.welcomeMediaList" />
       </div>
@@ -687,7 +687,7 @@ export default {
                 if (!this.$route.query.id) {
                   this.$route.meta.refresh = true;
                 }
-                this.$router.go(-1);
+                this.$router.push('salutatory');
               }
             })
             .catch(function(error) {

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

@@ -12,7 +12,7 @@
           <p class="tips" v-else>可复制此引流链接或下载链接二维码，通过不同营销活动、渠道等引导客户添加导购企微号，转化成私域流量。</p>
         </el-form-item>
         <el-form-item label="链接名称" required prop="name">
-          <el-input placeholder="请输入链接名称" class="w-340" :maxlength="30" show-word-limit v-model="form.name"></el-input>
+          <el-input placeholder="请输入链接名称" class="w-340" :maxlength="20" show-word-limit v-model="form.name"></el-input>
         </el-form-item>
         <el-form-item label="链接描述" prop="remark">
           <el-input placeholder="请输入链接描述" type="textarea" class="w-340" :maxlength="100" :autosize="{ minRows: 4, maxRows: 6 }" show-word-limit v-model="form.remark"></el-input>
@@ -327,7 +327,7 @@ export default {
       this.form.pageId = row.pageId;
     },
     addTemp() {
-      this.$router.push('/ladingPageAdd');
+      window.open('/haoban-3/#/ladingPageAdd');
     },
     disabledProperty(a, b, c, d) {
       const args = [...arguments];

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

@@ -121,7 +121,7 @@ export default {
       this.btnLoading = true;
       guidePageEdit(this.form)
         .then(_ => {
-          this.$router.go(-1);
+          this.$router.push('/ladingPageList');
           this.$message.success('保存成功');
         })
         .finally(_ => {
@@ -132,7 +132,7 @@ export default {
       this.btnLoading = true;
       guidePageSave(this.form)
         .then(_ => {
-          this.$router.go(-1);
+          this.$router.push('/ladingPageList');
           this.$route.meta.refresh = true;
           this.$message.success('保存成功');
         })

src/views/salesleads/components/welcomesItem.vue

@@ -148,7 +148,7 @@ export default {
     },
     // 新建欢迎语
     changeRoute() {
-      this.$router.push({ path: '/salutatorySet', query: { type: 2 } });
+      window.open('/haoban-3/#/salutatorySet?type=2');
     },
     getCurrentRow(row) {
       const { welcomeMediaList, welcomeContent, welcomeId } = row;