代码合并冲突解决

store/menus.js

@@ -43,27 +43,32 @@ export const useMenusStore = defineStore('menus', {
 		return {
 			originMenus: [],
 			menuList: [],
-			allPages: allPages,//小程序全部页面
-			adminPages:[]//后台返回的全部页面
+			allPages: allPages, //小程序全部页面
+			adminPages: [] //后台返回的全部页面
 		};
 	},
 	actions: {
 		async getMenus() {
 			const data = await menusApi.getMenus()
 			this.originMenus = data;
-			const arr = flattenNestedChildren(data).filter(v =>{
-				return  v.miniPath
+			const arr = flattenNestedChildren(data).filter(v => {
+				return v.miniPath
 			})
-			this.adminPages=arr;
+			this.adminPages = arr;
 			this.menuList = this.allPages.filter(v => {
 				const findItem = arr.find(item => item.miniPath == v.pageId || item.miniPath
 					.replace(/^\/+|\/+$/g, '') == v.allPath)
+
+				if (v.title == '经营工具') {
+					console.log('经营工具===', findItem);
+				}
 				return findItem
 			})
-			return 	this.originMenus 
 
+
+
+			return this.originMenus
 		}
 	},
 	unistorage: true, // 开启后对 state 的数据读写都将持久化
-}
-);
+});