From d3a0651fb78faae81c8850ab2d48140c7de5806b Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Tue, 12 Aug 2025 18:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=89=B4=E6=9D=83=E7=9B=B8=E5=85=B3=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                     |   7 +
 api/login.js                                | 126 +++---
 main.js                                     |  54 +--
 pages-internal/internalCom.vue              |  18 +-
 pages-internal/workReport/reportDetails.vue |   4 +-
 pages/login/login.vue                       | 464 ++++++++++----------
 store/modules/user.js                       | 190 ++++----
 utils/permission.js                         |   1 +
 8 files changed, 462 insertions(+), 402 deletions(-)

diff --git a/App.vue b/App.vue
index 56a2e62..9dd5962 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,7 @@
 <script>
 	import config from '@/config'
 	import request from '@/utils/request';
+	import store from '@/store'
 	export default {
 		onLaunch: function() {
 			console.log('app lunch');
@@ -81,6 +82,12 @@
 
 				}
 			})
+			// 判断本地是否有 token，有的话就去获取权限
+			if (store.state.user.token) {
+				store.dispatch('GetInfo').catch(err => {
+					console.error('获取用户信息失败', err)
+				})
+			}
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/api/login.js b/api/login.js
index e61d732..e091b1e 100644
--- a/api/login.js
+++ b/api/login.js
@@ -2,90 +2,94 @@ import request from '@/utils/request'
 
 // 登录方法
 export function login(username, password, code, uuid) {
-  const data = {
-    username,
-    password,
-    code,
-    uuid
-  }
-  return request({
-    'url': '/rescue/login',
-    headers: {
-      isToken: false
-    },
-    'method': 'post',
-    'data': data
-  })
+	const data = {
+		username,
+		password,
+		code,
+		uuid
+	}
+	return request({
+		'url': '/rescue/login',
+		headers: {
+			isToken: false
+		},
+		'method': 'post',
+		'data': data
+	})
 }
 
 // 微信登录
 export function wechatLogin(data) {
-  return request({
-    'url': '/weChat/wechatLogin',
-    'method': 'post',
-    'data':data
-  })
+	return request({
+		'url': '/weChat/wechatLogin',
+		'method': 'post',
+		'data': data
+	})
 }
 // 获取用户详细信息
 export function getInfo() {
-  return request({
-    'url': '/rescue/getInfo',
-    'method': 'get'
-  })
+	// return request({
+	// 	'url': '/rescue/getInfo',
+	// 	'method': 'get'
+	// })
+	return request({
+		'url': '/admin-api/system/auth/get-permission-info',
+		'method': 'get'
+	})
 }
 
 // 退出方法
 export function logout() {
-  return request({
-    'url': '/rescue/logout',
-    'method': 'post'
-  })
+	return request({
+		'url': '/rescue/logout',
+		'method': 'post'
+	})
 }
 
 // 获取验证码
 export function getCodeImg() {
-  return request({
-    'url': '/rescue/captchaImage',
-    headers: {
-      isToken: false,
-    },
-    method: 'get',
-    timeout: 20000
-  })
+	return request({
+		'url': '/rescue/captchaImage',
+		headers: {
+			isToken: false,
+		},
+		method: 'get',
+		timeout: 20000
+	})
 }
 
 
 // 获取验证码
 export function loginApp(data) {
-  return request({
-    'url': '/rescue/loginQx',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    timeout: 20000,
-	data
-  })
+	return request({
+		'url': '/rescue/loginQx',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		timeout: 20000,
+		data
+	})
 }
 export function loginAppuserName(data) {
-  return request({
-    'url': '/userClient/weChat/login',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    timeout: 20000,
-	data
-  })
+	return request({
+		'url': '/userClient/weChat/login',
+		headers: {
+			isToken: false
+		},
+		method: 'post',
+		timeout: 20000,
+		data
+	})
 }
 
 // 使用手机号查询所在的租户获得租户编号
 export function getTenantIdByPhone(phone) {
-  return request({
-    url: '/app-api/system/user/getListByPhone',
-    method: 'get',
-    params: {
-      phone
-    }
-  })
-}
+	return request({
+		url: '/app-api/system/user/getListByPhone',
+		method: 'get',
+		params: {
+			phone
+		}
+	})
+}
\ No newline at end of file
diff --git a/main.js b/main.js
index cbd80a5..59558d6 100644
--- a/main.js
+++ b/main.js
@@ -8,57 +8,61 @@ Vue.prototype.$baseImageUrl = baseImageUrl;
 Vue.use(uView);
 // 如此配置即可
 import {
-  tabBarconnect,
-  closeMsgSocket,
-  sendMsg
+	tabBarconnect,
+	closeMsgSocket,
+	sendMsg
 } from '@/utils/tebBarSocket'
 import {
-  getStrData
+	getStrData
 } from '@/utils/auth'
 let msgTimer;
 let msgSocket;
