From ec77d26c27a48ee0790b2a3340e9667f0cfca52e Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Thu, 9 Jan 2025 15:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E7=BB=91=E5=AE=9A=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8=E6=90=9C=E7=B4=A2=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2=E5=87=BA=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=EF=BC=8C=E5=81=9A=E5=A5=BD=E9=9A=90=E7=A7=81=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=B5=E8=A1=A8=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/searchSelect/index.js             | 5 +++--
 pages/handleLogin/index.wxml                 | 2 --
 pages/workBench/components/record/index.wxml | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 68ec3a5..a25737e 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -123,9 +123,10 @@ Component({
         return
       }
       this.setData({
-        columns: data?.map(item => item?.shortName),
+        columns: data?.length ? data?.map(item => item?.name) : [],
         list: data,
       })
     },
   }
-})
\ No newline at end of file
+})
+
diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml
index 533f5d9..0990a90 100644
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -17,8 +17,6 @@
   </van-tab>
   <van-tab title="手动绑定">
     <view>
-      <!-- <select label="园区" type="0" bind:choose="onChoosePark" park="{{park}}" parkName="{{parkName}}" required="{{true}}" />
-      <select label="公司名称" type="1" bind:choose="onChooseTenement" park="{{park}}" tenement="{{tenement}}" tenementName="{{tenementName}}" required="{{true}}" /> -->
       <van-field
         required
         value="{{ parkName }}"
diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml
index ba50d89..a57aee8 100644
--- a/pages/workBench/components/record/index.wxml
+++ b/pages/workBench/components/record/index.wxml
@@ -56,7 +56,7 @@
                                     <view class="th" style="width: 130rpx" wx:else>
                                         <van-tag type="primary">合闸</van-tag>
                                     </view>
-                                    <view class="th" style="width: 130rpx" wx:if="{{canConnect}}">
+                                    <view class="th" style="width: 130rpx" wx:if="{{item.canConnect}}">
                                         <van-tag type="primary">在线</van-tag>
                                     </view>
                                     <view class="th" style="width: 130rpx" wx:else>