Merge branch 'feature/弹窗推广'

src/router/modules/pop.js

 // 弹窗
 export default {
-  path: 'pop',
+  path: 'popup',
   name: '弹窗推广',
-  component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/index.vue'),
-  redirect: '/pop/list',
+  component: () => import(/* webpackChunkName: "popup" */ '../../views/popup/index.vue'),
+  redirect: '/popup/list',
   children: [
     {
       path: 'list',
       name: '计划列表',
-      component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/list.vue'),
+      component: () => import(/* webpackChunkName: "popup" */ '../../views/popup/list.vue'),
       meta: {
-        path: '/pop/list'
+        path: '/popup/list'
       }
     },
     {
       path: 'add',
       name: '新建计划',
-      component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/form.vue')
+      component: () => import(/* webpackChunkName: "popup" */ '../../views/popup/form.vue')
     },
     {
       path: 'edit',
       name: '编辑计划',
-      component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/form.vue')
+      component: () => import(/* webpackChunkName: "popup" */ '../../views/popup/form.vue')
     }
   ]
 };

src/views/pop/form.vue → src/views/popup/form.vue

@@ -109,7 +109,7 @@
             </div>
           </div>
           <el-form-item label="定向人群：" :prop="`popupMemberGroupList_${elIndex}`">
-            <vue-gic-member-group :defaltSelected="pop.popupMemberGroupList" :projectName="projectName" :headerList="headerList" :readonly="pop.activeStatus == 2" @handleDataTransferred="data => handleDataTransferred(data, elIndex)" @handleDataLeft="(selectedData, selectionToRemove) => handleDataLeft(selectedData, selectionToRemove, elIndex)"></vue-gic-member-group>
+            <vue-gic-member-group :max-limit="10" :defaltSelected="pop.popupMemberGroupList" :projectName="projectName" :headerList="headerList" :readonly="pop.activeStatus == 2" @handleDataTransferred="data => handleDataTransferred(data, elIndex)" @handleDataLeft="(selectedData, selectionToRemove) => handleDataLeft(selectedData, selectionToRemove, elIndex)"></vue-gic-member-group>
           </el-form-item>
           <div class="sort">
             <el-popover placement="bottom" width="400" trigger="click" popper-class="pop_sort_popover" :disabled="pop.activeStatus == 2">
@@ -348,7 +348,7 @@ export default {
   },
   created() {
     const path = this.$route.path;
-    if (path == '/pop/edit') {
+    if (path == '/popup/edit') {
       this.getDetail();
     }
     this.getPopupLinkList();
@@ -464,8 +464,8 @@ export default {
             if (item.popupMemberGroupList && !item.popupMemberGroupList.length) {
               callback(new Error('请选择定向人群'));
             }
-            if (item.popupMemberGroupList && item.popupMemberGroupList.length > 3) {
-              callback(new Error('会员分组数量不能超过3个'));
+            if (item.popupMemberGroupList && item.popupMemberGroupList.length > 10) {
+              callback(new Error('会员分组数量不能超过10个'));
             }
             callback();
           },

src/views/pop/index.vue → src/views/popup/index.vue

@@ -7,7 +7,7 @@
 export default {
   name: 'pop',
   created() {
-    this.$store.commit('mutations.breadcrumb', [{ name: '营销管理' }, { name: '弹窗推广', path: '/pop' }, { name: '弹窗推广', path: '/pop/list' }]);
+    this.$store.commit('mutations.breadcrumb', [{ name: '营销管理' }, { name: '弹窗推广', path: '/popup' }, { name: '弹窗推广', path: '/popup/list' }]);
     this.$store.commit('aside_handler', false);
     this.$nextTick(_ => {
       this.$store.commit('aside_handler', true);

src/views/pop/list.vue → src/views/popup/list.vue

@@ -177,9 +177,9 @@ export default {
     },
     goForm(group, type) {
       if (type === 'add') {
-        this.$router.push(`/pop/add`);
+        this.$router.push(`/popup/add`);
       } else {
-        this.$router.push(`/pop/edit?id=${group.id}`);
+        this.$router.push(`/popup/edit?id=${group.id}`);
       }
     },
     delGroup(group) {