-export function startMsgSocket(tenantId,userId) {
-  msgSocket = null
-  msgSocket = tabBarconnect(tenantId,userId);
-  if (!msgTimer && getStrData('userId')) {
-    msgTimer = setInterval(() => {
-      sendMsg(msgSocket)
-    }, 10000);
-  }
-  Vue.prototype.$msgSocket = msgSocket
+export function startMsgSocket(tenantId, userId) {
+	msgSocket = null
+	msgSocket = tabBarconnect(tenantId, userId);
+	if (!msgTimer && getStrData('userId')) {
+		msgTimer = setInterval(() => {
+			sendMsg(msgSocket)
+		}, 10000);
+	}
+	Vue.prototype.$msgSocket = msgSocket
 }
 Vue.prototype.$startMsgSocket = startMsgSocket; //userid
 export function tabBarcloseSocket() {
-  closeMsgSocket;
+	closeMsgSocket;
 }
 export function getclearInterval() {
-  console.log('执行关闭请求');
-  clearInterval(msgTimer);
-  msgTimer = undefined;
+	console.log('执行关闭请求');
+	clearInterval(msgTimer);
+	msgTimer = undefined;
 
 }
 Vue.prototype.$getclearInterval = getclearInterval;
 // #ifndef VUE3
 import Vue from 'vue'
+import store from './store'
 import './uni.promisify.adaptor'
 import {
-  request
+	request
 } from "@/utils/request.js"
 Vue.prototype.$request = request
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-  ...App
+	store,
+	...App
 })
 app.$mount()
 // #endif
 
 // #ifdef VUE3
-import { createSSRApp } from 'vue'
+import {
+	createSSRApp
+} from 'vue'
 export function createApp() {
-  const app = createSSRApp(App)
-  return {
-    app
-  }
+	const app = createSSRApp(App)
+	return {
+		app
+	}
 }
-// #endif
+// #endif
\ No newline at end of file
diff --git a/pages-internal/internalCom.vue b/pages-internal/internalCom.vue
index c84f81d..f4ef76a 100644
--- a/pages-internal/internalCom.vue
+++ b/pages-internal/internalCom.vue
@@ -23,6 +23,11 @@
 		getJSONData,
 	} from '@/utils/auth'
 	import tabBarVue from "@/components/tabBar/tabBar.vue";
+	import {
+		checkPermi,
+		checkRole
+	} from "@/utils/permission"; // 权限判断函数
+
 
 	export default {
 		components: {
@@ -65,11 +70,14 @@
 				});
 				return;
 			}
+			if (this.checkRole(['tenant_admin'])) {
+				console.log('哈哈哈哈哈');
+			}
+			if (this.checkPermi(['system:user:add', 'system:user:edit'])) {
+				console.log('哈哈哈哈哈');
+			}
 
