1.拆分更多设置 2.新增坐摔检测

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")

src/pages.json

@@ -206,6 +206,15 @@
                         "navigationBarBackgroundColor": "#faede2",
                         "navigationBarTextStyle": "black"
                     }
+                },
+                {
+                    "path": "moreSetting/moreSetting",
+                    "style": {
+                        "enablePullDownRefresh": false,
+                        "navigationBarTitleText": "更多设置",
+                        "navigationBarBackgroundColor": "#faede2",
+                        "navigationBarTextStyle": "black"
+                    }
                 }
             ]
         }

src/pages/home/home.vue

@@ -98,7 +98,7 @@
             </movable-view>
         </movable-area> -->
 
-        <view class="bot_version"> v3.0.22</view>
+        <view class="bot_version"> v3.0.23</view>
         <view
             class="shareInfo"
             @click="goDeviceShare('sure')"

src/pagesA/adDevice/adDevice.vue

@@ -1,22 +1,6 @@
 <template>
     <view>
         <view class="home-warp" v-if="nextTip == 'one'">
-            <view class="header">
-                <view class="item">
-                    <image src="../../static/activePod.png" alt=""> </image>
-                    <text>1</text>
-                </view>
-                <view class="line"></view>
-                <view class="item"
-                    ><image src="../../static/inactivePod.png" alt=""></image>
-                    <text>2</text>
-                </view>
-                <view class="line"></view>
-                <view class="item"
-                    ><image src="../../static/inactivePod.png" alt=""></image>
-                    <text>3</text>
-                </view>
-            </view>
             <view class="bodyContent">
                 <view
                     class="deviceInfo"
@@ -105,28 +89,6 @@
         </view>
         <view class="home-warpTwo" v-if="nextTip == 'two'">
             <view class="header_two">
-                <view class="header">
-                    <view class="item">
-                        <image src="../../static/activePod.png" alt=""> </image>
-                        <text>1</text>
-                    </view>
-                    <view class="line"></view>
-                    <view class="item"
-                        ><image src="../../static/activePod.png" alt=""></image>
-                        <text>2</text>
-                    </view>
-                    <view class="line"></view>
-                    <view class="item"
-                        ><image
-                            src="../../static/inactivePod.png"
-                            alt=""
-                        ></image>
-                        <text>3</text>
-                    </view>
-                </view>
-                <!-- <view class="airCantInfo" v-if="environmentJudge">
-                    <text>暂未配置环境数据...</text>
-                </view> -->
                 <view class="airbody">
                     <view class="airTitle">参数配置</view>
                     <view class="wifItem" style="margin-top: 30rpx">
@@ -200,13 +162,18 @@
                                     angleArray[northAngleIndex]
                                 }}</view>
                             </picker>
+                            <!-- <image
+                                src="../../static/rightArrow.png"
+                                alt=""
+                                @click="showPicker"
+                            ></image> -->
                         </view>
                     </view>
-                    <view class="wifItem" style="margin-top: 30rpx">
+                    <!-- <view class="wifItem" style="margin-top: 30rpx">
                         <text>坐摔检测</text>
                         <view class="inputBox">
                             <switch
-                                :checked="enabled == 1"
+                                :checked="fallSettingEnabled == 1"
                                 @change="onChange"
                                 :active-value="1"
                                 :inactive-value="0"
@@ -217,7 +184,7 @@
                             />
                         </view>
                     </view>
-                    <template v-if="enabled == 1">
+                    <template v-if="fallSettingEnabled == 1">
                         <view class="wifItem" style="margin-top: 30rpx">
                             <text>坐摔最低高度(m)</text>
                             <view class="inputBox">
@@ -258,7 +225,7 @@
                                 />
                             </view>
                         </view>
-                    </template>
+                    </template> -->
 
                     <!-- <view class="wifItem" style="margin-top: 30rpx">
                         <text>安装方式</text>
@@ -293,7 +260,7 @@
                 </view>
                 <view class="bottomTwo">
                     <view class="previousTip" @click="goPrevious">上一步</view>
-                    <view class="nextTip" @click="bindDevice">下一步</view>
+                    <view class="nextTip" @click="bindDevice">完成</view>
                 </view>
             </view>
         </view>
