From 0e7b40d43d7cabdd8a06cffba8ab2279c58502b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 27 Oct 2023 16:52:46 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

---
 utils/func.js |   82 +++++++---------------------------------
 1 files changed, 15 insertions(+), 67 deletions(-)

diff --git a/utils/func.js b/utils/func.js
index efef0f5..b9ef044 100644
--- a/utils/func.js
+++ b/utils/func.js
@@ -5,88 +5,36 @@
 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) => {
+
 		vm.$u.vuex('userInfo', userInfo)
 		vm.$u.vuex('accessToken', userInfo.access_token)
-		vm.$u.vuex('refreshToken', userInfo.refresh_token)
 		vm.$u.vuex('isLogin', true)
-		vm.$u.vuex('adCodeBase', userInfo.detail.adCodeBase)
-		let role = userInfo.role_id.split(",")
-		dynamicMenu(userInfo.role_id, 'app').then(res => {
-			if (res.code == 200) {
-				let adCodeBase = userInfo.detail.adCodeBase
-				if (res.data.length > 2) {
-					//当菜单有 首页 工作 我的 时,对用户进行判断
-					if (!adCodeBase) {
-						//没有行政区划时 去掉首页
-						res.data.shift()
-					}
-				}
 
-				store.commit("setTabBarList", res.data)
-				store.commit('setActiveRoleId', role[0])
-				// uni.switchTab({
-				// 	url: res.data[0].path
-				// })
-				let url = res.data[0].path
-				let name = ""
-				if (url.indexOf("patrol")) {
-					name = "责任人首页"
-				} else {
-					name = "首页"
-				}
+		let activeRoleId = userInfo.role_id.split(",")[0]
+		console.log("当前激活角色的id:", activeRoleId)
 
-				let params = {
-					recipient: userInfo.user_id,
-					status: 0
-				}
+		//添加当前激活的roleId(默认取第一个)
+		vm.$u.vuex('activeRoleId', activeRoleId)
 
-				// #ifdef APP-PLUS
+		//获取角色菜单
+		dynamicMenu(activeRoleId).then(res => {
+			let data = res.data
+			let appMenu = data.filter(e => e.name == 'app')[0]
+			console.log("当前角色菜单:", appMenu)
+			vm.$u.vuex('menu', appMenu)
 
-				//2.0
-				// 获取App端cid并存入redis
-				let pinf = plus.push.getClientInfo();
-				console.log(pinf, pinf.clientid, "---------------")
-				if (pinf && pinf.clientid) {
-					uni.setStorageSync('cid', pinf.clientid);
-					saveCId(userInfo.user_id, pinf.clientid)
-				} else {
-					var obtainingCIDTimer = setInterval(function() {
-						pinf = plus.push.getClientInfo();
-						if (pinf.clientid) {
-							uni.setStorageSync('cid', pinf.clientid);
-							saveCId(userInfo.user_id, pinf.clientid)
-							clearInterval(obtainingCIDTimer);
-						}
-					}, 50);
-				}
-				setTimeout(() => {
-					console.log('cid', uni.getStorageSync('cid'));
-				}, 500);
+			//跳转到首页
+			uni.switchTab({
+				url: '/pages/home/index'
+			})
 
-
-				// #endif
-
-				messageCount(params).then(res => {
-					updateTabbar(res.data)
-					globalNavigator(url, "switchTab", name)
-				})
-			}
 		})
-
-
-
 	}
 
 	// 退出登录

--
Gitblit v1.9.3