-			this.customInfo = getUserInfo();
-			console.log('customInfo', this.customInfo);
-
-			if (this.customInfo.roleCodes.includes('weixiu') || this.customInfo.roleCodes.includes('tenant_admin')) {
+			if (this.checkRole(['tenant_admin', 'weixiu'])) {
 				this.filteredList = this.menuList;
 
 			} else {
@@ -77,6 +85,8 @@
 			}
 		},
 		methods: {
+			checkPermi,
+			checkRole,
 			goManage(id) {
 				const routes = {
 					1: '/pages-internal/staffManagement/NewstaffManagement',
diff --git a/pages-internal/workReport/reportDetails.vue b/pages-internal/workReport/reportDetails.vue
index acfd757..541bd6e 100644
--- a/pages-internal/workReport/reportDetails.vue
+++ b/pages-internal/workReport/reportDetails.vue
@@ -24,8 +24,8 @@
 					<text style="color: red;">*</text>
 					汇报内容
 				</view>
-				<u--textarea v-if="type != 'look'" v-model="report.reportContent" placeholder="请输入内容"></u--textarea>
-				<textarea v-else v-model="report.reportContent" placeholder="请输入内容" disabled></textarea>
+				<!-- <u--textarea v-if="type != 'look'" v-model="report.reportContent" placeholder="请输入内容"></u--textarea> -->
+				<textarea auto-height v-model="report.reportContent" placeholder="请输入内容" disabled></textarea>
 				<view class="x_"></view>
 				<view class="d_b" @click="handleUpload" v-if="type != 'look'">
 					<view class="">附件</view>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 83e42e6..3cb86a4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -22,9 +22,9 @@
 			<view class="inputs" v-if="activeid == 0 || activeid == 2 ">
 				<input type="password" v-model="wrod" placeholder="请输入密码">
 			</view>
-<!--			<view class="wjworb" v-if="activeid == 0 || activeid == 2" @click="goforgot()">-->
-<!--				<view class="">忘记密码</view>-->
-<!--			</view>-->
+			<!--			<view class="wjworb" v-if="activeid == 0 || activeid == 2" @click="goforgot()">-->
+			<!--				<view class="">忘记密码</view>-->
+			<!--			</view>-->
 		</view>
 		<view class="dl" @click="getlogin()">
 			<text>登 录</text>
@@ -48,28 +48,28 @@
 		loginApp
 	} from '@/api/login';
 	import {
-    getToken,
-    getUserInfo,
+		getToken,
+		getUserInfo,
 		setToken,
 		setTenantId,
-    getTenantId,
-    setUserInfo,
-    setJSONData,
-    setStrData
+		getTenantId,
+		setUserInfo,
+		setJSONData,
+		setStrData
 	} from '@/utils/auth'
 	import {
 		login,
 		getInfo,
 		getTenantIdByPhone
 	} from '@/api/login'
-  let innerAudioContext ='';
+	let innerAudioContext = '';
 	export default {
 		data() {
 			return {
-        // 是否正在播放
-        ifPlay:false,
-			  //系统标识
-			  sysCode:"weixiu",
+				// 是否正在播放
+				ifPlay: false,
+				//系统标识
+				sysCode: "weixiu",
 				phoneNumber: "",
 				baseUrl: this.$baseUrl,
 				isButtonDisabled: false,
@@ -98,22 +98,22 @@
 			},
 		},
 		mounted() {},
-    onShow(){
-      if (getToken()) {
-        //判断是否是仓管，仓管需要跳单独的首页
-        let userInfo = getUserInfo()
-        if (userInfo.roleCodes.includes('repair_warehouse')) {
-          //仓管
-          uni.navigateTo({
-            url: '/pages-warehouse/home/home'
-          })
-        } else {
-          uni.navigateTo({
-            url: '/pages-home/home/home'
-          })
-        }
-      }
-    },
+		onShow() {
+			if (getToken()) {
+				//判断是否是仓管，仓管需要跳单独的首页
+				let userInfo = getUserInfo()
+				if (userInfo.roleCodes.includes('repair_warehouse')) {
+					//仓管
+					uni.navigateTo({
+						url: '/pages-warehouse/home/home'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages-home/home/home'
+					})
+				}
+			}
+		},
 		methods: {
 			wxlogin() {
 				uni.login({
@@ -146,70 +146,71 @@
 					})
 					return
 				}
-        const loginFun = () => {
-          let data;
-          if (this.activeid == 1) {
-            //验证码
-            data = {
-              phone: this.tel,
-              code: this.yzm,
-              type: 1,
-              sysCode:this.sysCode,
-              tenantId:getTenantId()
-            }
-          } else {
-            //密码登录
-            data = {
-              username: this.tel,
-              password: this.wrod,
-              type: 0,
-              sysCode:this.sysCode,
-              tenantId:getTenantId()
-            }
-          }
-          request({
-            url: '/admin-api/company/staff/loginApp',
-            method: 'post',
-            data: data
-          }).then((res) => {
-            console.log(res)
-            if (res.code == 200) {
-              uni.showToast({
-                title: '登录成功',
-                icon: 'none'
-              })
-              setToken(res.data.loginResult.accessToken)
-              setUserInfo(res.data.userinfo)
-              setStrData("userId",res.data.userinfo.id)
-              //查租户下维修企业信息
-              this.getCompanyInfo()
-              this.getNoReadNum()
-              if(res.data.userinfo.roleCodes.includes("repair_staff")){
-                //维修工角色，需要再查一下是否是班组长
-                this.getIdLeader()
-              }
-              this.getStaffInfo(res.data.userinfo.id)
-              if (res.data.userinfo.roleCodes.includes("repair_warehouse")){
-                //跳转首页
-                uni.navigateTo({
-                  url: '/pages-warehouse/home/home'
-                })
-              } else {
-                //跳转首页
-                uni.navigateTo({
-                  url: '/pages-home/home/home'
-                })
-              }
+				const loginFun = () => {
+					let data;
+					if (this.activeid == 1) {
+						//验证码
+						data = {
+							phone: this.tel,
+							code: this.yzm,
+							type: 1,
+							sysCode: this.sysCode,
+							tenantId: getTenantId()
+						}
+					} else {
+						//密码登录
+						data = {
+							username: this.tel,
+							password: this.wrod,
+							type: 0,
+							sysCode: this.sysCode,
+							tenantId: getTenantId()
+						}
+					}
+					request({
+						url: '/admin-api/company/staff/loginApp',
+						method: 'post',
+						data: data
+					}).then((res) => {
+						console.log(res)
+						if (res.code == 200) {
+							uni.showToast({
+								title: '登录成功',
+								icon: 'none'
+							})
+							setToken(res.data.loginResult.accessToken)
+							setUserInfo(res.data.userinfo)
+							setStrData("userId", res.data.userinfo.id)
+							//查租户下维修企业信息
+							this.getCompanyInfo()
+							this.getNoReadNum()
+							this.loginSuccess()
+							if (res.data.userinfo.roleCodes.includes("repair_staff")) {
+								//维修工角色，需要再查一下是否是班组长
+								this.getIdLeader()
+							}
+							this.getStaffInfo(res.data.userinfo.id)
+							if (res.data.userinfo.roleCodes.includes("repair_warehouse")) {
+								//跳转首页
+								uni.navigateTo({
+									url: '/pages-warehouse/home/home'
+								})
+							} else {
+								//跳转首页
+								uni.navigateTo({
+									url: '/pages-home/home/home'
+								})
+							}
 
-            }else{
-              uni.showToast({
-                title: res.msg,
-                icon: 'none'
-              })
-            }
-          })
-        }
-        //查所有可选租户
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							})
+						}
+					})
+				}
+				//查所有可选租户
 				getTenantIdByPhone(this.tel).then(res => {
 					if (res.code === 200 && res.data && res.data.length > 0) {
 						uni.showActionSheet({
@@ -223,42 +224,51 @@
 						})
 					} else {
 						//没有可选租户
-            uni.showToast({
-              title: '抱歉，您没有权限登录!',
-              icon: 'none'
-            })
+						uni.showToast({
+							title: '抱歉，您没有权限登录!',
+							icon: 'none'
+						})
+					}
+				})
+			},
+			// 登录成功后，处理函数
+			loginSuccess(result) {
+				// 设置用户信息
+				this.$store.dispatch('GetInfo').then(res => {
+
+				})
+			},
+			/**
+			 * 查员工个人信息
+			 */
+			getStaffInfo(userId) {
+				request({
+					url: '/admin-api/company/staff/getById',
+					method: 'get',
+					params: {
+						id: userId
+					}
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200) {
+						setJSONData("staffInfo", res.data)
+					}
+				})
+			},
+			/**
+			 * 查是否班组长
+			 */
+			getIdLeader() {
+				request({
+					url: '/admin-api/repair/worker/getIfLeader',
+					method: 'get'
+				}).then((res) => {
+					console.log(res)
+					if (res.code == 200) {
+						setStrData("ifLeader", res.data)
 					}
 				})
 			},
