From ed49622f1a2a042191140f735a92fc5e61486969 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Tue, 23 Sep 2025 11:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E8=B7=B3=E8=BD=AC=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=87=E4=BB=B6=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E5=85=B1=E7=94=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                       | 8 ++++----
 pages/6170/deviceControl/index.vue               | 2 +-
 pages/670/HBY670.vue                             | 2 +-
 pages/{6170 => common}/allShare/index.vue        | 0
 pages/{6170 => common}/share/index.vue           | 4 ++--
 pages/{6170 => common}/shareDevices/index.vue    | 2 +-
 pages/{6170 => common}/shareManagement/index.vue | 4 +++-
 7 files changed, 12 insertions(+), 10 deletions(-)
 rename pages/{6170 => common}/allShare/index.vue (100%)
 rename pages/{6170 => common}/share/index.vue (94%)
 rename pages/{6170 => common}/shareDevices/index.vue (99%)
 rename pages/{6170 => common}/shareManagement/index.vue (99%)

diff --git a/pages.json b/pages.json
index 87d418f..d55caec 100644
--- a/pages.json
+++ b/pages.json
@@ -178,26 +178,26 @@
 			}
 		},
 		{
-			"path": "pages/6170/allShare/index",
+			"path": "pages/common/allShare/index",
 			"style": {
 				"navigationBarTitleText": "所有分享"
 			}
 		},
 
 		{
-			"path": "pages/6170/share/index",
+			"path": "pages/common/share/index",
 			"style": {
 				"navigationBarTitleText": "分享"
 			}
 		},
 		{
-			"path": "pages/6170/shareDevices/index",
+			"path": "pages/common/shareDevices/index",
 			"style": {
 				"navigationBarTitleText": "分享设备"
 			}
 		},
 		{
-			"path": "pages/6170/shareManagement/index",
+			"path": "pages/common/shareManagement/index",
 			"style": {
 				"navigationBarTitleText": "分享管理"
 			}
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 6a5d9ea..31b2306 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -757,7 +757,7 @@
 			// 分享
 			shareUp() {
 				uni.navigateTo({
-					url: '/pages/6170/share/index',
+					url: '/pages/common/share/index',
 					events: {
 						ack: function(data) {}
 					},
diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue
index a478e20..bd95e23 100644
--- a/pages/670/HBY670.vue
+++ b/pages/670/HBY670.vue
@@ -500,7 +500,7 @@
 				} else if (s === 1) {
 					console.log("分享");
 					uni.navigateTo({
-						url: '/pages/6170/share/index',
+						url: '/pages/common/share/index',
 						events: {
 							ack: function(data) {}
 						},
diff --git a/pages/6170/allShare/index.vue b/pages/common/allShare/index.vue
similarity index 100%
rename from pages/6170/allShare/index.vue
rename to pages/common/allShare/index.vue
diff --git a/pages/6170/share/index.vue b/pages/common/share/index.vue
similarity index 94%
rename from pages/6170/share/index.vue
rename to pages/common/share/index.vue
index f3ff6ca..98fdbe8 100644
--- a/pages/6170/share/index.vue
+++ b/pages/common/share/index.vue
@@ -25,7 +25,7 @@
 			// 分享设备
 			shareDevice(){
 				uni.navigateTo({
-					url: '/pages/6170/shareDevices/index',
+					url: '/pages/common/shareDevices/index',
 					events: {
 						ack: function(data) {}
 					},
@@ -39,7 +39,7 @@
 			// 分享管理
 			shareManagement(){
 				uni.navigateTo({
-					url: '/pages/6170/shareManagement/index',
+					url: '/pages/common/shareManagement/index',
 					events: {
 						ack: function(data) {}
 					},
diff --git a/pages/6170/shareDevices/index.vue b/pages/common/shareDevices/index.vue
similarity index 99%
rename from pages/6170/shareDevices/index.vue
rename to pages/common/shareDevices/index.vue
index fcc8ac6..98c087c 100644
--- a/pages/6170/shareDevices/index.vue
+++ b/pages/common/shareDevices/index.vue
@@ -227,7 +227,7 @@
 			handleBtn() {
 				this.shareShow = false
 				uni.navigateTo({
-					url: '/pages/6170/allShare/index'
+					url: '/pages/common/allShare/index'
 				})
 			},
 		},
diff --git a/pages/6170/shareManagement/index.vue b/pages/common/shareManagement/index.vue
similarity index 99%
rename from pages/6170/shareManagement/index.vue
rename to pages/common/shareManagement/index.vue
index 36c96a5..e12d150 100644
--- a/pages/6170/shareManagement/index.vue
+++ b/pages/common/shareManagement/index.vue
@@ -171,8 +171,10 @@
 			},
 			// 跳转分享详情
 			handleFile(item) {
+				let url = item.detailPageUrl;
+				console.log(item,'item');
 				uni.navigateTo({
-					url: "/pages/6170/deviceControl/index",
+					url: url,
 					success: (res) => {
 						// 页面跳转成功后的回调函数
 						res.eventChannel.emit('detailData', {