merge upstream

pages/100J/HBY100-J.vue

@@ -435,7 +435,8 @@
 					longitude: null,
 					alarmStatus: null,
 					detailPageUrl: "/pages/650/HBY650",
-					showConfirm: false
+					showConfirm: false,
+					deviceId:''
 				},
 				permissions: [],
 				audioData: {
@@ -963,13 +964,13 @@
 
 			proParam: function() {
 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.device.id,
+					url: '/pages/common/productDes/index?id=' + this.deviceInfo.deviceId,
 					success(ev) {}
 				});
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.deviceInfo.deviceId,
 					success(ev) {
 
 					}
@@ -977,7 +978,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					url: '/pages/common/operationVideo/index?id=' + this.deviceInfo.deviceId,
 					success(ev) {
 
 					}