From 85a15646ffe20ed2bbb2042ec500df8c850a69cc Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 25 七月 2025 15:29:41 +0800
Subject: [PATCH] 首次提交

---
 pages/tabBar/general.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/tabBar/general.vue b/pages/tabBar/general.vue
index 5dd04a6..ffbf736 100644
--- a/pages/tabBar/general.vue
+++ b/pages/tabBar/general.vue
@@ -367,6 +367,9 @@
 					// #endif
 					// #ifdef APP-PLUS
 					url: 'wx://' + this.$api.mqttBaseUrl + ':8083/mqtt',
+					// #endif
+					// #ifdef MP-WEIXIN
+					url: 'wss://' + this.$api.mqttBaseUrl + '/mqtt', // 蹇呴』鐢� wss锛岀鍙i�氬父涓�443鍙渷鐣�
 					// #endif
 					clientId: this.deviceId,
 					username: account.username,
@@ -397,7 +400,9 @@
 					qos: 0
 				}).then(res => {
 					console.error(res)
-				})
+				})
+				
+
 				//璁㈤槄鍙戦�佹寚浠よ繑鍥炵粨鏋�
 				// this.$mqttTool.subscribe({
 				// 	topic: this.$constant.SERVICE_RES_EQU_CMD,
@@ -456,7 +461,7 @@
 			},
 			goCharts(e) {
 				uni.navigateTo({
-					url: "/pages/charts/charts"
+					url: "/packageA/pages/charts/charts"
 				})
 			},
 			getOrderList(date1, date2) {
@@ -573,7 +578,6 @@
 <style lang="scss" scoped>
 	.app {
 		width: 100%;
-		max-height: 100vh;
 		overflow: hidden;
 	}
 

--
Gitblit v1.9.3