用户信息增加

jinhui.wang
Commit a2b7b7c3688a150b11cb2568ecd4b7c57f6de28d a2b7b7c3 1 parent ff38b5df
Showing 4 changed files with 20 additions and 46 deletions
src/api/system/user.js
src/layout/components/Navbar.vue
src/permission.js
src/store/modules/user.js
--- a/src/api/system/user.js
View file @a2b7b7c
+++ b/src/api/system/user.js
View file @a2b7b7c
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: '/manager-server/sysUser/getCurrentUser',
+    url: '/bus-customer/user/getCurrentUser',
     method: 'get'
   })
 }
--- a/src/layout/components/Navbar.vue
View file @a2b7b7c
+++ b/src/layout/components/Navbar.vue
View file @a2b7b7c
@@ -13,7 +13,7 @@
       <top-nav id="topmenu-container" />
       <div class="user-container">
         <span class="userName">{{
-          userData.userName != null ? userData.userName : ""
+          userData != null ? userData.username : ""
         }}</span>
         <svg-icon
           class="el-icon-user-solid"
@@ -47,28 +47,17 @@
               src="../../assets/images/sprite-placeholder.png"
               alt=""
             />
-            <div class="userName" v-if="userData.id">
+            <div class="userName" v-if="userData != null">
-              {{ userData.userName != null ? userData.userName : "" }}
+              {{ userData != null ? userData.username : "" }}
               <el-divider direction="vertical"></el-divider>
-              <span>{{ $store.getters.userData | loginType }}</span>
+              <span>员工登录</span>
             </div>
             <!-- <svg-icon class="el-icon-user-solid" icon-class="user-center" style="font-size: 28px;" /> -->
             <div class="userName" v-else>
               {{ $t("system.navber.createLogin") }}
             </div>
           </div>
-          <el-dropdown-menu v-if="userData.id" slot="dropdown">
+          <el-dropdown-menu v-if="userData != null" slot="dropdown">
-            <router-link
-              v-if="
-                $store.getters.userData.organization &&
-                $store.getters.userData.organization.code == 'customer'
-              "
-              to="/newui_information_parent/newui_information_leaf"
-            >
-              <el-dropdown-item>{{
-                $t("system.navber.userSystem")
-              }}</el-dropdown-item>
-            </router-link>
             <el-dropdown-item @click.native="logout">
               <span>{{ $t("system.navber.logout") }}</span>
             </el-dropdown-item>
--- a/src/permission.js
View file @a2b7b7c
+++ b/src/permission.js
View file @a2b7b7c
@@ -18,7 +18,7 @@ router.beforeEach((to, from, next) => {
       if (to.path === '/login') {
         next({ path: path })
       } else {
-        if (store.getters.userData.id === undefined) {
+        if (store.getters.userData == null) {
           // 判断当前用户是否已拉取完user_info信息
           store.dispatch('GetInfo').then((res) => {
             // if (res.success) {
--- a/src/store/modules/user.js
View file @a2b7b7c
+++ b/src/store/modules/user.js
View file @a2b7b7c
 import { login, logout } from '@/api/login'
+import { getInfo } from '@/api/system/user.js'
 import { getLogisticsCodeLis, getDictData } from '@/api/system/dict-api.js'
 import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth'
 import { alertWarningMsg } from '@/utils/index.js'
@@ -6,9 +7,7 @@ import { alertWarningMsg } from '@/utils/index.js'
 const user = {
   state: {
     token: getToken(),
-    userData: {
+    userData: null,
-      userSource: {}
-    },
     name: '',
     avatar: '',
     lockTime: 0,
@@ -100,30 +99,16 @@ const user = {
     // 获取用户信息
     async GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        commit('SET_USERDATA', {
+        getInfo().then(res => {
-          id: 1,
+          if (res.code === '200') {
-          loginName: 'xxx',
+            commit("SET_USERDATA", res.data);
-          organization: {}
+            resolve(res)
-        })
+          } else {
-        resolve({
+            reject(res)
-          id: 1,
+          }
-          loginName: 'xxx',
+        }).catch(error => {
-          organization: {}
+          reject(error)
         })
-        // getInfo().then(res => {
-        //   if (res == undefined || res.code != '200') {
-        //     res != undefined ? alertWarningMsg(res.message).finally(() => {
-        //       this.dispatch('FedLogOut')
-        //     })
-        //       : ''
-        //     reject(res)
-        //   } else {
-
-        //     resolve(res)
-        //   }
-        // }).catch(error => {
-        //   reject(error)
-        // })
       })
     },
@@ -160,7 +145,7 @@ const user = {
         // removeEntryLock(state.editEntryData.id, state.editEntryData.status).then(() => {
         logout(state.token).then(() => {
           commit('SET_TOKEN', '')
-          commit('SET_USERDATA', {})
+          commit('SET_USERDATA', null)
           removeToken()
           removeTime()
           resolve()
@@ -176,7 +161,7 @@ const user = {
       return new Promise(resolve => {
         // removeEntryLock(state.editEntryData.id, state.editEntryData.status).then(() => {
         commit('SET_TOKEN', '')
-        commit('SET_USERDATA', {})
+        commit('SET_USERDATA', null)
         removeToken()
         removeTime()
         removeUserId()