-      /**
-       * 查员工个人信息
-       */
-      getStaffInfo(userId){
-        request({
-          url: '/admin-api/company/staff/getById',
-          method: 'get',
-          params: {id:userId}
-        }).then((res) => {
-          console.log(res)
-          if (res.code == 200) {
-            setJSONData("staffInfo",res.data)
-          }
-        })
-      },
-      /**
-       * 查是否班组长
-       */
-      getIdLeader(){
-        request({
-          url: '/admin-api/repair/worker/getIfLeader',
-          method: 'get'
-        }).then((res) => {
-          console.log(res)
-          if (res.code == 200) {
-            setStrData("ifLeader",res.data)
-          }
-        })
-      },
 			getxz(index) {
 				this.activeid = index
 			},
@@ -288,7 +298,7 @@
 				}
 				const data = {
 					phone: this.tel,
-          sysCode:this.sysCode,
+					sysCode: this.sysCode,
 				}
 				request({
 					url: '/app-api/company/staff/loginSmsCode',
@@ -297,8 +307,8 @@
 				}).then((res) => {
 					console.log('验证码', res);
 					if (res.code == 200) {
-            this.disableButton(); // 禁用按钮
-            this.startCountdown(); // 启动倒计时
+						this.disableButton(); // 禁用按钮
+						this.startCountdown(); // 启动倒计时
 						uni.showToast({
 							title: '验证码已发送 请注意查收',
 							icon: 'none'
@@ -326,97 +336,100 @@
 					}
 				}, 1000);
 			},
-      /**
-       * 获取未读消息数量
-       * @returns {Promise<void>}
-       */
-      async getNoReadNum(){
-        await request({
-          url: "/admin-api/system/notify-message/get-unread-count?systemCode=weixiu",
-          method: "GET"
-        }).then((res) => {
-          if(res.code==200 && res.data>0){
-            this.dianyidain()
-          }
-        })
-      },
-      async getCompanyInfo(){
-        await request({
-          url: "/admin-api/base/company/getCompanyByTenantId",
-          method: "GET",
-          params:{tenantId:getTenantId(),systemCode:"weixiu"}
-        }).then((res) => {
-          if(res.code==200){
-            setJSONData("companyInfo",res.data)
-            console.log(res.data,"企业信息")
-          }
-        })
-      },
-      dianyidain() {
-        if(!this.ifPlay){
-          console.log('执行了，dianyidain');
-          if(innerAudioContext!=""){
-            try {
-              console.log('调用前先销毁');
-              innerAudioContext.stop();
-              innerAudioContext.destroy();
-              innerAudioContext="";
-            }catch (e){
-              console.log('销毁出错');
-            }
-          }
-          innerAudioContext = uni.createInnerAudioContext();
-          this.ifPlay=true
-          // #ifdef APP-PLUS
-          innerAudioContext.src = '../../static/msgV.mp3';
-          // #endif
-          // #ifndef APP-PLUS
-          innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3';
-          // #endif
-          // 设置播放次数和计数器
-          const playCount = 4;
-          let currentCount = 0;
-          // 初次播放
-          innerAudioContext.play();
-          // 震动
-          uni.vibrateLong({
-            success: function () {
-              console.log('success');
-            }
-          });
-          innerAudioContext.onError((err) => {
-            console.error('播放错误', err);
-            this.ifPlay=false
-            innerAudioContext.stop();
-            innerAudioContext.destroy(); // 播放错误后释放实例
-          });
-          // 监听音频播放结束事件
-          innerAudioContext.onEnded(() => {
-            // 播放计数加一
-            currentCount++;
-            // 判断是否达到播放次数上限
-            if (currentCount < playCount) {
-              // 继续播放
-              innerAudioContext.play();
-              // 震动
-              uni.vibrateLong({
-                success: function () {
-                  console.log('success');
-                }
-              });
-            } else {
-              // 播放完成，可以在这里添加额外的逻辑
-              console.log('播放完成');
-              this.ifPlay=false
-              //及时释放资源
-              innerAudioContext.stop();
-              innerAudioContext.destroy();
-            }
-          });
-        }else{
-          console.log('正在播放音频，拒绝播放请求');
-        }
-      },
+			/**
+			 * 获取未读消息数量
+			 * @returns {Promise<void>}
+			 */
+			async getNoReadNum() {
+				await request({
+					url: "/admin-api/system/notify-message/get-unread-count?systemCode=weixiu",
+					method: "GET"
+				}).then((res) => {
+					if (res.code == 200 && res.data > 0) {
+						this.dianyidain()
+					}
+				})
+			},
+			async getCompanyInfo() {
+				await request({
+					url: "/admin-api/base/company/getCompanyByTenantId",
+					method: "GET",
+					params: {
+						tenantId: getTenantId(),
+						systemCode: "weixiu"
+					}
+				}).then((res) => {
+					if (res.code == 200) {
+						setJSONData("companyInfo", res.data)
+						console.log(res.data, "企业信息")
+					}
+				})
+			},
+			dianyidain() {
+				if (!this.ifPlay) {
+					console.log('执行了，dianyidain');
+					if (innerAudioContext != "") {
+						try {
+							console.log('调用前先销毁');
+							innerAudioContext.stop();
+							innerAudioContext.destroy();
+							innerAudioContext = "";
+						} catch (e) {
+							console.log('销毁出错');
+						}
+					}
+					innerAudioContext = uni.createInnerAudioContext();
+					this.ifPlay = true
+					// #ifdef APP-PLUS
+					innerAudioContext.src = '../../static/msgV.mp3';
+					// #endif
+					// #ifndef APP-PLUS
+					innerAudioContext.src = 'https://www.nuoyunr.com/lananRsc/rescue/msgV.mp3';
+					// #endif
+					// 设置播放次数和计数器
+					const playCount = 4;
+					let currentCount = 0;
+					// 初次播放
+					innerAudioContext.play();
+					// 震动
+					uni.vibrateLong({
+						success: function() {
+							console.log('success');
+						}
+					});
+					innerAudioContext.onError((err) => {
+						console.error('播放错误', err);
+						this.ifPlay = false
+						innerAudioContext.stop();
+						innerAudioContext.destroy(); // 播放错误后释放实例
+					});
+					// 监听音频播放结束事件
+					innerAudioContext.onEnded(() => {
+						// 播放计数加一
+						currentCount++;
+						// 判断是否达到播放次数上限
+						if (currentCount < playCount) {
+							// 继续播放
+							innerAudioContext.play();
+							// 震动
+							uni.vibrateLong({
+								success: function() {
+									console.log('success');
+								}
+							});
+						} else {
+							// 播放完成，可以在这里添加额外的逻辑
+							console.log('播放完成');
+							this.ifPlay = false
+							//及时释放资源
+							innerAudioContext.stop();
+							innerAudioContext.destroy();
+						}
+					});
+				} else {
+					console.log('正在播放音频，拒绝播放请求');
+				}
+			},
 		}
 	}
 </script>
