提交优化代码

src/components/js_sdk/index.js

@@ -7,8 +7,8 @@ http.setConfig(config => {
         // if (!selectedService || selectedService == 'aloneServe') {
         // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         // }
-        // config.baseUrl = "https://radar-power.cn/portal-service-server/";
-        config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
+        config.baseUrl = "https://radar-power.cn/portal-service-server/";
+        // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
     }
     if (__wxConfig.envVersion == 'trial') {
         // let selectedService = uni.getStorageSync("sercviceChoice")
@@ -16,6 +16,7 @@ http.setConfig(config => {
         //     config.baseUrl = "https://radar-power.cn/portal-service-server/";
         // }
         config.baseUrl = "https://radar-power.cn/portal-service-server/";
+        // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
     }
     if (__wxConfig.envVersion == 'release') {
         // let selectedService = uni.getStorageSync("sercviceChoice")

src/pagesA/deviceDetail/deviceDetail.vue

@@ -114,12 +114,12 @@
                     (breathRate !== 0 && breathRate !== '')
                 "
             >
-                <!-- <view
+                <view
                     class="title-text"
                     style="color: #111111; font-size: 30rpx"
                     >当前呼吸率</view
-                > -->
-                <!-- <view
+                >
+                <view
                     style="
                         display: flex;
                         justify-content: center;
@@ -144,7 +144,7 @@
                         src="../../static/rightArrow.png"
                         style="margin-left: auto; width: 30rpx; height: 30rpx"
                     ></image>
-                </view> -->
+                </view>
             </view>
 
             <view class="title">
@@ -336,7 +336,7 @@
     </view>
 </template>
 <script>
-// import * as echarts from "../../uni_modules/lime-echart/static/echarts.min";
+import * as echarts from "../../uni_modules/lime-echart/static/echarts.min";
 import MqttService from "../../utils/globalMqtt.js";
 
 export default {

src/pagesA/moreSetting/moreSetting.vue

@@ -116,7 +116,7 @@ export default {
     watch: {
         fallSettingEnabled: {
             handler(newVal, oldVal) {
-                console.log("fallSettingEnabled", newVal, oldVal);
+                // console.log("fallSettingEnabled", newVal, oldVal);
                 if (newVal == 1) {
                     // this.showFallSettingModle = true;
                 } else {

src/utils/globalMqtt.js

@@ -47,7 +47,19 @@ class MqttService {
         }
         uni.showToast({ title: "平台连接中...", icon: "loading", duration: 1000 });
         const brokerName = 'DATA';
-        const url = __wxConfig.envVersion == 'develop' ? 'wxs://data.radar-power.asia:8084/mqtt/' : 'wxs://data.radar-power.cn/mqtt/';
+        let url = ""
+        url = "wxs://data.radar-power.cn/mqtt/";
+        // if (__wxConfig.envVersion == 'develop') {
+        //     url = "wxs://data.radar-power.asia:8084/mqtt/";
+        // }
+        // if (__wxConfig.envVersion == 'trial') {
+        //     url = "wxs://data.radar-power.asia:8084/mqtt/";
+        // }
+
+        // if (__wxConfig.envVersion == 'release') {
+        //     url = "wxs://data.radar-power.cn/mqtt/";
+        // }
+
         const clientId = `xcx_mqtt_data1_${userId}_${Date.now()}`;
         return this.connectToBroker(brokerName, { url, clientId, username: 'lnradar', password: 'lnradar' })
             .then(client => {