From b77cc2d2012ecb4b876538ac7aee3edac7db8a2f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 19:05:07 +0800
Subject: [PATCH] 通知公告

---
 utils/func.js |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/utils/func.js b/utils/func.js
index ed8ea3c..3362a2b 100644
--- a/utils/func.js
+++ b/utils/func.js
@@ -1,30 +1,41 @@
 import store from "@/store/index.js"
 import {
-	dynamicMenu
+	dynamicMenu,
+	getDetail
 } from "@/api/system/role.js"
 import {
 	logAdd
 } from "@/api/system/logManage"
-import {
-	messageCount
-} from "@/api/system/message"
-import {
-	saveCId
-} from "@/api/system/user.js"
 
 // 全局公共方法
 const install = (Vue, vm) => {
 
 	// 登录操作 1
-	const login = (userInfo) => {
+	const login = async (userInfo) => {
 
 		vm.$u.vuex('userInfo', userInfo)
 		vm.$u.vuex('accessToken', userInfo.access_token)
 		vm.$u.vuex('isLogin', true)
 
-		//添加当前激活的roleId(默认取第一个)
-		vm.$u.vuex('activeRoleId', userInfo.role_id.split(",")[0])
+		let activeRoleId = userInfo.role_id.split(",")[0]
 
+		const resDetail = await getDetail({
+			id: activeRoleId
+		})
+		console.log("当前激活角色的id:", resDetail.data)
+		//添加当前激活的角色(默认取第一个)
+		store.commit('setActiveRole', resDetail.data)
+
+		//获取角色菜单
+		const {
+			data
+		} = await dynamicMenu(activeRoleId)
+
+		let appMenu = data.filter(e => e.name == 'app')[0].children
+		console.log("当前角色菜单:", appMenu)
+		store.commit('SET_MENU', appMenu)
+
+		//跳转到首页
 		uni.switchTab({
 			url: '/pages/home/index'
 		})

--
Gitblit v1.9.3