update: dist

src/main.js

@@ -14,11 +14,12 @@ import '../static/css/index.less';
 import '../static/font/iconfont.css';
 import vueGicDatepicker from '@gic-test/vue-gic-datepicker';
 import buttonCode from '@/config/button-code.js';
-
+window.ELEMENT.Dialog.props.closeOnClickModal.default = false; // 全局设置点击蒙层不关闭
 Vue.use(vueGicDatepicker);
 Vue.config.devtools = true;
 Vue.use(VueAxios, axios);
 Vue.axios.defaults.withCredentials = true; // 跨域cookie访问
+console.log(window.ELEMENT.Dialog)
 Vue.axios.interceptors.request.use(
   config => {
     return config;

src/router/index.js

@@ -11,7 +11,7 @@ export const constantRouterMap = [
     path: '/',
     name: 'index',
     redirect: 'member-tag',
-    component: _import('index', 'index'),
+    component: _import('layout', 'layout'),
     children: [
       // 平台标签
       {
@@ -113,64 +113,64 @@ export const constantRouterMap = [
         meta: {
           title: '会员标签-标签详情'
         }
-      }
-    ]
-  },
-  // 会员分组
-  {
-    path: '/memberGroupList',
-    name: 'memberGroupListIndex',
-    redirect: 'memberGroupList',
-    component: _import('memberGroup', 'index'),
-    children: [
-      {
-        path: '/memberGroupList',
-        component: _import('memberGroup', 'memberGroupList'),
-        name: '会员分组',
-        meta: {
-          title: '会员标签-会员分组'
-        }
-      },
-      {
-        path: '/memberGroupDetail',
-        component: _import('memberGroup', 'memberGroupDetail'),
-        name: '分组详情',
-        meta: {
-          title: '会员标签-分组详情'
-        }
-      },
-      {
-        path: '/memberLevelDetail',
-        component: _import('memberGroup', 'memberLevelDetail'),
-        name: '分层详情',
-        meta: {
-          title: '会员标签-分层详情'
-        }
-      },
-      {
-        path: '/memberGroupAdd',
-        component: _import('memberGroup', 'memberGroupEdit'),
-        name: '新建分组',
-        meta: {
-          title: '会员标签-新建分组'
-        }
       },
+      // 会员分组
       {
-        path: '/memberGroupEdit',
-        component: _import('memberGroup', 'memberGroupEdit'),
-        name: '编辑分组',
-        meta: {
-          title: '会员标签-编辑分组'
-        }
+        path: '/memberGroupList',
+        name: 'memberGroupListIndex',
+        redirect: 'memberGroupList',
+        component: _import('memberGroup', 'index'),
+        children: [
+          {
+            path: '/memberGroupList',
+            component: _import('memberGroup', 'memberGroupList'),
+            name: '会员分组',
+            meta: {
+              title: '会员标签-会员分组'
+            }
+          },
+          {
+            path: '/memberGroupDetail',
+            component: _import('memberGroup', 'memberGroupDetail'),
+            name: '分组详情',
+            meta: {
+              title: '会员标签-分组详情'
+            }
+          },
+          {
+            path: '/memberLevelDetail',
+            component: _import('memberGroup', 'memberLevelDetail'),
+            name: '分层详情',
+            meta: {
+              title: '会员标签-分层详情'
+            }
+          },
+          {
+            path: '/memberGroupAdd',
+            component: _import('memberGroup', 'memberGroupEdit'),
+            name: '新建分组',
+            meta: {
+              title: '会员标签-新建分组'
+            }
+          },
+          {
+            path: '/memberGroupEdit',
+            component: _import('memberGroup', 'memberGroupEdit'),
+            name: '编辑分组',
+            meta: {
+              title: '会员标签-编辑分组'
+            }
+          },
+          {
+            path: '/memberGroupLog',
+            component: _import('memberGroup', 'member-group-log'),
+            name: '分组操作日志',
+            meta: {
+              title: '分组操作日志'
+            }
+          }
+        ]
       },
-      {
-        path: '/memberGroupLog',
-        component: _import('memberGroup', 'member-group-log'),
-        name: '分组操作日志',
-        meta: {
-          title: '分组操作日志'
-        }
-      }
     ]
   },
   {
@@ -193,5 +193,6 @@ export const constantRouterMap = [
 
 export default new Router({
   routes: constantRouterMap,
+  base: '/member-tag/',
   scrollBehavior: () => ({ y: 0 })
 });

src/view/layout/layout.vue

+<template>
+  <dm-layout project-name="report">
+            <router-view :key="$route.fullPath"></router-view>
+  </dm-layout>
+</template>
+
+<script>
+export default {
+  name: 'layout'
+}
+</script>

src/view/manualTag/manual-tag-value-edit-info.vue

 <template>
   <div class="manualTagDetail-wrap common-wrap">
-    <nav-crumb :navpath="navpath"></nav-crumb>
+    <!-- <nav-crumb :navpath="navpath"></nav-crumb> -->
     <div class="right-content">
       <div class="right-box">
         <div class="manualTagDetail-wrap__info">
@@ -249,7 +249,7 @@
 <script>
 import './manualTagDetail.less';
 import { dateformat } from '@/utils/formatTime';
-import navCrumb from '@/components/nav/nav.vue';
+// import navCrumb from '@/components/nav/nav.vue';
 import userDefined from '@/components/userDefined.vue';
 import errMsg from '@/common/js/error';
 import { getRequest } from '@/api/api';
@@ -622,7 +622,7 @@ export default {
     document.getElementById('app').style.zIndex = 'auto';
   },
   components: {
-    navCrumb,
+    // navCrumb,
     userDefined,
   }
 };

src/view/manualTag/manual-tag-value-edit.vue

 <template>
   <div class="manualTagEdit-wrap common-wrap">
-    <nav-crumb :navpath="navpath"></nav-crumb>
     <div class="right-content">
       <div class="right-box">
         <div class="manualTagEdit-wrap__title">{{ tagInfo.tagName }}</div>

src/view/memberGroup/index.vue

 <template>
   <div id="index">
-    <vue-gic-header :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTag" @toRouterView="toRouterView"></vue-gic-header>
-    <div id="content" class="content">
-      <div class="content-body" :style="{ height: contentHeight }">
-        <!-- <div class="left-menu" :style="{height: contentHeight}">
-            <vue-gic-aside-menu :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag="collapseFlag"></vue-gic-aside-menu>
-          </div> -->
         <transition name="fade" mode="out-in">
           <!-- 缓存已经填好内容的页面 -->
           <keep-alive include="memberGroupList">
           <router-view></router-view>
           </keep-alive >
         </transition>
-      </div>
-    </div>
   </div>
 </template>
 <script>

src/view/memberGroup/memberGroupDetail.vue

 <template>
   <div class="memberGroupDetail-wrap common-wrap">
-    <nav-crumb :navpath="navpath"></nav-crumb>
     <div class="right-content">
       <div class="right-box">
         <div class="memberGroupDetail-wrap__info m-b-20">
@@ -314,7 +313,6 @@
 </template>
 <script>
 import './memberGroupDetail.less';
-import navCrumb from '@/components/nav/nav.vue';
 import userDefined from '@/components/userDefined.vue';
 import selectedTagsList from '@/components/selected-tags-list.vue';
 import errMsg from '@/common/js/error';
@@ -702,7 +700,6 @@ export default {
     document.getElementById('app').style.zIndex = 'auto';
   },
   components: {
-    navCrumb,
     userDefined,
     selectedTagsList
   }

src/view/memberGroup/memberGroupEdit.vue

 <template>
   <div class="common-wrap">
-    <nav-crumb :navpath="navpath"></nav-crumb>
     <div class="right-content">
       <div class="right-box">
         <div class="memberGroupEdit-wrap__body">
@@ -217,7 +216,6 @@
 
 <script>
 import './tags-detail.css';
-import navCrumb from '@/components/nav/nav.vue';
 import tagContainer from '@/view/platformTag/tag-container.vue';
 import editTag from './edit-tag';
 import tagsGroupList from './tags-group-list.vue';
@@ -771,7 +769,6 @@ export default {
     this._groupCount();
   },
   components: {
-    navCrumb,
     tagsGroupList,
     tagContainer,
     editTag

src/view/memberGroup/memberGroupList.vue

 <template>
   <div class="memberGroupList-wrap common-wrap">
-    <nav-crumb :navpath="navpath"></nav-crumb>
     <div class="right-content">
       <!-- 左边的会员分组 -->
       <div class="left-box">
@@ -514,7 +513,6 @@
 </template>
 <script>
 import BatchList from '@/components/tag/batch-list';
-import navCrumb from '@/components/nav/nav.vue';
 import errMsg from '@/common/js/error';
 import timeFormat from '@/common/js/timeFormat';
 import { getRequest } from '@/api/api';
@@ -541,7 +539,6 @@ import { aliasNames } from '@/config'
 export default {
   name: 'memberGroupList',
   components: {
-    navCrumb,
     GroupList,
     RecommendTable,
     BatchList

src/view/platformTag/member-tag.vue

@@ -2,8 +2,6 @@
 <!-- @click.stop="collapseRightList($event)" -->
   <div class="member-tag">
     <div class="tag-container">
-      <nav-crumb :navpath="navpath"></nav-crumb>
-
       <div class="member-box">
         <div class="tag-input">
           <el-input placeholder="请输入关键词回车搜索标签" prefix-icon="el-icon-search" style="width: 348px" v-model="memberTag" @keyup.native.enter="searchMemberList" @clear="allTagList" clearable></el-input>
@@ -149,7 +147,6 @@
 <script>
 import Vue from 'vue';
 import { CollapseTransition } from 'element-ui';
-import navCrumb from '@/components/nav/nav.vue';
 import TagsGroupList from '../memberGroup/tags-group-list';
 import TagType from './tag-type';
 import TagContainer from './tag-container';
@@ -171,7 +168,6 @@ export default {
   componentName: 'member-tag',
 
   components: {
-    navCrumb,
     TagType,
     TagContainer,
     TagsGroupList,

static/css/index.less

@@ -95,3 +95,19 @@
 .el-dialog__footer {
   border-top: none;
 }
+
+.common-wrap {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  background: #f7f8fa;
+}
+.right-content {
+  padding-top: 12px;
+  min-height: calc(100vh - 256px);
+}
+.right-box {
+  padding: 20px;
+  min-height: calc(100vh - 296px);
+  background: #fff;
+}
\ No newline at end of file