From eed1e5c9943696fd447574129fae507acdb257d9 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 27 Mar 2026 22:19:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=99=A8=E7=95=8C=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/other/index.vue | 27 ++++++++++++++++-----------
 src/home/ctr.vue               |  3 ++-
 src/my/deviceRecharge.vue      | 15 +++++++++++++--
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/components/other/index.vue b/src/components/other/index.vue
index d48a612..e141e95 100644
--- a/src/components/other/index.vue
+++ b/src/components/other/index.vue
@@ -58,7 +58,7 @@
                   正常</nut-tag
                 >
                 <nut-tag class="tagErr font_28 m_r_15" v-else-if="item.status == 2">
-                  {{ item.warnCodeInfo?.warnDescription }}</nut-tag
+                  {{ item.warnCodeInfo.warnDescription }}</nut-tag
                 >
                 <nut-tag
                   class="font_28 m_r_15"
@@ -444,11 +444,16 @@
           >
             <!-- 控制器标题行 -->
             <nut-col :span="24">
-              <view class="controller-header">
+              <view class="controller-header" :style="{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }">
                 <view class="controller-name">
                   <text class="controller-title">{{ item.deviceName }}</text>
                   <view class="error-tag" v-if="item.errorMessage">{{ item.errorMessage }}</view>
                 </view>
+                <view
+                  class="font_28 c_1589E9"
+                  :style="{ color: '#1589E9', fontSize: '28rpx' }"
+                  @click="setParamsCtr(item.id)"
+                >参数设置</view>
               </view>
             </nut-col>
             
@@ -877,11 +882,9 @@ Taro.useDidHide(() => {
 function startRefreshTimer() {
   // 先清除已有的定时器
   stopRefreshTimer();
-  // 每10秒刷新一次
+  // 每10秒刷新一次设备状态（包括在线状态和开关状态）
   refreshTimer.value = setInterval(() => {
-    if (controlList.value.length > 0) {
-      getDeviceList();
-    }
+    getDeviceList();
   }, 10000);
 }
 
@@ -903,9 +906,11 @@ watch(
 );
 // 获取塘口下的设备列表
 function getDeviceList() {
+  console.log('========== getDeviceList 被调用 ==========');
   emit("render", "");
   const id = props.modelValue;
   if (!id) {
+    console.log('没有id，直接返回');
     return;
   }
   // 查询塘口下设备列表
@@ -954,10 +959,10 @@ function getDeviceList() {
         item.num = num;
         item.status = Number(item.deviceCount) == 0 ? 0 : msg ? 2 : 1;
         // 判断设备是否离线，异常、断电 0 6 15
-        const code0 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 0);
-        const code6 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 6);
-        const code11 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 15);
-        const code17 = alarmJudgeCode(item.warnCodeInfo?.warnCode, 17);
+        const code0 = alarmJudgeCode(item.warnCodeInfo.warnCode, 0);
+        const code6 = alarmJudgeCode(item.warnCodeInfo.warnCode, 6);
+        const code11 = alarmJudgeCode(item.warnCodeInfo.warnCode, 15);
+        const code17 = alarmJudgeCode(item.warnCodeInfo.warnCode, 17);
         item.up = true;
         if (code0 || code6 || code11 || code17) {
           item.up = false;
@@ -1780,7 +1785,7 @@ function changeAllSwitch(e) {
 // 设置控制器
 function setParamsCtr(id) {
   Taro.navigateTo({
-    url: `/home/ctr?id=${id}&page=home`,
+    url: `/home/ctr?id=${id}&page=home&hideSwitch=1`,
   });
 }
 function switchRes(list, index, type) {
diff --git a/src/home/ctr.vue b/src/home/ctr.vue
index 054496a..d4b5265 100644
--- a/src/home/ctr.vue
+++ b/src/home/ctr.vue
@@ -103,7 +103,7 @@
                 </nut-cell>
               </nut-col>
               <!-- 开关配置区域 -->
-              <nut-col :span="24" v-if="!section">
+              <nut-col :span="24" v-if="!section && !hideSwitch">
                 <nut-cell class="ctr_body">
                   <nut-row>
                     <!-- <nut-col :span="24" class="view_f_between">
@@ -756,6 +756,7 @@ const id = instance.router.params.id;
 const name = instance.router.params.name;
 const page = instance.router.params.page;
 const section = instance.router.params.section; // 获取区域参数
+const hideSwitch = instance.router.params.hideSwitch === '1'; // 是否隐藏开关配置
 const r_v = `${imgUrl}r_v.png`;
 // const id = 5
 // const name = undefined
diff --git a/src/my/deviceRecharge.vue b/src/my/deviceRecharge.vue
index 336fe2e..6b02f79 100644
--- a/src/my/deviceRecharge.vue
+++ b/src/my/deviceRecharge.vue
@@ -475,7 +475,6 @@ function wxpay() {
           payId: reType.value,
           listDeviceId: rechargeList.value,
         };
-        console.log(data)
         // 创建订单
         createOrder(data).then((res: any) => {
           if (res.code == 200) {
@@ -507,14 +506,26 @@ function wxpay() {
               },
               fail: function (res) {
                 devOpen.value = false;
-                state.msg = "续费异常，请稍后再试";
+                state.msg = res.errMsg || "续费异常，请稍后再试";
                 state.show = true;
                 loading.value = false;
+                console.error("支付失败:", res);
               },
             });
+          } else {
+            loading.value = false;
+            state.msg = res.msg || "创建订单失败";
+            state.show = true;
           }
+        }).catch((err) => {
+          loading.value = false;
+          state.msg = "网络异常，请稍后再试";
+          state.show = true;
         });
       } else {
+        loading.value = false;
+        state.msg = "获取登录信息失败";
+        state.show = true;
       }
     },
     fail: function () {