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

pages/210/HBY210.vue

@@ -8,7 +8,7 @@
 			<custom-navbar :title="navTitle" :showBack="true" color="#FFFFFF" :rightIcons="[
 				    {src: '/static/images/210/ls.png'},
 				    ...(isRightIconVisible ? [{src: '/static/images/common/shape.png'}] : [])
-				  ]" @right-click="shareUp" @icon-click="handleIconClick"></custom-navbar>
+				  ]" @icon-click="handleIconClick"></custom-navbar>
 
 			<view class="device-detail-container" :style="{ paddingTop: navBarHeight + 'px' }">
 				<!-- 设备电量信息 -->
@@ -596,40 +596,37 @@
 				this.lightModeA = false;
 				// 	console.log("保存的时间：", time);
 			},
-			handleIconClick(index) {
-				// 历史记录
-				if (index === 0) {
+			handleIconClick(s,e) {
+				if (s === 0) {
+					console.log("消息");
 					uni.navigateTo({
-						url: '/pages/210/historyRecords/index',
-						events: {
-							ack: function(data) {}
-						},
+						url: '/pages/670/History',
 						success: (res) => {
-							res.eventChannel.emit('share', {
-								data: this.itemInfo,
+							res.eventChannel.emit('detailData', {
+								data: these.device,
 							});
 						}
 					})
-				} else {
+					return;
+				} else if (s === 1) {
+					console.log("分享");
 					uni.navigateTo({
-						url: '/pages/6170/share/index',
+						url: '/pages/common/share/index',
 						events: {
 							ack: function(data) {}
 						},
 						success: (res) => {
+							let json = {
+								persissonType: '210'
+							};
+							Object.assign(json, this.device);
 							res.eventChannel.emit('share', {
-								data: this.itemInfo,
+								data: json
 							});
 						}
 					})
 				}
 			},
-
-			// 分享
-			shareUp() {
-
-			},
-
 			// 操作说明
 			operatingInst() {
 				uni.navigateTo({
@@ -1286,6 +1283,7 @@
 		align-items: center;
 		margin-bottom: 20rpx;
 	}
+
 	.uploadIMG {
 		width: 68rpx;
 		height: 68rpx;