@@ -333,15 +300,17 @@ export default {
             yyEnd: "",
             zzStart: "",
             zzEnd: "",
-            // statusLight: 1,
-            showDeviceInfo: false,
-            devInfo: "",
             // 坐摔参数
-            enabled: 0,
+            fallSettingEnabled: 0,
             lowZMax: 0.5,
             humanPredThreshold: 0.78,
             minEventsForDetection: 3,
             minHumanEventsForDetection: 2,
+            lowHighSnrRatio: false,
+            lowMidSnrRatio: false,
+            // statusLight: 1,
+            showDeviceInfo: false,
+            devInfo: "",
         };
     },
     watch: {
@@ -392,9 +361,6 @@ export default {
                 this.mountPlain = "Ceiling";
             }
         },
-        onChange({ detail }) {
-            this.enabled = detail.value == true ? 1 : 0;
-        },
         goNextTip() {
             if (!this.devName.length > 10) {
                 uni.showModal({
@@ -487,9 +453,15 @@ export default {
                 yyEnd: parseInt(this.yyEnd),
                 zzStart: parseInt(this.zzStart),
                 zzEnd: parseInt(this.zzEnd),
+                // fallSettingEnabled: this.fallSettingEnabled,
+                // lowZMax: this.lowZMax,
+                // humanPredThreshold: this.humanPredThreshold,
+                // minEventsForDetection: this.minEventsForDetection,
+                // minHumanEventsForDetection: this.minHumanEventsForDetection,
+                // lowHighSnrRatio: false,
+                // lowMidSnrRatio: false,
                 // statusLight: this.statusLight,
             };
-
             if (this.editFlag) {
                 this.$http
                     .post("wap/device/updateDevice", deviceBandingParams, {
@@ -500,18 +472,17 @@ export default {
                     .then((res) => {
                         if (res.data.code == 200) {
                             uni.showToast({
-                                title: "绑定成功",
+                                title: "设置成功",
                                 icon: "success",
                                 duration: 1500,
                             });
                             uni.setStorageSync("devId", res.data.data.devId);
-                            uni.reLaunch({
-                                url:
-                                    "/pagesA/roomSetting/roomSetting?devId=" +
-                                    res.data.data.devId +
-                                    "&clientId=" +
-                                    res.data.data.clientId,
-                            });
+
+                            setTimeout(() => {
+                                uni.navigateBack({
+                                    delta: 1,
+                                });
+                            }, 1500);
                         } else {
                             uni.showToast({
                                 title: res.data.message,
@@ -521,38 +492,6 @@ export default {
                         }
                     });
             }
-
-            //  else {
-            //     this.$http
-            //         .post("wap/device/deviceBinding", deviceBandingParams, {
-            //             header: {
-            //                 "Content-Type": "application/json;charset=UTF-8",
-            //             },
-            //         })
-            //         .then((res) => {
-            //             if (res.data.code == 200) {
-            //                 uni.showToast({
-            //                     title: "绑定成功",
-            //                     icon: "success",
-            //                     duration: 1500,
-            //                 });
-            //                 uni.setStorageSync("devId", res.data.data.devId);
-            //                 uni.reLaunch({
-            //                     url:
-            //                         "/pagesA/roomSetting/roomSetting?devId=" +
-            //                         res.data.data.devId +
-            //                         "&clientId=" +
-            //                         res.data.data.clientId,
-            //                 });
-            //             } else {
-            //                 uni.showToast({
-            //                     title: res.data.message,
-            //                     icon: "none",
-            //                     duration: 1500,
-            //                 });
-            //             }
-            //         });
-            // }
         },
         refreshWifi() {
             const that = this;
@@ -673,6 +612,15 @@ export default {
             this.yyEnd = devInfo.yyEnd;
             this.zzStart = devInfo.zzStart;
             this.zzEnd = devInfo.zzEnd;
+
+            // this.fallSettingEnabled = devInfo.fallSettingEnabled;
+            // this.lowZMax = devInfo.lowZMax;
+            // this.humanPredThreshold = devInfo.humanPredThreshold;
+            // this.minEventsForDetection = devInfo.minEventsForDetection;
+            // this.minHumanEventsForDetection =
+            //     devInfo.minHumanEventsForDetection;
+            // this.lowHighSnrRatio = devInfo.lowHighSnrRatio;
+            // this.lowMidSnrRatio = devInfo.lowMidSnrRatio;
             // this.statusLight = devInfo.statusLight;
         },
     },
@@ -697,49 +645,17 @@ export default {
 .home-warp {
     position: relative;
     height: 100vh;
+    padding-top: 30rpx;
     background: linear-gradient(180deg, #faede2 0%, #f4f4f4 100%);
-    .header {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0rpx 120rpx;
-        padding-top: 30rpx;
-        .item {
-            position: relative;
-            text-align: center;
-            width: 90rpx;
-            height: 90rpx;
-            image {
-                width: 85rpx;
-                height: 90rpx;
-            }
-            text {
-                position: absolute;
-                top: 50%;
-                left: 50%;
-                transform: translate(-50%, -50%);
-                font-weight: 700;
-                color: #ffffff;
-                font-size: 38rpx;
-                text-align: center;
-            }
-        }
-        .line {
-            width: 56rpx;
-            height: 4rpx;
-            background-color: #e4c5b9;
-        }
-    }
 
     .bodyContent {
         width: 700rpx;
         height: 600rpx;
         position: relative;
-        margin: 20rpx auto 0 auto;
+        margin: 0 auto;
         background: #ffffff;
         border-radius: 38rpx;
         box-sizing: border-box;
-        padding: 0 30rpx;
         .deviceInfo {
             display: flex;
             flex-direction: column;
@@ -903,61 +819,15 @@ export default {
     height: 100vh;
     background: #f4f4f4;
     .header_two {
+        padding-top: 30rpx;
         width: 750rpx;
         height: 560rpx;
         border-bottom-left-radius: 35rpx;
         border-bottom-right-radius: 35rpx;
         background: linear-gradient(180deg, #faede2 0%, #ffffff 100%);
-        .header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding: 0rpx 120rpx;
-            padding-top: 30rpx;
-            .item {
-                position: relative;
-                text-align: center;
-                width: 90rpx;
-                height: 90rpx;
-                image {
-                    width: 85rpx;
-                    height: 90rpx;
-                }
-                text {
-                    position: absolute;
-                    top: 50%;
-                    left: 50%;
-                    transform: translate(-50%, -50%);
-                    font-weight: 700;
-                    color: #ffffff;
-                    font-size: 38rpx;
-                    text-align: center;
-                }
-            }
-            .line {
-                width: 56rpx;
-                height: 4rpx;
-                background-color: #e4c5b9;
-            }
-        }
-        // .airCantInfo {
-        //     margin: 40rpx auto 0 auto;
-        //     opacity: 20%;
-        //     width: 300rpx;
-        //     height: 300rpx;
-        //     border: 18rpx solid;
-        //     border-color: #333333;
-        //     display: flex;
-        //     align-items: center;
-        //     justify-content: center;
-        //     text {
-        //         color: #999999;
-        //         font-size: 38rpx;
-        //         text-align: center;
-        //     }
-        // }
+
         .airbody {
-            margin: 110rpx auto 0 auto;
+            margin: 0 auto;
             width: 700rpx;
             max-height: 1000rpx;
             background: #ffffff;

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/deviceSetting/deviceSetting.vue

@@ -192,9 +192,14 @@ export default {
             });
         },
         goMoreSetting() {
+            // uni.navigateTo({
+            //     url:
+            //         "/pagesA/adDevice/adDevice?devInfo=" +
+            //         JSON.stringify(this.devInfo),
+            // });
             uni.navigateTo({
                 url:
-                    "/pagesA/adDevice/adDevice?devInfo=" +
+                    "/pagesA/moreSetting/moreSetting?devInfo=" +
                     JSON.stringify(this.devInfo),
             });
         },
@@ -278,11 +283,12 @@ export default {
         },
         queryOtaList() {
             this.$http.get("wap/device/OTA/query", {}).then((res) => {
-                this.otaList = this.filterFilesByVersion(
-                    res.data.data,
-                    this.devInfo.hardware
-                );
-                this.otaListName = this.otaList.map((ele) => ele.fileName);
+                this.otaListName = res.data.data;
+                // this.otaList = this.filterFilesByVersion(
+                //     res.data.data,
+                //     this.devInfo.hardware
+                // );
+                // this.otaListName = this.otaList.map((ele) => ele.fileName);
             });
         },
         bindPickerChangeTwo(e) {

src/pagesA/discrepancy/discrepancy.vue

@@ -103,14 +103,14 @@ export default {
 }
 
 .time-text {
-    font-size: 24rpx;
+    font-size: 30rpx;
     color: #99715f;
     font-weight: bold;
     margin-bottom: 6rpx;
 }
 
 .event-text {
-    font-size: 22rpx;
+    font-size: 24rpx;
     color: #999;
 }
 

src/pagesA/linkShare/linkShare.vue

@@ -91,16 +91,16 @@ export default {
     methods: {
         smChange() {
             this.messageFlag = !this.messageFlag;
-            this.shareUserLink("权限修改成功");
+            this.shareUserLink();
         },
         snChange() {
             this.serviceNumberFlag = !this.serviceNumberFlag;
-            this.shareUserLink("权限修改成功");
+            this.shareUserLink();
         },
 
         vfChange() {
             this.voipFlag = !this.voipFlag;
-            this.shareUserLink("权限修改成功");
+            this.shareUserLink();
         },
         onShareAppMessage() {
             return {
@@ -114,7 +114,7 @@ export default {
                     this.shareId,
             };
         },
-        shareUserLink(itemTitle) {
+        shareUserLink() {
             let shareParam = {
                 devId: this.devInfo.devId,
                 sharerUserId: uni.getStorageSync("userId"),
@@ -133,11 +133,11 @@ export default {
                 })
                 .then((res) => {
                     if (res.data.code == 200) {
-                        uni.showToast({
-                            title: itemTitle,
-                            icon: "none",
-                            duration: 1500,
-                        });
+                        // uni.showToast({
+                        //     title: itemTitle,
+                        //     icon: "none",
+                        //     duration: 1500,
+                        // });
                         this.shareFlag = true;
                         this.shareId = res.data.data.shareId;
                     } else {
@@ -161,7 +161,7 @@ export default {
     onLoad(options) {
         this.devInfo = JSON.parse(options.devInfo);
         setTimeout(() => {
-            this.shareUserLink("分享链接创建成功");
+            this.shareUserLink();
         }, 500);
     },
 };

src/pagesA/moreSetting/moreSetting.vue

@@ -0,0 +1,378 @@
+<template>
+    <view class="home-warp">
+        <view class="clientInfo">
+            <view class="wifItem" @click="godeviceApparatus">
+                <text>设备参数</text>
+                <image
+                    src="../../static/rightArrow.png"
+                    style="width: 30rpx; height: 30rpx"
+                ></image>
+            </view>
+            <view class="wifItem" @click="roomSetting">
+                <text>房间配置</text>
+                <image
+                    src="../../static/rightArrow.png"
+                    style="width: 30rpx; height: 30rpx"
+                ></image>
+            </view>
+            <view class="wifItem">
+                <text>坐摔检测</text>
+                <view class="inputBox">
+                    <switch
+                        :checked="fallSettingEnabled == 1"
+                        @change="onFallSettingChange"
+                        :active-value="1"
+                        :inactive-value="0"
+                        size="24px"
+                        active-color="#07c160"
+                        inactive-color="#eeeff1"
+                        style="transform: scale(0.8); margin-left: auto"
+                    />
+                </view>
+            </view>
+        </view>
+
+        <view class="modal-mask" v-if="showFallSettingModle">
+            <view class="modal-container">
+                <view class="modal-header">
+                    <text class="title">坐摔参数配置</text>
+                </view>
+                <view class="modal-body">
+                    <view class="wifItem" style="margin-top: 30rpx">
+                        <text>坐摔最低高度</text>
+                        <view class="inputBox">
+                            <input
+                                type="number"
+                                v-model="lowZMax"
+                                placeholder="请输入坐摔最低高度"
+                            />
+                        </view>
+                    </view>
+                    <view class="wifItem" style="margin-top: 30rpx">
+                        <text>坐摔门限</text>
+                        <view class="inputBox">
+                            <input
+                                type="number"
+                                v-model="humanPredThreshold"
+                                placeholder="请输入坐摔门限"
+                            />
+                        </view>
+                    </view>
+                    <view class="wifItem" style="margin-top: 30rpx">
+                        <text>坐摔判断阈值</text>
+                        <view class="inputBox">
+                            <input
+                                type="number"
+                                v-model="minEventsForDetection"
+                                placeholder="请输入最坐摔判断阈值"
+                            />
+                        </view>
+                    </view>
+                    <view class="wifItem" style="margin-top: 30rpx">
+                        <text>坐摔状态阈值</text>
+                        <view class="inputBox">
+                            <input
+                                type="number"
+                                v-model="minHumanEventsForDetection"
+                                placeholder="请输入坐摔状态阈值"
+                            />
+                        </view>
+                    </view>
+                </view>
+                <view class="modal-buttons">
+                    <button class="btn cancle-btn" @click="cancleFall">
+                        <text>取消</text>
+                    </button>
+                    <button class="btn phone-btn" @click="saveFallSetting">
+                        <text>保存</text>
+                    </button>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+import { save } from "../../utils/mqtt";
+
+export default {
+    name: "my",
+    data() {
+        return {
+            devInfo: "",
+            // 坐摔参数
+            preFallSettingEnabled: 0,
+            fallSettingEnabled: 0,
+            lowZMax: 0.5,
+            humanPredThreshold: 0.78,
+            minEventsForDetection: 3,
+            minHumanEventsForDetection: 2,
+            lowHighSnrRatio: false,
+            lowMidSnrRatio: false,
+            // 坐摔检测弹窗
+            showFallSettingModle: false,
+        };
+    },
+    computed: {},
+    watch: {
+        fallSettingEnabled: {
+            handler(newVal, oldVal) {
+                console.log("fallSettingEnabled", newVal, oldVal);
+                if (newVal == 1) {
+                    // this.showFallSettingModle = true;
+                } else {
+                    this.showFallSettingModle = false;
+                    this.closeFallSetting();
+                }
+                this.preFallSettingEnabled = oldVal;
+            },
+        },
+    },
+
+    methods: {
+        godeviceApparatus() {
+            uni.navigateTo({
+                url:
+                    "/pagesA/adDevice/adDevice?devInfo=" +
+                    JSON.stringify(this.devInfo),
+            });
+        },
+        roomSetting() {
+            uni.navigateTo({
+                url:
+                    "/pagesA/roomSetting/roomSetting?devId=" +
+                    this.devInfo.devId +
+                    "&clientId=" +
+                    this.devInfo.clientId,
+            });
+        },
+        // 初始化坐摔参数
+        setFallSetting(devInfo) {
+            console.log("devInfo", devInfo);
+            if (devInfo.fallSettingEnabled == 1) {
+                this.preFallSettingEnabled = devInfo.preFallSettingEnabled;
+                this.fallSettingEnabled = devInfo.fallSettingEnabled;
+                this.lowZMax = devInfo.lowZMax;
+                this.humanPredThreshold = devInfo.humanPredThreshold;
+                this.minEventsForDetection = devInfo.minEventsForDetection;
+                this.minHumanEventsForDetection =
+                    devInfo.minHumanEventsForDetection;
+            }
+            this.showFallSettingModle = false;
+        },
+
+        onFallSettingChange({ detail }) {
+            this.fallSettingEnabled = detail.value == true ? 1 : 0;
+            if (this.fallSettingEnabled == 1) {
+                this.showFallSettingModle = true;
+            } else {
+                this.showFallSettingModle = false;
+            }
+        },
+        cancleFall() {
+            this.fallSettingEnabled = this.preFallSettingEnabled;
+            this.showFallSettingModle = false;
+        },
+
+        // 取消坐摔设置
+        closeFallSetting() {
+            this.showFallSettingModle = false;
+            delete this.devInfo.preFallSettingEnabled;
+            delete this.devInfo.fallSettingEnabled;
+            delete this.devInfo.lowZMax;
+            delete this.devInfo.humanPredThreshold;
+            delete this.devInfo.minEventsForDetection;
+            delete this.devInfo.minHumanEventsForDetection;
+            this.$http
+                .post("wap/device/updateDevice", this.devInfo, {
+                    header: {
+                        "Content-Type": "application/json;charset=UTF-8",
+                    },
+                })
+                .then((res) => {
+                    if (res.data.code == 200) {
+                        uni.showToast({
+                            title: "设置成功",
+                            icon: "success",
+                            duration: 1500,
+                        });
+                    } else {
+                        uni.showToast({
+                            title: res.data.message,
+                            icon: "none",
+                            duration: 1500,
+                        });
+                    }
+                });
+        },
+        // 保存坐摔设置
+        saveFallSetting() {
+            this.devInfo.preFallSettingEnabled = this.preFallSettingEnabled;
+            this.devInfo.fallSettingEnabled = this.fallSettingEnabled;
+            this.devInfo.lowZMax = this.lowZMax;
+            this.devInfo.humanPredThreshold = this.humanPredThreshold;
+            this.devInfo.minEventsForDetection = this.minEventsForDetection;
+            this.devInfo.minHumanEventsForDetection =
+                this.minHumanEventsForDetection;
+
+            this.$http
+                .post("wap/device/updateDevice", this.devInfo, {
+                    header: {
+                        "Content-Type": "application/json;charset=UTF-8",
+                    },
+                })
+                .then((res) => {
+                    if (res.data.code == 200) {
+                        uni.showToast({
+                            title: "设置成功",
+                            icon: "success",
+                            duration: 1500,
+                        });
+                    } else {
+                        uni.showToast({
+                            title: res.data.message,
+                            icon: "none",
+                            duration: 1500,
+                        });
+                    }
+                    this.showFallSettingModle = false;
+                });
+        },
+    },
+    onLoad(options) {
+        if (JSON.stringify(options) != "{}") {
+            this.devInfo = JSON.parse(options.devInfo);
+        }
+        this.setFallSetting(this.devInfo);
+        // console.log("devInfo11111111", this.devInfo);
+    },
+
+    onUnload(options) {},
+    onShow() {},
+};
+</script>
+<style lang="less" scoped>
+.home-warp {
+    position: relative;
+    height: 100vh;
+    background: linear-gradient(180deg, #faede2 0%, #f4f4f4 100%);
+    .clientInfo {
+        width: 700rpx;
+        height: 180px;
+        margin: 0 auto;
+        background: #ffffff;
+        border-radius: 38rpx;
+        box-sizing: border-box;
+        padding: 30rpx 30rpx;
+        .wifItem {
+            width: 640rpx;
+            display: flex;
+            align-content: center;
+            justify-content: space-between;
+            border-bottom: 2rpx solid #ebeff5;
+            padding-top: 30rpx;
+            padding-bottom: 20rpx;
+            image {
+                width: 40rpx;
+                height: 40rpx;
+            }
+            input {
+                margin-left: auto;
+                text-align: right;
+            }
+        }
+    }
+
+    .modal-mask {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.5);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        z-index: 333;
+
+        .modal-container {
+            width: 80%;
+            background: #fff;
+            border-radius: 16rpx;
+            // overflow: hidden;
+            animation: fadeIn 0.3s;
+
+            .modal-header {
+                padding: 30rpx;
+                text-align: center;
+                border-bottom: 1rpx solid #f5f5f5;
+
+                .title {
+                    font-size: 36rpx;
+                    display: block;
+                    margin-bottom: 10rpx;
+                }
+            }
+            .modal-body {
+                margin: 0 auto 0 auto;
+                box-sizing: border-box;
+                padding: 0 30rpx 20rpx 30rpx;
+                .wifItem {
+                    width: 530rpx;
+                    display: flex;
+                    align-content: center;
+                    justify-content: space-between;
+                    border-bottom: 2rpx solid #ebeff5;
+                    padding-top: 30rpx;
+                    padding-bottom: 20rpx;
+                    image {
+                        width: 40rpx;
+                        height: 40rpx;
+                    }
+                    input {
+                        margin-left: auto;
+                        text-align: right;
+                    }
+                }
+            }
+
+            .modal-buttons {
+                display: flex;
+                padding: 20rpx;
+
+                .btn {
+                    flex: 1;
+                    height: 90rpx;
+                    margin: 15rpx 0;
+                    border-radius: 45rpx;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    font-size: 32rpx;
+                    border: none;
+                    background: none;
+                    position: relative;
+                }
+                .cancle-btn {
+                    width: 40rpx;
+                    background: linear-gradient(
+                        105.95deg,
+                        #ba978a 0%,
+                        #a27867 100%
+                    );
+                    color: white;
+                }
+
+                .phone-btn {
+                    margin-left: 10rpx;
+                    background: linear-gradient(
+                        105.95deg,
+                        #ba978a 0%,
+                        #a27867 100%
+                    );
+                    color: white;
+                }
+            }
+        }
+    }
+}
+</style>

src/pagesA/roomSetting/roomSetting.vue

@@ -1,22 +1,6 @@
 <template>
     <view class="home-warpTwo">
         <view class="header_two">
-            <view class="header">
-                <view class="item">
-                    <image src="../../static/activePod.png" alt=""> </image>
-                    <text>1</text>
-                </view>
-                <view class="line"></view>
-                <view class="item"
-                    ><image src="../../static/activePod.png" alt=""></image>
-                    <text>2</text>
-                </view>
-                <view class="line"></view>
-                <view class="item"
-                    ><image src="../../static/activePod.png" alt=""></image>
-                    <text>3</text>
-                </view>
-            </view>
             <view class="radar-box">
                 <view
                     :style="{
@@ -679,12 +663,12 @@ export default {
                     if (res.data.code == 200) {
                         uni.showToast({
                             title: "保存成功",
-                            icon: "none",
+                            icon: "success",
                             duration: 1500,
                         });
                         setTimeout(() => {
-                            uni.reLaunch({
-                                url: "/pages/home/home",
+                            uni.navigateBack({
+                                delta: 1,
                             });
                         }, 1500);
                     } else {
@@ -911,39 +895,6 @@ export default {
         border-bottom-left-radius: 35rpx;
         border-bottom-right-radius: 35rpx;
         background: linear-gradient(180deg, #faede2 0%, #ffffff 100%);
-        .header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding: 0rpx 120rpx;
-            // padding-top: 30rpx;
-            .item {
-                position: relative;
-                text-align: center;
-                width: 70rpx;
-                height: 75rpx;
-                image {
-                    width: 45rpx;
-                    height: 50rpx;
-                }
-                text {
-                    position: absolute;
-                    top: 33%;
-                    left: 50%;
-                    transform: translate(-50%, -50%);
-                    font-weight: 700;
-                    color: #ffffff;
-                    font-size: 30rpx;
-                    text-align: center;
-                }
-            }
-            .line {
-                width: 56rpx;
-                height: 4rpx;
-                margin-bottom: 10rpx;
-                background-color: #e4c5b9;
-            }
-        }
         .radar-box {
             margin: 0 auto;
             position: relative;
@@ -960,7 +911,7 @@ export default {
                 position: absolute;
                 overflow: hidden;
                 background-color: #fff;
-                border: 14rpx solid #333333;
+                border: 8rpx solid #333333;
                 background-image: url("https://hflnxx.oss-cn-shanghai.aliyuncs.com/IMAGE/20250919/toilet_bg.png");
                 background-repeat: no-repeat;
                 background-position: center;
@@ -1029,7 +980,7 @@ export default {
         }
 
         .airbody {
-            margin: 80rpx auto 0 auto;
+            margin: 20rpx auto 0 auto;
             width: 700rpx;
             background: #ffffff;
             border-radius: 38rpx;

src/utils/globalMqtt.js

@@ -46,11 +46,9 @@ class MqttService {
             return Promise.resolve(this.dataClient);
         }
         uni.showToast({ title: "平台连接中...", icon: "loading", duration: 1000 });
-
         const brokerName = 'DATA';
-        const url = 'wxs://data.radar-power.cn/mqtt/';
+        const url = __wxConfig.envVersion == 'develop' ? 'wxs://data.radar-power.asia:8084/mqtt/' : '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 => {
                 this.dataClient = client;