From ac112ab4b30f723a8d55f483687c622e0c4e0503 Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Wed, 26 Mar 2025 17:52:00 +0800
Subject: [PATCH] =?UTF-8?q?flx:=E5=8E=BB=E9=87=8Dapp=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       | 19 +++++++++++++++-
 pages/homePage/newhomePage.vue                |  2 +-
 pages/projectEnd/projectIndex/appSettings.vue | 22 +++++++++++++------
 .../projectIndex/applicationCenter.vue        | 20 +++++++++++++----
 .../projectIndex/oldprojectIndex.vue          |  2 +-
 .../projectEnd/projectIndex/projectIndex.vue  |  2 +-
 6 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/main.js b/main.js
index 47e74db..2df36d6 100644
--- a/main.js
+++ b/main.js
@@ -239,11 +239,28 @@ export function createApp() {
         }
         return fmt
     }
+	
+	function recursiveSearchFn(dataList, resultList = []) {
+	    dataList.forEach(item => {
+	        if (item.appShow == 1) {
+	            // return item;
+				item.operation = true;
+				resultList.push(item);
+	        }
+	        if (Array.isArray(item.menuList) && item.menuList.length > 0) {
+	            return recursiveSearchFn(item.menuList, resultList);
+	        }
+	    });
+		return resultList;
+	};
+	app.config.globalProperties.$recursiveSearchFn = recursiveSearchFn;
 
     function recursiveSearch(dataList, appPath) {
         return dataList.find(item => {
             // console.log(item.path, appPath, item.menuName)
-            if (item.path == appPath) {
+			const path = item.path ? item.path : item.modulePath;
+            if (path == appPath) {
+				
                 return item;
             }
             if (Array.isArray(item.menuList) && item.menuList.length > 0) {
diff --git a/pages/homePage/newhomePage.vue b/pages/homePage/newhomePage.vue
index fbd5dd5..e8c1918 100644
--- a/pages/homePage/newhomePage.vue
+++ b/pages/homePage/newhomePage.vue
@@ -316,7 +316,7 @@
 					success(result) {
 						if (result.success) {
 							that.haveModuleList = result.result.moduleList.filter(
-								(item) => item.moduleType == 2 && item.pcShow != 2
+								(item) => (item.moduleType == 2 || item.moduleType == 10) && item.pcShow != 2
 							);
 							uni.setStorageSync("haveModuleList", that.haveModuleList);
 							// alert("获取模块列表成功");
diff --git a/pages/projectEnd/projectIndex/appSettings.vue b/pages/projectEnd/projectIndex/appSettings.vue
index c0d9f34..fd44956 100644
--- a/pages/projectEnd/projectIndex/appSettings.vue
+++ b/pages/projectEnd/projectIndex/appSettings.vue
@@ -50,7 +50,7 @@
 				<!-- <view class="moudleTitle"> ·已有产品·</view> -->
 				<view class="moudleBox">
 					<view @click.stop="goMoudleFn(item)" v-for="(item, index) in list" :key="index">
-						<view class="moudleItem" v-if="item.operation && item.moduleType == 2 && item.appShow == 1">
+						<view class="moudleItem" v-if="item.operation && (item.moduleType == 2 || item.moduleType == 10) && item.appShow == 1">
 							<view class="inner" :class="{'inner_active': !commonModuleIdFlag(item)}">
 								<!-- <view class="imgBox" v-if="iconType == 1">
 								<image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>
@@ -189,16 +189,24 @@
 						});
 						console.log("all111", all);
 						console.log("all222", that.haveModuleList);
+						// const newList = that.$recursiveSearchFn(all);
 						that.list = all.filter(item => {
-							if(that.haveModuleList.length > 0) {
-								const res = that.$recursiveSearch(that.haveModuleList, item.path)
-								return res ? true :false
+							if (that.haveModuleList.length > 0) {
+								const path = item.path ? item.path : item.modulePath;
+								const res = that.$recursiveSearch(that.haveModuleList, path)
+								return res ? true : false
 							}
-							
 							// console.log(5555555, res);
 							// debugger
 							return res;
-						});
+						}).reduce((prev,item) => {
+							const findIndex = prev.findIndex(ele => ele.plugin == item.plugin);
+							if(findIndex == -1) {
+								prev.push(item);
+							}
+							return prev
+						}, []);
+						console.log(that.list);
 					}
 				})
 			},
