Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

# Conflicts:
#	pages/670/HBY670.vue

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) {}
 					},

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) {}
 					},

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'
 				})
 			},
 		},

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', {