xcx

package-lock.json

@@ -7976,8 +7976,7 @@
     "js-base64": {
       "version": "2.4.8",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
-      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
-      "dev": true
+      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q=="
     },
     "js-beautify": {
       "version": "1.7.5",
@@ -7991,6 +7990,11 @@
         "nopt": "3.0.6"
       }
     },
+    "js-md5": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",

src/components/siderBar/index.vue

@@ -8,14 +8,26 @@
           @open="handleOpen"
           @close="handleClose">
           <template v-for="(item,index) in menu">
-            <el-submenu v-if="item.children.length" :index="String(index)" :key="index">
+            <el-submenu v-if="item.children" :index="String(index)" :key="index">
               <template slot="title">
                 <span>{{item.MenuName}}</span>
               </template>
               <el-menu-item-group>
-                <el-menu-item v-for="(subItem,subIndex) in item.children" :key="subIndex" :index="String(index)+'-'+String(subIndex)">
-                  <router-link :to="{name:subItem.Url,query:{}}" active-class="active">{{subItem.MenuName}}</router-link>
-                </el-menu-item>
+                <template v-for="(subItem,subIndex) in item.children">
+                  <el-submenu v-if="subItem.children" :index="`${index}-${subIndex}`" :key="subIndex">
+                    <template slot="title">
+                      <span>{{subItem.MenuName}}</span>
+                    </template>
+                    <el-menu-item-group>
+                      <el-menu-item v-for="(it,inx) in subItem.children" :index="`${index}-${subIndex}-${inx}`" :key="inx">
+                        <router-link :to="{name:it.Url,query:{}}" active-class="active">{{it.MenuName}}</router-link>
+                      </el-menu-item>
+                    </el-menu-item-group>
+                  </el-submenu>
+                  <el-menu-item v-else :index="`${index}-${subIndex}`" :key="subIndex">
+                    <router-link :to="{name:subItem.Url,query:{}}" active-class="active">{{subItem.MenuName}}</router-link>
+                  </el-menu-item>
+                </template>
               </el-menu-item-group>
             </el-submenu>
             <el-menu-item v-else :index="String(index)" :key="index">