@@ -644,7 +652,7 @@
 			commonModuleIdFlag() {
 				return (row) => {
 					const findIndex = this.commonModuleIdsList.findIndex(item => item.moduleId == row.moduleId);
-					// console.log(findIndex, row.moduleId, this.commonModuleIdsList)
+					console.log(findIndex, row.moduleId, this.commonModuleIdsList)
 					return findIndex > -1 ? false : true
 				}
 			}
diff --git a/pages/projectEnd/projectIndex/applicationCenter.vue b/pages/projectEnd/projectIndex/applicationCenter.vue
index 9a1dcb7..0178537 100644
--- a/pages/projectEnd/projectIndex/applicationCenter.vue
+++ b/pages/projectEnd/projectIndex/applicationCenter.vue
@@ -14,7 +14,8 @@
 				<!-- <view class="moudleTitle"> ·已有产品·</view> -->
 				<view class="moudleBox">
 					<view @click="goMoudleFn(item)" v-for="(item, index) in list" :key="index">
-						<view class="moudleItem" v-if="item.operation && item.moduleType == 2 && item.appShow == 1">
+						<view class="moudleItem"
+							v-if="item.operation && (item.moduleType == 2 || item.moduleType == 10) && item.appShow == 1">
 							<view class="inner" v-if="COMPANY=='sanjiang'">
 								<!-- <view class="imgBox" v-if="iconType == 1">
                 <image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>
@@ -546,6 +547,7 @@
 					}
 				})
 			},
+
 			getAllModule(arr) {
 				console.log('获取的模块', arr)
 
@@ -574,9 +576,13 @@
 							});
 							console.log("all111", all);
 							console.log(all, that.haveModuleList)
+
+							// const newList = that.$recursiveSearchFn(all);
+							// console.log(111, newList)
 							that.list = all.filter(item => {
 								if (that.haveModuleList.length > 0) {
-									const res = that.$recursiveSearch(that.haveModuleList, item.path)
+									const path = item.path ? item.path : item.modulePath;
+									const res = that.$recursiveSearch(that.haveModuleList, path)
 									return res ? true : false
 								}
 
@@ -584,8 +590,14 @@
 								// console.log(5555555, res);
 								// debugger
 								return res;
-							});
-							console.log(that.list)
+							}).reduce((prev, item) => {
+								const findIndex = prev.findIndex(ele => ele.plugin == item.plugin);
+								if (findIndex == -1) {
+									prev.push(item);
+								}
+								return prev
+							}, []);
+							console.log("我是", that.list)
 						}
 					}
 				})
diff --git a/pages/projectEnd/projectIndex/oldprojectIndex.vue b/pages/projectEnd/projectIndex/oldprojectIndex.vue
index 7242046..5a0eb1c 100644
--- a/pages/projectEnd/projectIndex/oldprojectIndex.vue
+++ b/pages/projectEnd/projectIndex/oldprojectIndex.vue
@@ -74,7 +74,7 @@
 				<view class="moudleTitle"> ·已有产品·</view>
 				<view class="moudleBox">
 					<view class="moudleItem" @click="goMoudleFn(item)" v-for="(item, index) in list" :key="index"
-						v-if="item.operation && item.moduleType == 2 && item.appShow == 1">
+						v-if="item.operation && (item.moduleType == 2 || item.moduleType == 10) && item.appShow == 1">
 						<view class="inner" v-if="COMPANY=='sanjiang'">
 							<!-- <view class="imgBox" v-if="iconType == 1">
                 <image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>
diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue
index 2c0cea9..7c99bd3 100644
--- a/pages/projectEnd/projectIndex/projectIndex.vue
+++ b/pages/projectEnd/projectIndex/projectIndex.vue
@@ -69,7 +69,7 @@
 				<view class="moudleBox">
 					<view v-for="(item, index) in list" :key="index"
 						>
-						<view  class="moudleItem" @click="goMoudleFn(item)" v-if="item.operation && item.moduleType == 2 && item.appShow == 1">
+						<view  class="moudleItem" @click="goMoudleFn(item)" v-if="item.operation && (item.moduleType == 2 ||item.moduleType == 10) && item.appShow == 1">
 							<view class="inner" v-if="COMPANY=='sanjiang'">
 							<!-- <view class="imgBox" v-if="iconType == 1">
 					  <image class="img" :src="'/static/moudleImg/' + item.moduleIcon + '.png'"></image>