@@ -501,11 +514,12 @@
 		border-bottom: 2px solid #E8E8E8;
 		margin-top: 20px;
 	}
-  .inputs input{
-    width: 100%;
-  }
 
-  .wjworb {
+	.inputs input {
+		width: 100%;
+	}
+
+	.wjworb {
 		margin-top: 5px;
 		width: 100%;
 		display: flex;
@@ -639,4 +653,4 @@
 		border: 1px solid #0078FF;
 		color: white;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index c1ec441..0cf6d6c 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -1,98 +1,118 @@
 import config from '@/config'
 import storage from '@/utils/storage'
 import constant from '@/utils/constant'
-import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import {
+	login,
+	logout,
+	getInfo
+} from '@/api/login'
+import {
+	getToken,
+	setToken,
+	removeToken
+} from '@/utils/auth'
 
 const baseUrl = config.baseUrl
 
 const user = {
-  state: {
-    token: getToken(),
-    name: storage.get(constant.name),
-    avatar: storage.get(constant.avatar),
-    roles: storage.get(constant.roles),
-    permissions: storage.get(constant.permissions)
-  },
+	state: {
+		token: getToken(),
+		name: storage.get(constant.name),
+		avatar: storage.get(constant.avatar),
+		roles: storage.get(constant.roles),
+		permissions: storage.get(constant.permissions)
+	},
 
-  mutations: {
-    SET_TOKEN: (state, token) => {
-      state.token = token
-    },
-    SET_NAME: (state, name) => {
-      state.name = name
-      storage.set(constant.name, name)
-    },
-    SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
-      storage.set(constant.avatar, avatar)
-    },
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-      storage.set(constant.roles, roles)
-    },
-    SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-      storage.set(constant.permissions, permissions)
-    }
-  },
+	mutations: {
+		SET_TOKEN: (state, token) => {
+			state.token = token
+		},
+		SET_NAME: (state, name) => {
+			state.name = name
+			storage.set(constant.name, name)
+		},
+		SET_AVATAR: (state, avatar) => {
+			state.avatar = avatar
+			storage.set(constant.avatar, avatar)
+		},
+		SET_ROLES: (state, roles) => {
+			state.roles = roles
+			storage.set(constant.roles, roles)
+		},
+		SET_PERMISSIONS: (state, permissions) => {
+			state.permissions = permissions
+			storage.set(constant.permissions, permissions)
+		}
+	},
 