@@ -39,7 +51,7 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
-      // console.log(this.menu)
+      console.log(this.menu)
     })
   },
   methods: {

src/pages/system/index.vue

@@ -31,113 +31,17 @@
 import breadCrumb from '@/components/breadCrumb/index'
 import siderBar from '@/components/siderBar/index'
 import routerData from '@/router/router'
-import { mapState, mapMutations, createNamespacedHelpers } from 'vuex'
-const { mapActions: mapSystemActions } = createNamespacedHelpers('system')
+import { mapState, mapMutations, mapActions } from 'vuex'
 export default {
   name: '',
   data () {
     return {
-      pageMenu: [
-        // {
-        //   title: '系统设置',
-        //   pathName: '',
-        //   children: [{
-        //     title: '用户管理',
-        //     pathName: 'userManager',
-        //     children: [],
-        //   }, {
-        //     title: '角色管理',
-        //     pathName: 'roleManager',
-        //     children: [],
-        //   }],
-        // }, {
-        //   title: '案场管理',
-        //   pathName: '',
-        //   children: [{
-        //     title: '案场信息',
-        //     pathName: 'caseInfo',
-        //     children: [],
-        //   }, {
-        //     title: '钥匙管理',
-        //     pathName: 'keyManager',
-        //     children: [],
-        //   }, {
-        //     title: '案场区域管理',
-        //     pathName: 'caseAreaManager',
-        //     children: [],
-        //   }, {
-        //     title: '案场桌位管理',
-        //     pathName: 'caseTableManager',
-        //     children: [],
-        //   }],
-        // }, {
-        //   title: '商品管理',
-        //   pathName: '',
-        //   children: [{
-        //     title: '商品类型管理',
-        //     pathName: 'goodsTypeManager',
-        //     children: [],
-        //   }, {
-        //     title: '商品规格管理',
-        //     pathName: 'goodsSpecManager',
-        //     children: [],
-        //   }],
-        // }, {
-        //   title: 'CMS管理',
-        //   pathName: '',
-        //   children: [{
-        //     title: '轮播图管理',
-        //     pathName: 'bannerManager',
-        //     children: [],
-        //   }, {
-        //     title: '售楼处项目专题',
-        //     pathName: 'majorProjects',
-        //     children: [],
-        //   }, {
-        //     title: '首页消息',
-        //     pathName: 'indexMsg',
-        //     children: [],
-        //   }, {
-        //     title: '资讯管理',
-        //     pathName: 'newsManager',
-        //     children: [],
-        //   }],
-        // }, {
-        //   title: '渠道管理',
-        //   pathName: '',
-        //   children: [{
-        //     title: '渠道列表',
-        //     pathName: 'channelList',
-        //     children: [],
-        //   }],
-        // }, {
-        //   title: '课程管理',
-        //   pathName: '',
-        //   children: [{
-        //     title: '全龄生活5A',
-        //     pathName: 'fiveA',
-        //     children: [],
-        //   }, {
-        //     title: '课程标签',
-        //     pathName: 'courseTag',
-        //     children: [],
-        //   }],
-        // }, {
-        //   title: '数据统计',
-        //   pathName: '',
-        //   children: [{
-        //     title: '前台用户列表',
-        //     pathName: 'frontEndUserList',
-        //     children: [],
-        //   }],
-        // }
-      ]
     }
   },
   computed: {
     ...mapState({
       breadCrumb: x => x.app.breadcrumb,
-      system: x => x.system,
+      pageMenu: x => x.app.menus,
     })
   },
   components: {
@@ -145,111 +49,16 @@ export default {
     siderBar,
   },
   created () {
-    this.getMenuData()
-    this.updateBread({ routerData, Url: this.$route.name })
     this.updateSystemInfo()
-    console.log(this.system)
+    this.updateBread({ routerData, Url: this.$route.name })
   },
   methods: {
     ...mapMutations([
       'updateBread'
     ]),
-    ...mapSystemActions([
+    ...mapActions([
       'updateSystemInfo'
     ]),
-    getMenuData () { // 获取用户角色权限内菜单
-      let menuData = [{
-        MenuId: '1',
-        MenuName: '系统',
-        Icon: '',
-        FatherID: '-1',
-        Url: 'system',
-        IsShow: 1
-      }, {
-        MenuId: '2',
-        MenuName: '系统设置',
-        Icon: '',
-        FatherID: '1',
-        Url: 'systemSet',
-        IsShow: 1
-      }, {
-        MenuId: '3',
-        MenuName: '用户管理',
-        Icon: '',
-        FatherID: '2',
-        Url: 'userManager',
-        IsShow: 1
-      }, {
-        MenuId: '4',
-        MenuName: '角色管理',
-        Icon: '',
-        FatherID: '2',
-        Url: 'roleManager',
-        IsShow: 1
-      }, {
-        MenuId: '5',
-        MenuName: '新增用户',
-        Icon: '',
-        FatherID: '3',
-        Url: 'addUser',
-        IsShow: 0
-      }, {
-        MenuId: '6',
-        MenuName: '编辑用户',
-        Icon: '',
-        FatherID: '3',
-        Url: 'editUser',
-        IsShow: 0
-      }, {
-        MenuId: '7',
-        MenuName: '案场管理',
-        Icon: '',
-        FatherID: '1',
-        Url: 'caseManager',
-        IsShow: 1
-      }, {
-        MenuId: '8',
-        MenuName: '案场信息',
-        Icon: '',
-        FatherID: '7',
-        Url: 'indexCase',
-        IsShow: 1
-      }, {
-        MenuId: '9',
-        MenuName: '新增案场',
-        Icon: '',
-        FatherID: '8',
-        Url: 'addIndexCase',
-        IsShow: 1
-      }, {
-        MenuId: '10',
-        MenuName: '编辑案场',
-        Icon: '',
-        FatherID: '8',
-        Url: 'editIndexCase',
-        IsShow: 1
-      }, {
-        MenuId: '11',
-        MenuName: '钥匙管理',
-        Icon: '',
-        FatherID: '7',
-        Url: 'keyManager',
-        IsShow: 1
-      }]
-      this.$store.state.app.menusRaw = menuData // 写入权限菜单数据
-      this.creatSlideMenu([...menuData])
-    },
-    creatSlideMenu (arr) { // 创建左侧菜单
-      for (var n = 0; n < arr.length; n++) {
-        arr[n].children = []
-        for (var a = 0; a < arr.length; a++) {
-          if (arr[n].MenuId === arr[a].FatherID) {
-            arr[n].children.push(arr[a])
-          }
-        }
-      }
-      this.pageMenu = arr[0].children
-    }
   }
 }
 </script>

src/pages/system/page.js

@@ -10,9 +10,9 @@ import addRole from './systemSet/roleManager/add' // 添加角色
 import editRole from './systemSet/roleManager/edit' // 编辑角色
 
 import caseManager from './caseManager/index' // 案场管理
-import indexCase from './caseManager/caseInfo/index' // 案场信息
-import addIndexCase from './caseManager/caseInfo/addCase/index' // 新增案场
-import editIndexCase from './caseManager/caseInfo/editCase/index' // 新增案场
+import caseInfo from './caseManager/caseInfo/index' // 案场信息
+import addCase from './caseManager/caseInfo/addCase/index' // 新增案场
+import editCase from './caseManager/caseInfo/editCase/index' // 新增案场
 import keyManager from './caseManager/keyManager/index' // 钥匙管理
 import caseAreaManager from './caseManager/caseAreaManager/index' // 案场区域管理
 import addCaseArea from './caseManager/caseAreaManager/add' // 新增案场区域
@@ -33,9 +33,9 @@ import cmsManager from './cmsManager/index' // cms管理
 import bannerManager from './cmsManager/bannerManager/index' // 轮播图管理
 import addBanner from './cmsManager/bannerManager/add' // 添加轮播图
 import editBanner from './cmsManager/bannerManager/edit' // 编辑轮播图
-import majorProjects from './cmsManager/majorProjects/index' // 售楼处项目专题
-import addMajorProjects from './cmsManager/majorProjects/add' // 新增售楼处项目专题
-import editMajorProjects from './cmsManager/majorProjects/edit' // 编辑售楼处项目专题
+import indexCase from './cmsManager/majorProjects/index' // 售楼处项目专题
+import addIndexCase from './cmsManager/majorProjects/add' // 新增售楼处项目专题
+import editIndexCase from './cmsManager/majorProjects/edit' // 编辑售楼处项目专题
 import indexMsg from './cmsManager/indexMsg/index' // 首页消息
 import addIndexMsg from './cmsManager/indexMsg/add' // 新增首页消息
 import editIndexMsg from './cmsManager/indexMsg/edit' // 新增首页消息
@@ -105,18 +105,18 @@ export default {
         name: 'caseManager',
         component: caseManager,
         children: [{ // 案场信息
-          path: 'indexCase',
-          name: 'indexCase',
-          component: indexCase,
+          path: 'caseInfo',
+          name: 'caseInfo',
+          component: caseInfo,
           children: [{ // 新增案场
-            path: 'addIndexCase',
-            name: 'addIndexCase',
-            component: addIndexCase,
+            path: 'addCase',
+            name: 'addCase',
+            component: addCase,
             children: []
           }, { // 编辑案场
-            path: 'editIndexCase',
-            name: 'editIndexCase',
-            component: editIndexCase,
+            path: 'editCase',
+            name: 'editCase',
+            component: editCase,
             children: []
           }]
         }, { // 钥匙管理
@@ -210,18 +210,18 @@ export default {
             children: []
           }]
         }, { // 售楼处项目专题
-          path: 'majorProjects',
-          name: 'majorProjects',
-          component: majorProjects,
+          path: 'indexCase',
+          name: 'indexCase',
+          component: indexCase,
           children: [{ // 新增售楼处项目专题
-            path: 'addMajorProjects',
-            name: 'addMajorProjects',
-            component: addMajorProjects,
+            path: 'addIndexCase',
+            name: 'addIndexCase',
+            component: addIndexCase,
             children: []
           }, { // 编辑售楼处项目专题
-            path: 'editMajorProjects',
-            name: 'editMajorProjects',
-            component: editMajorProjects,
+            path: 'editIndexCase',
+            name: 'editIndexCase',
+            component: editIndexCase,
             children: []
           }]
         }, { // 首页消息

src/store/app.js

@@ -16,17 +16,51 @@ function flatten (parent, data = [], menusRaw = []) {
   }, [])
 }
 
+function packChildren (data) {
+  let cp = data.slice()
+  const res = []
+
+  data.forEach((it, inx) => {
+    let found = false
+    for (let i = 0; i < cp.length; i += 1) {
+      if (cp[i].MenuId === it.FatherId) {
+        found = true
+        cp[i].children = [...(cp[i].children || []), cp[inx]]
+        break
+      }
+    }
+
+    if (!found) {
+      res.push(cp[inx])
+    }
+  })
+
+  return res
+}
+
 export default {
   state: {
     menusRaw: [],
     menus: [],
     breadcrumb: [],
+    cases: [],
+    roles: [],
+    user: {}
   },
   mutations: {
+    init (state, data) { // 这里的state对应着上面这个state
+      state.cases = data.cases
+      state.menusRaw = data.menus
+      state.roles = data.roles
+      state.user = data.user
+      state.menus = packChildren(data.menus)
+    },
+
     updateBread (state, { routerData, Url }) {
       // 扁平 routerData
       // 同时构造出 含有 title 的 parent 数据
-      const routeList = flatten([], routerData, state.menusRaw)
+      const routeList = flatten([], routerData[1].children, state.menusRaw)
+      console.log(state, routerData[1].children, routeList)
 
       // 过滤出与 name 相同的 route 节点
       const currentRoute = routeList.filter(x => x.Url === Url)[0]
@@ -34,5 +68,15 @@ export default {
       // 获取 面包屑
       if (currentRoute) state.breadcrumb = currentRoute.parent.slice(1).concat(currentRoute)
     }
+  },
+  actions: {
+    updateSystemInfo (context) { // 这里的context和我们使用的$store拥有相同的对象和方法
+      this.$ajax(this.$api.system.init.url, {
+        method: this.$api.system.init.method
+      })
+        .then(res => {
+          context.commit('init', res)
+        })
+    }
   }
 }

src/store/index.js

@@ -12,8 +12,7 @@ const store = new Vuex.Store({
 Vuex.Store.prototype.$api = api
 Vuex.Store.prototype.$ajax = Ajax
 export const modules = {
-  app: () => require('./app').default,
-  system: () => require('./system').default
+  app: () => require('./app').default
 }
 
 Object.keys(modules).forEach((modKey) => {

src/store/system/index.js

@@ -1,3 +1,51 @@
+
+const packChildren = (data) => {
+  // for (var x = 0; x < arr.length; x++) {
+  //   if (arr[x].FatherId === '-1') {
+  //     arr[x].FatherId = 'root'
+  //   }
+  // }
+  // arr.unshift({
+  //   MenuId: 'root',
+  //   MenuName: '根目录',
+  //   Icon: '',
+  //   FatherID: '-1',
+  //   Url: 'system',
+  //   IsShow: 1
+  // })
+  // console.log(JSON.stringify(arr))
+  // for (var n = 0; n < arr.length; n++) {
+  //   arr[n].children = []
+  //   for (var a = 0; a < arr.length; a++) {
+  //     if (arr[n].MenuId === arr[a].FatherId) {
+  //       arr[n].children.push(arr[a])
+  //     }
+  //   }
+  // }
+  // console.log(JSON.stringify(arr))
+  // return arr[0].children
+
+  let cp = data.slice()
+  const res = []
+
+  data.forEach((it, inx) => {
+    let found = false
+    for (let i = 0; i < cp.length; i += 1) {
+      if (cp[i].MenuId === it.FatherId) {
+        found = true
+        cp[i].children = [...(cp[i].children || []), cp[inx]]
+        break
+      }
+    }
+
+    if (!found) {
+      res.push(cp[inx])
+    }
+  })
+
+  return res
+}
+
 export default {
   namespaced: true,
   state: {
@@ -9,9 +57,10 @@ export default {
   mutations: {
     init (state, data) { // 这里的state对应着上面这个state
       state.cases = data.cases
-      state.menus = data.menus
+      state.menusRaw = data.menus
       state.roles = data.roles
       state.user = data.user
+      state.menus = packChildren(data.menus)
     }
   },
   actions: {
@@ -20,14 +69,7 @@ export default {
         method: this.$api.system.init.method
       })
         .then(res => {
-          console.log(res)
-          if (res.code === 400) {
-            this.$router.push({name: 'login'})
-          } else {
-            context.commit('init', res) // 你还可以在这里触发其他的mutations方法
-          }
-        }).catch(msg => {
-
+          context.commit('init', res)
         })
     }
   }

src/util/ajax.js

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import { Message } from 'element-ui'
 import qs from 'qs'
+import router from '../router'
 
 const Axios = axios.create({
   timeout: 60000,
@@ -45,18 +46,41 @@ Axios.interceptors.request.use((config) => {
   console.log(error)
 })
 
-Axios.interceptors.response.use((res) => {
-  if (res.data.code === 200) {
-    return res.data.result
-  } else {
-    Message({
-      message: res.data.message,
-      type: 'error'
-    })
-    return res.data
-  }
-}, (error) => {
-  console.log(error)
-})
+// Axios.interceptors.response.use((res) => {
+//   // return new Promise((resolve, reject) => {
+//   //   if (res.data.code === 200) {
+//   //     resolve(res.data.result)
+//   //   } else if (res.data.code === 401) {
+//   //     router.push({ name: 'login' })
+//   //     reject(res.data)
+//   //   } else {
+//   //     Message({
+//   //       message: res.data.message,
+//   //       type: 'error'
+//   //     })
+//   //     reject(res.data)
+//   //   }
+//   // })
+// }, (error) => {
+//   console.log(error)
+// })
+
+const ajax = (...args) => {
+  return new Promise((resolve, reject) => {
+    Axios(...args).then(({ data }) => {
+      const { code, message, result } = data
+      if (code === 200) {
+        resolve(result)
+      } else if (code === 401) {
+        router.push({ name: 'login' })
+      } else {
+        Message({
+          message: message,
+          type: 'error'
+        })
+      }
+    }).catch(reject)
+  })
+}
 
-export default Axios
+export default ajax