Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

menu-data/button-code.js

@@ -333,5 +333,12 @@ module.exports = {
     editActCode: ['编辑', 1, 1],
     downActCode: ['下载活码', 1, 1],
     delActCode: ['作废', 1, 1]
-  }
+  },
+  linkCode: {
+    addLink: ['新建链接', 1, 0],
+    dataLink: ['数据', 1, 0],
+    infoLink: ['详情', 1, 0],
+    editLink: ['编辑', 1, 0],
+    downLink: ['链接', 1, 1]
+}
 }

menu-data/button-code.json

-{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList","addActCode":"addActCode","batchActCode":"batchActCode","batchGroup":"batchGroup","dataActCode":"dataActCode","infoActCode":"infoActCode","editActCode":"editActCode","downActCode":"downActCode","delActCode":"delActCode"}
+{"multipleAssign":"multipleAssign","assign":"assign","willSyncTag":"willSyncTag","breakSyncTag":"breakSyncTag","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","multipleDelAssets":"multipleDelAssets","multipleMoveAssets":"multipleMoveAssets","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList","addActCode":"addActCode","batchActCode":"batchActCode","batchGroup":"batchGroup","dataActCode":"dataActCode","infoActCode":"infoActCode","editActCode":"editActCode","downActCode":"downActCode","delActCode":"delActCode","addLink":"addLink","dataLink":"dataLink","infoLink":"infoLink","editLink":"editLink","downLink":"downLink"}
\ No newline at end of file

src/router/actCodeManageRouter/attractFlowLinkRouter.js

@@ -40,6 +40,14 @@ const attractFlowLinkRouter = [
     component: _import('salesleads/actCodeManage/staffActCode', 'actCodeRecord')
   },
   {
+    path: '/attractFlowLinkInfos/:id',
+    name: '详情引流链接',
+    meta: {
+      type: 'info'
+    },
+    component: _import('salesleads/actCodeManage/attractFlowLink', 'info')
+  },
+  {
     path: '/ladingPageList',
     name: '落地页列表',
     component: _import('salesleads/actCodeManage/attractFlowLink/landingPage', 'list'),

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

@@ -19,7 +19,7 @@
       </div>
       <div>
         <el-button @click="goLanding">落地页模板</el-button>
-        <el-button type="primary" @click="$router.push('attractFlowLinkAdd')">新增链接</el-button>
+        <el-button type="primary" @click="$router.push('attractFlowLinkAdd')" v-if="$getButtonLimit($buttonCode.addLink)" :limit-code="$buttonCode.addLink">新增链接</el-button>
       </div>
     </div>
     <el-table :data="tableData" style="width:100%" v-loading="loading" @sort-change="handleSortChange">
@@ -163,21 +163,39 @@ export default {
       btnArr: [
         {
           text: '数据',
+          visible: row => {
+            if (this.$getButtonLimit(this.$buttonCode.dataLink)) {
+              return true;
+            }
+          },
           handler: row => this.goDetail(row, 'second')
         },
         {
           text: '详情',
+          visible: row => {
+            if (this.$getButtonLimit(this.$buttonCode.infoLink)) {
+              return true;
+            }
+          },
           handler: row => this.goDetail(row, 'first')
         },
         {
           text: '链接',
           visible: row => {
-            return row.linkType == 2;
+            // return row.linkType == 2;
+            if (this.$getButtonLimit(this.$buttonCode.downLink) && row.linkType == 2) {
+              return true;
+            }
           },
           handler: row => this.goLink(row)
         },
         {
           text: '编辑',
+          visible: row => {
+            if (this.$getButtonLimit(this.$buttonCode.editLink)) {
+              return true;
+            }
+          },
           handler: row => this.goEdit(row)
         }
       ],
@@ -264,7 +282,8 @@ export default {
       this.$router.push('/ladingPageList');
     },
     goDetail(row, type) {
-      this.$router.push(`attractFlowLinkInfo/${row.linkId}?type=${type}`);
+      if (type == 'second') this.$router.push(`attractFlowLinkInfo/${row.linkId}?type=${type}`);
+      if (type == 'first') this.$router.push(`attractFlowLinkInfos/${row.linkId}?type=${type}`);
     },
     goLink(row) {
       this.linkUrl = row.linkUrl;

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

@@ -36,12 +36,12 @@
         <el-date-picker v-model="dateTime" @change="searchList" :picker-options="pickerOptions" :editable="false" :value-format="'yyyy-MM-dd HH:mm:ss'" type="datetimerange" align="right" unlink-panels range-separator="至" start-placeholder="创建开始日期" end-placeholder="创建结束日期"> </el-date-picker>
       </el-form-item>
       <el-form-item class="frmbt20">
-        <!-- <el-button @click="batchGoupEvent" v-if="$getButtonLimit($buttonCode.batchGroup)" :limit-code="$buttonCode.batchGroup">批量分组</el-button>
+        <el-button @click="batchGoupEvent" v-if="$getButtonLimit($buttonCode.batchGroup)" :limit-code="$buttonCode.batchGroup">批量分组</el-button>
         <el-button class="ghost-btn " @click="$router.push('/actCodeBatch')" v-if="$getButtonLimit($buttonCode.batchActCode)" :limit-code="$buttonCode.batchActCode">批量创建活码</el-button>
-        <el-button type="primary" @click="$router.push('/actCodeAdd')" v-if="$getButtonLimit($buttonCode.addActCode)" :limit-code="$buttonCode.addActCode">新增活码</el-button> -->
-        <el-button @click="batchGoupEvent">批量分组</el-button>
+        <el-button type="primary" @click="$router.push('/actCodeAdd')" v-if="$getButtonLimit($buttonCode.addActCode)" :limit-code="$buttonCode.addActCode">新增活码</el-button>
+        <!-- <el-button @click="batchGoupEvent">批量分组</el-button>
         <el-button class="ghost-btn " @click="$router.push('/actCodeBatch')">批量创建活码</el-button>
-        <el-button type="primary" @click="$router.push('/actCodeAdd')">新增活码</el-button>
+        <el-button type="primary" @click="$router.push('/actCodeAdd')">新增活码</el-button> -->
       </el-form-item>
     </el-form>
     <el-table ref="actCodeTableRef" v-loading="loadingStatus" :data="tableData" class="act-code-table" @sort-change="sortChange" :max-height="tableMaxHeight">
@@ -219,9 +219,9 @@ export default {
         {
           text: '数据',
           visible: row => {
-            // if (this.$getButtonLimit(this.$buttonCode.dataActCode)) {
+            if (this.$getButtonLimit(this.$buttonCode.dataActCode)) {
               return true;
-            // }
+            }
           },
           handler: row => {
             this.$router.push(`/actCodeDetail?hmId=${row.hmId}&activeName=second`);
@@ -230,9 +230,9 @@ export default {
         {
           text: '详情',
           visible: row => {
-            // if (this.$getButtonLimit(this.$buttonCode.infoActCode)) {
+            if (this.$getButtonLimit(this.$buttonCode.infoActCode)) {
               return true;
-            // }
+            }
           },
           handler: row => {
             this.$router.push('/actCodeDetails?hmId=' + row.hmId);
@@ -241,8 +241,8 @@ export default {
         {
           text: '编辑',
           visible: row => {
-            // if (!this.$getButtonLimit(this.$buttonCode.editActCode) || row.statusFlag == 2) {
-            if (row.statusFlag == 2) {
+            if (!this.$getButtonLimit(this.$buttonCode.editActCode) || row.statusFlag == 2) {
+              // if (row.statusFlag == 2) {
               return false;
             } else {
               return true;
@@ -255,8 +255,8 @@ export default {
         {
           text: '下载活码',
           visible: row => {
-            // if (!this.$getButtonLimit(this.$buttonCode.downActCode) || row.hmType == 1 || row.statusFlag != 1) {
-            if (row.hmType == 1 || row.statusFlag != 1) {
+            if (!this.$getButtonLimit(this.$buttonCode.downActCode) || row.hmType == 1 || row.statusFlag != 1) {
+              // if (row.hmType == 1 || row.statusFlag != 1) {
               return false;
             } else {
               return true;
@@ -271,8 +271,8 @@ export default {
         {
           text: '作废',
           visible: row => {
-            // if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2) {
-            if (row.statusFlag != 2) {
+            if (this.$getButtonLimit(this.$buttonCode.delActCode) && row.statusFlag != 2) {
+              // if (row.statusFlag != 2) {
               return true;
             }
           },

src/views/salesleads/components/welcomesItem.vue

@@ -37,7 +37,7 @@
               </el-table-column>
               <el-table-column prop="title" label="标题" width="158px"></el-table-column>
               <el-table-column prop="welcomeContent" label="内容" show-overflow-tooltip></el-table-column>
-              <el-table-column label="附件" width="212px" show-overflow-tooltip>
+              <el-table-column label="附件" width="200px" show-overflow-tooltip>
                 <template slot-scope="{ row }">
                   <el-popover placement="top-start" trigger="hover" v-if="row.welcomeMediaList && row.welcomeMediaList.length">
                     <div class="flexBox" v-for="item in row.welcomeMediaList" :key="item.welcomeMediaId">
@@ -257,7 +257,17 @@ export default {
     margin-top: 46px;
     margin-right: -4px;
   }
-  .flexBox {
+}
+.wrapText {
+  width: 90%;
+  text-align: left;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+.flexBox {
   display: flex;
   justify-content: flex-start;
   align-items: center;
@@ -269,15 +279,8 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
   }
-  }
-  .flexBox + .flexBox {
+}
+.flexBox + .flexBox {
   margin-top: 10px;
-  }
-  .popoverBox {
-    max-height: 300px;
-    overflow-y: auto;
-    max-width: 500px;
-    line-height: 28px;
-  }
 }
 </style>