Merge branch 'feature/act-code' into dev

src/router/actCodeManageRouter/attractFlowLinkRouter.js

@@ -10,7 +10,9 @@ const attractFlowLinkRouter = [
     path: '/attractFlowLinkAdd',
     name: '新增引流链接',
     meta: {
-      type: 'add'
+      type: 'add',
+      keepAlive: true,
+      fromPath: ['/salutatorySet']
     },
     component: _import('salesleads/actCodeManage/attractFlowLink', 'detail')
   },
@@ -18,7 +20,9 @@ const attractFlowLinkRouter = [
     path: '/attractFlowLinkEdit/:id',
     name: '编辑引流链接',
     meta: {
-      type: 'edit'
+      type: 'edit',
+      keepAlive: true,
+      fromPath: ['/salutatorySet']
     },
     component: _import('salesleads/actCodeManage/attractFlowLink', 'detail')
   },

src/views/enterprise/salutatory.vue

@@ -239,7 +239,7 @@ export default {
     },
     goLinkDetail(row) {
       console.log(row);
-      if (row.type == 1) {
+      if (row.type == 2) {
         this.$router.push('/actCodeDetail?hmId=' + row.referId);
       } else {
         this.$router.push(`/attractFlowLinkInfo/${row.referId}`);

src/views/salesleads/components/welcomesItem.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row>
       <el-col :span="17">
-        <el-form-item label="活码类型">
+        <el-form-item label="设置欢迎语">
           <el-radio-group v-model="welcomesType" @change="radioChange">
             <el-radio :label="1" v-if="welcomeType == 'code'">活码欢迎语</el-radio>
             <el-radio :label="1" v-else>链接欢迎语</el-radio>