-  actions: {
-    // 登录
-    Login({ commit }, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-      return new Promise((resolve, reject) => {
-        login(username, password, code, uuid).then(res => {
-          setToken(res.token)
-          commit('SET_TOKEN', res.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+	actions: {
+		// 登录
+		Login({
+			commit
+		}, userInfo) {
+			const username = userInfo.username.trim()
+			const password = userInfo.password
+			const code = userInfo.code
+			const uuid = userInfo.uuid
+			return new Promise((resolve, reject) => {
+				login(username, password, code, uuid).then(res => {
+					setToken(res.token)
+					commit('SET_TOKEN', res.token)
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
 
-    // 获取用户信息
-    GetInfo({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-          const avatar = (user == null || user.avatar == "" || user.avatar == null) ? require("@/static/images/profile.jpg") : baseUrl + user.avatar
-          const username = (user == null || user.userName == "" || user.userName == null) ? "" : user.userName
-          if (res.roles && res.roles.length > 0) {
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', username)
-          commit('SET_AVATAR', avatar)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
+		// 获取用户信息
+		GetInfo({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				commit('SET_ROLES', [])
+				commit('SET_PERMISSIONS', [])
+				getInfo().then(res => {
+					const user = res.data.user
+					const avatar = (user == null || user.avatar == "" || user.avatar == null) ?
+						require("@/static/images/yh.png") : baseUrl + user.avatar
+					const username = (user == null || user.userName == "" || user.userName ==
+						null) ? "" : user.userName
+					if (res.data.roles && res.data.roles.length > 0) {
+						commit('SET_ROLES', res.data.roles)
+						commit('SET_PERMISSIONS', res.data.permissions)
+					} else {
+						commit('SET_ROLES', ['ROLE_DEFAULT'])
+					}
+					commit('SET_NAME', username)
+					commit('SET_AVATAR', avatar)
+					resolve(res)
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		},
 
-    // 退出系统
-    LogOut({ commit, state }) {
-      return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          storage.clean()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    }
-  }
+		// 退出系统
+		LogOut({
+			commit,
+			state
+		}) {
+			return new Promise((resolve, reject) => {
+				logout(state.token).then(() => {
+					commit('SET_TOKEN', '')
+					commit('SET_ROLES', [])
+					commit('SET_PERMISSIONS', [])
+					removeToken()
+					storage.clean()
+					resolve()
+				}).catch(error => {
+					reject(error)
+				})
+			})
+		}
+	}
 }
 
-export default user
+export default user
\ No newline at end of file
diff --git a/utils/permission.js b/utils/permission.js
index 08680e7..9679a10 100644
--- a/utils/permission.js
+++ b/utils/permission.js
@@ -34,6 +34,7 @@ export function checkPermi(value) {
 export function checkRole(value) {
 	if (value && value instanceof Array && value.length > 0) {
 		const roles = store.getters && store.getters.roles
+		console.log('拥有角色：', roles);
 		const permissionRoles = value
 		const super_admin = "admin"