merge upstream

pages/100J/HBY100-J.vue

@@ -22,7 +22,7 @@
 					<view class="row">
 						<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
 						<view class="txt">
-							<view class="bigTxt">{{ deviceInfo.batteryRemainingTime || '0' }}分钟
+							<view class="bigTxt"> {{ Math.floor((Number(deviceInfo.batteryRemainingTime)||0)/60) }}小时 {{ (Number(deviceInfo.batteryRemainingTime)||0)%60 }}分钟
 							</view>
 							<view class="smallTxt">续航时间</view>
 						</view>
@@ -464,19 +464,19 @@
 
 				}
 				this.mqttClient = new MqttClient();
-				this.mqttClient.connect(() => {
-					// 订阅来自设备的状态更新
-					const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
-					this.mqttClient.subscribe(statusTopic, (payload) => {
-						try {
-							// 解析MQTT返回的payload
-							const payloadObj = typeof payload === 'string' ? JSON.parse(
-								payload) : payload;
-						} catch (e) {
+				// this.mqttClient.connect(() => {
+				// 	// 订阅来自设备的状态更新
+				// 	const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
+				// 	this.mqttClient.subscribe(statusTopic, (payload) => {
+				// 		try {
+				// 			// 解析MQTT返回的payload
+				// 			const payloadObj = typeof payload === 'string' ? JSON.parse(
+				// 				payload) : payload;
+				// 		} catch (e) {
 							
-						}
-					})
-				})
+				// 		}
+				// 	})
+				// })
 				console.log(data, 'datatatatat');
 				these.fetchDeviceDetail(data.data.id)
 			});

utils/request.js

@@ -22,7 +22,7 @@ const request = (options) => {
 				.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(options.data[key])}`)
 				.join('&');
 			url += `?${params}`;
-		}
+		}  
 
 		const config = {
 			url: url,