Merge branch 'dev_hxz' into test

src/permission.js

@@ -7,26 +7,29 @@ import { getToken } from '@/utils/auth'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login','/platformlogin', '/auth-redirect', '/bind', '/register','/newyuncang']
+const whiteList = ['/login','/platformlogin','/', '/auth-redirect', '/bind', '/register']
 
 router.beforeEach((to, from, next) => {
   //debugger
   NProgress.start()
+  const hasToken = getToken()
   // console.log("getToken()",getToken())
-  if (getToken()) {
+  if (hasToken) {
     //
     /* has token*/
-    if (to.path === '/login') {
-      return false
-      next({ path: '/' })
+    if (to.path === '/platformlogin') {
+        // return false
+      next({ path: '/home/index' })
       NProgress.done()
     } else {
       if (store.getters.roles.length === 0) {
+        debugger
         // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetInfo').then(res => {
           // return false
           // 拉取user_info
-          const roles = res.data.Role
+          const roles = res.data.roles
+          debugger
           store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
           // 测试 默认静态页面
           // store.dispatch('permission/generateRoutes', { roles }).then(accessRoutes => {
@@ -37,7 +40,7 @@ router.beforeEach((to, from, next) => {
         }).catch(err => {
             store.dispatch('FedLogOut').then(() => {
               Message.error(err)
-              next({ path: '/' })
+              next({ path: '/home/index' })
             })
           })
       } else {
@@ -59,8 +62,8 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
-      //next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
-      next(`/newyuncang?redirect=${to.path}`) // 否则全部重定向到登录页
+      next(`/login?redirect=${to.path}`) // 否则全部重定向到登录页
+      // next(`/newyuncang?redirect=${to.path}`) // 否则全部重定向到登录页
       NProgress.done()
     }
   }

src/router/index.js

@@ -78,7 +78,7 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/newyuncang',
+    path: '/',
     component: (resolve) => require(['@/views/entry/newyuncang'], resolve),
     hidden: true
   },
@@ -126,7 +126,7 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '',
+    path: '/home',
     component: Layout,
     redirect: 'index',
     children: [

src/store/modules/user.js

@@ -67,10 +67,11 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
+          debugger
           const user = res.data.user
           // const avatar = user.avatar == "" ? require("@/assets/image/login-background.jpg") : process.env.VUE_APP_BASE_API +"/"+ user.avatar;
           const avatar = require("@/assets/image/login-background.jpg")
-          if (res.data.Role && res.data.Role.length > 0) { // 验证返回的roles是否是一个非空数组
+          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.data.roles)
             commit('SET_PERMISSIONS', res.data.permissions)
           } else {

src/views/platformlogin.vue

@@ -17,6 +17,7 @@
             // 获取客户是否有审核信息
             getShopInf().then(res => {
               if(res.code === 1) {
+                debugger
                 switch(res.data.state) {
                   case 0:
                     switch(res.data.status){
@@ -32,7 +33,7 @@
                     }
                     break;
                   case 1: // 审核成功，要跳转到首页
-                    this.$router.push({path: '/'});
+                    this.$router.push({path: '/home/index'});
                     break;
                   case 2: // 审核中
                     this.$router.push({path: '/reviewing'});