登录控制

src/components/Breadcrumb/index.vue

@@ -2,7 +2,7 @@
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+        <span v-if="item.redirect==='noRedirect'||index===levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
@@ -33,12 +33,12 @@ export default {
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const first = matched[0]
+      const matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+      /* const first = matched[0]
 
       if (!this.isDashboard(first)) {
         matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
-      }
+      } */
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },

src/main.js

@@ -19,6 +19,7 @@ import './utils/error-log' // error log
 
 import * as filters from './filters' // global filters
 
+const userOrganizeID = 1 // 组织ID
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
@@ -41,6 +42,7 @@ Object.keys(filters).forEach(key => {
   Vue.filter(key, filters[key])
 })
 
+Vue.prototype.userOrganizeID = userOrganizeID
 Vue.config.productionTip = false
 
 new Vue({

src/permission.js

@@ -35,13 +35,10 @@ router.beforeEach(async(to, from, next) => {
           // get user info
           // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
           const { roles } = await store.dispatch('user/getInfo')
-
           // generate accessible routes map based on roles
           const accessRoutes = await store.dispatch('permission/generateRoutes', roles)
-
           // dynamically add accessible routes
           router.addRoutes(accessRoutes)
-
           // hack method to ensure that addRoutes is complete
           // set the replace: true, so the navigation will not leave a history record
           next({ ...to, replace: true })

src/settings.js

@@ -24,11 +24,6 @@ module.exports = {
    * @description Whether show the logo in sidebar
    */
   sidebarLogo: true,
-  /**
-   * @type {number}
-   * @description 组织ID
-   */
-  organizeID: 1,
 
   /**
    * @type {string | array} 'production' | ['production', 'development']

src/store/modules/user.js

@@ -48,7 +48,8 @@ const actions = {
   getInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
       getInfo(state.token).then(response => {
-        const { data } = response
+        // const { data } = response
+        const data = response.data
         if (!data) {
           reject('Verification failed, please Login again.')
         }
@@ -56,17 +57,14 @@ const actions = {
         if (!roles || roles.length <= 0) {
           reject('getInfo: roles must be a non-null array!')
         } */
-        const account = data.account
-        const roles = ['admin']
-        const introduction = 'I am a super administrator'
-        const avatar = 'avatar'
-
+        data.roles = ['admin']
+        data.introduction = 'I am a super administrator'
+        const { roles, account, avatar, introduction } = data
         commit('SET_ROLES', roles)
         commit('SET_NAME', account)
         commit('SET_AVATAR', avatar)
         commit('SET_INTRODUCTION', introduction)
         resolve(data)
-        debugger
       }).catch(error => {
         reject(error)
       })

src/utils/permission.js

@@ -9,7 +9,6 @@ export default function checkPermission(value) {
   if (value && value instanceof Array && value.length > 0) {
     const roles = store.getters && store.getters.roles
     const permissionRoles = value
-
     const hasPermission = roles.some(role => {
       return permissionRoles.includes(role)
     })

src/views/goods/category-create.vue

@@ -48,7 +48,7 @@ export default {
       },
       temp: {
         id: 1,
-        organizeID: this.organizeID,
+        organizeID: this.userOrganizeID,
         classifyName: '针剂',
         classifyImage: 'dfgdfsgsd',
         sort: 60,
@@ -60,11 +60,6 @@ export default {
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   methods: {
     createData() {
       this.$refs['dataForm'].validate((valid) => {

src/views/goods/category-edit.vue

@@ -48,7 +48,7 @@ export default {
       },
       temp: {
         id: 1,
-        organizeID: this.organizeID,
+        organizeID: this.userOrganizeID,
         classifyName: '针剂',
         classifyImage: 'dfgdfsgsd',
         sort: 60,
@@ -60,11 +60,6 @@ export default {
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   methods: {
     updateData() {
       this.$refs['dataForm'].validate((valid) => {

src/views/goods/category.vue

@@ -86,11 +86,6 @@ export default {
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },

src/views/goods/list-commonly.vue

@@ -110,16 +110,11 @@ export default {
           validFlag: '', // '商品状态,1已上架,2已下架',
           productClassifyName: '', // '对应cm_mall_products_classify商品分类表id',
           addTime: '', //  '添加时间',
-          organizeID: this.organizeID // '组织ID,具体对应cm_mall_organize表ID',
+          organizeID: this.userOrganizeID // '组织ID,具体对应cm_mall_organize表ID',
         }
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },
@@ -147,7 +142,7 @@ export default {
             validFlag: '1',
             productClassifyName: 0,
             addTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           },
           {
             id: 0,
@@ -164,7 +159,7 @@ export default {
             validFlag: '',
             productClassifyName: 0,
             addTime: '',
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           }
         ]
       })

src/views/goods/list-preferential.vue

@@ -110,16 +110,11 @@ export default {
           validFlag: '', // '商品状态,1已上架,2已下架',
           productClassifyName: '', // '对应cm_mall_products_classify商品分类表id',
           addTime: '', //  '添加时间',
-          organizeID: this.organizeID // '组织ID,具体对应cm_mall_organize表ID',
+          organizeID: this.userOrganizeID // '组织ID,具体对应cm_mall_organize表ID',
         }
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },
@@ -147,7 +142,7 @@ export default {
             validFlag: '1',
             productClassifyName: 0,
             addTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           },
           {
             id: 0,
@@ -164,7 +159,7 @@ export default {
             validFlag: '',
             productClassifyName: 0,
             addTime: '',
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           }
         ]
       })

src/views/goods/list-preferred.vue

@@ -110,16 +110,11 @@ export default {
           validFlag: '', // '商品状态,1已上架,2已下架',
           productClassifyName: '', // '对应cm_mall_products_classify商品分类表id',
           addTime: '', //  '添加时间',
-          organizeID: this.organizeID // '组织ID,具体对应cm_mall_organize表ID',
+          organizeID: this.userOrganizeID // '组织ID,具体对应cm_mall_organize表ID',
         }
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },
@@ -147,7 +142,7 @@ export default {
             validFlag: '1',
             productClassifyName: 0,
             addTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           },
           {
             id: 0,
@@ -164,7 +159,7 @@ export default {
             validFlag: '',
             productClassifyName: 0,
             addTime: '',
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           }
         ]
       })

src/views/goods/list-select.vue

@@ -108,17 +108,12 @@ export default {
           validFlag: '', // '商品状态,1已上架,2已下架',
           productClassifyName: '', // '对应cm_mall_products_classify商品分类表id',
           addTime: '', //  '添加时间',
-          organizeID: this.organizeID // '组织ID,具体对应cm_mall_organize表ID',
+          organizeID: this.userOrganizeID // '组织ID,具体对应cm_mall_organize表ID',
         }
       },
       multipleSelection: []
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },
@@ -146,7 +141,7 @@ export default {
             validFlag: '1',
             productClassifyName: 0,
             addTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           },
           {
             id: 0,
@@ -163,7 +158,7 @@ export default {
             validFlag: '',
             productClassifyName: 0,
             addTime: '',
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           }
         ]
       })

src/views/goods/list.vue

@@ -174,7 +174,7 @@ export default {
           validFlag: '', // '商品状态,1已上架,2已下架',
           productClassifyName: '', // '对应cm_mall_products_classify商品分类表id',
           addTime: '', //  '添加时间',
-          organizeID: this.organizeID // '组织ID,具体对应cm_mall_organize表ID',
+          organizeID: this.userOrganizeID // '组织ID,具体对应cm_mall_organize表ID',
         }
       },
       dialogFormVisible: false,
@@ -196,11 +196,6 @@ export default {
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },
@@ -228,7 +223,7 @@ export default {
             validFlag: '1',
             productClassifyName: 0,
             addTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           },
           {
             id: 0,
@@ -245,7 +240,7 @@ export default {
             validFlag: '',
             productClassifyName: 0,
             addTime: '',
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           }
         ]
       })

src/views/login/index.vue

@@ -77,7 +77,7 @@ export default {
       loginForm: {
         account: 'admin',
         password: '123456',
-        organizeID: 1
+        organizeID: this.userOrganizeID
       },
       loginRules: {
         account: [{ required: true, trigger: 'blur', validator: validateUsername }],
@@ -88,11 +88,6 @@ export default {
       redirect: undefined
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   watch: {
     $route: {
       handler: function(route) {

src/views/order/detail.vue

@@ -16,11 +16,6 @@ export default {
       activeIndex: '2'
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
 
   },

src/views/order/list.vue

@@ -124,16 +124,11 @@ export default {
           payStatus: '',
           refundType: '',
           returnedPurchaseStatus: '',
-          organizeID: this.organizeID
+          organizeID: this.userOrganizeID
         }
       }
     }
   },
-  computed: {
-    organizeID() {
-      return this.$store.state.settings.organizeID
-    }
-  },
   created() {
     this.fetchData()
   },
@@ -159,7 +154,7 @@ export default {
             returnedPurchaseStatus: '',
             payTotalFee: '',
             orderTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           },
           {
             orderID: '',
@@ -174,7 +169,7 @@ export default {
             returnedPurchaseStatus: '',
             payTotalFee: '',
             orderTime: new Date(),
-            organizeID: this.organizeID
+            organizeID: this.userOrganizeID
           }
         ]
       })