From 9c4d1e58eede5211bcce32d79cba2c463a7bc427 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 28 Dec 2023 20:52:36 +0800
Subject: [PATCH] 优化

---
 store/index.js |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/store/index.js b/store/index.js
index 304acab..afb51d3 100644
--- a/store/index.js
+++ b/store/index.js
@@ -2,8 +2,8 @@
 import Vuex from 'vuex'
 Vue.use(Vuex)
 import {
-		dynamicMenu,
-	} from "@/api/system/role.js"
+	dynamicMenu,
+} from "@/api/system/role.js"
 let lifeData = {};
 
 try {
@@ -55,8 +55,8 @@
 		// tabbarIndex: uni.getStorageSync("tabbarIndex") || 0,
 		hasUpdate: false, //true为不可登录,需要更新,false则是最新版
 		menu: [],
-		siteInfo:{}    ,//社区信息
-		labelMenuList:[]      //标签报事菜单
+		siteInfo: {}, //社区信息
+		labelMenuList: [] //标签报事菜单
 	},
 
 	mutations: {
@@ -120,35 +120,41 @@
 			uni.setStorageSync('userInfo', data)
 		},
 		//设置社区位置
-		setSiteInfo(state,val){
+		setSiteInfo(state, val) {
 			state.siteInfo = val;
 			uni.setStorageSync('siteInfo', val)
 		},
 		//标签报事菜单
-		setLabelReporMenutList(state,val){
+		setLabelReporMenutList(state, val) {
 			state.labelMenuList = val;
-			uni.setStorageSync('labelMenuList',val);
+			uni.setStorageSync('labelMenuList', val);
 		}
-		
+
 	},
-	actions:{
-		getMenuList({commit}){
+	actions: {
+		getMenuList({
+			commit
+		}) {
 			// let id = uni.getStorageSync("activeRole").id;
-			let { id, roleName } = uni.getStorageSync("activeRole")
-			return new Promise((resolve,reject)=>{
-				 let param = {
-					 roleId:id
-				 }
-				if(uni.getStorageSync("siteInfo").addressType == 1 && roleName == "居民"){
-					param.labelType = 1;
+			let {
+				id,
+				roleName
+			} = uni.getStorageSync("activeRole")
+			return new Promise((resolve, reject) => {
+				let param = {
+					roleId: id
 				}
-				console.log("===>",param);
-				dynamicMenu(param).then(res=>{
-					if(res.code == 200){
+				if (uni.getStorageSync("siteInfo").addressType == 1 || roleName == "居民") {
+					param.labelType = uni.getStorageSync("siteInfo").addressType;
+					param.roleName = roleName;
+				}
+				console.log("===>", param);
+				dynamicMenu(param).then(res => {
+					if (res.code == 200) {
 						let data = res.data;
-						if(!data) return
+						if (!data) return
 						let menu = data.filter(e => e.name == 'app')[0].children;
-						commit("SET_MENU",menu);
+						commit("SET_MENU", menu);
 						// let liveList = menu.filter(item=>item.name == '生活')
 						// let labelList = [];
 						// if(liveList.length && liveList[0].children){
@@ -160,7 +166,7 @@
 						// 	}
 						// }
 						resolve(menu)
-					}else {
+					} else {
 						reject("fail")
 					}
 				})

--
Gitblit v1.9.3