From edcaa7701c08ec96b673dcf30cf6907f712b7e33 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Thu, 27 Feb 2025 17:37:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/searchSelectWrapper/index.js       | 28 ++++++++
 components/searchSelectWrapper/index.json     |  6 ++
 components/searchSelectWrapper/index.wxml     |  9 +++
 components/searchSelectWrapper/index.wxss     | 22 ++++++
 pages/home/index.wxml                         |  2 +-
 pages/workBench/components/account/index.js   |  1 -
 pages/workBench/components/account/index.json |  3 +-
 pages/workBench/components/account/index.wxml | 45 +++++-------
 pages/workBench/components/account/index.wxss |  8 ++-
 .../recharge/components/approve/index.json    |  3 +-
 .../recharge/components/reharge/index.json    |  3 +-
 pages/workBench/components/recharge/index.js  |  6 +-
 .../workBench/components/recharge/index.json  |  4 +-
 .../workBench/components/recharge/index.wxml  | 20 ++++--
 .../workBench/components/recharge/index.wxss  | 28 +++++++-
 pages/workBench/components/record/index.js    |  5 +-
 pages/workBench/components/record/index.json  |  3 +-
 pages/workBench/components/record/index.wxml  | 68 +++++++++---------
 pages/workBench/components/record/index.wxss  |  6 ++
 .../tenement/components/bindMeter/index.js    |  3 +-
 pages/workBench/components/tenement/index.js  |  3 +-
 .../workBench/components/tenement/index.json  |  3 +-
 .../workBench/components/tenement/index.wxml  | 71 ++++++++++---------
 .../workBench/components/tenement/index.wxss  | 16 +++--
 pages/workBench/index.js                      |  2 +-
 25 files changed, 240 insertions(+), 128 deletions(-)
 create mode 100644 components/searchSelectWrapper/index.js
 create mode 100644 components/searchSelectWrapper/index.json
 create mode 100644 components/searchSelectWrapper/index.wxml
 create mode 100644 components/searchSelectWrapper/index.wxss

diff --git a/components/searchSelectWrapper/index.js b/components/searchSelectWrapper/index.js
new file mode 100644
index 0000000..9120124
--- /dev/null
+++ b/components/searchSelectWrapper/index.js
@@ -0,0 +1,28 @@
+// components/searchSelectWrapper/index.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    label: String,
+    placeholder: String,
+    text: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onSearch() {
+      this.triggerEvent("search")
+    }
+  }
+})
\ No newline at end of file
diff --git a/components/searchSelectWrapper/index.json b/components/searchSelectWrapper/index.json
new file mode 100644
index 0000000..6f50345
--- /dev/null
+++ b/components/searchSelectWrapper/index.json
@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}
\ No newline at end of file
diff --git a/components/searchSelectWrapper/index.wxml b/components/searchSelectWrapper/index.wxml
new file mode 100644
index 0000000..ce9e592
--- /dev/null
+++ b/components/searchSelectWrapper/index.wxml
@@ -0,0 +1,9 @@
+<!--components/searchSelectWrapper/index.wxml-->
+<view class="wrapper">
+    <view> {{ label }} </view>
+    <view class="content" bind:tap="clickTime" bind:tap="onSearch">
+        <view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view>
+        <view class="text" wx:else> {{text}} </view>
+        <van-icon name="arrow-down" />
+    </view>
+</view>
\ No newline at end of file
diff --git a/components/searchSelectWrapper/index.wxss b/components/searchSelectWrapper/index.wxss
new file mode 100644
index 0000000..3ae12f1
--- /dev/null
+++ b/components/searchSelectWrapper/index.wxss
@@ -0,0 +1,22 @@
+/* components/searchSelectWrapper/index.wxss */
+.wrapper {
+    display: flex;
+    align-items: center;
+    font-size: 30rpx;
+    padding: 20rpx;
+}
+
+.content {
+    flex: 1;
+    margin-left: 30rpx;
+    margin-right: 30rpx;
+    display: flex;
+    padding: 10rpx 20rpx;
+    border-radius: 12rpx;
+    border: 1rpx solid #ccc;
+    background-color: #fff;
+}
+  
+.text {
+    flex: 1;
+}
\ No newline at end of file
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 6c6359d..dc81b19 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -21,7 +21,7 @@
   </view>
 <view class="login" wx:if="{{!user || !user.id}}" class="notLoginWrapper">
   <van-image width="80rpx" height="80rpx" src="/assets/images/defaultAvatar.png" class="defaultAvatar"/>
-  <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:tap="jumpToLogin">请登录</van-button>
+  <van-button type="primary" size="small" plain="{{true}}" class="loginBtn" bind:tap="jumpToLogin">请登录</van-button>
 </view>
 <view class="logined" wx:else>
   <avatar text="{{ user.nickName }}" />
diff --git a/pages/workBench/components/account/index.js b/pages/workBench/components/account/index.js
index eae210d..992b809 100644
--- a/pages/workBench/components/account/index.js
+++ b/pages/workBench/components/account/index.js
@@ -57,7 +57,6 @@ Component({
           })
           break;
         case "tenement":
-          console.log('data', data)
           this.setData({
             tenement: data.id,
             tenementName: data.name,
diff --git a/pages/workBench/components/account/index.json b/pages/workBench/components/account/index.json
index 8a466f7..922ddaa 100644
--- a/pages/workBench/components/account/index.json
+++ b/pages/workBench/components/account/index.json
@@ -14,6 +14,7 @@
     "edit-modal": "./components/editModal/index",
     "updatePhoneModal": "./components/updatePhoneModal/index",
     "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index"
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/account/index.wxml b/pages/workBench/components/account/index.wxml
index febd95e..90a4236 100644
--- a/pages/workBench/components/account/index.wxml
+++ b/pages/workBench/components/account/index.wxml
@@ -1,31 +1,17 @@
 <!--pages/workBench/components/account/index.wxml-->
 <view>
-    <van-field
-        required
-        value="{{ parkName }}"
+    <searchSelectWrapper 
         label="园区"
         placeholder="请选择园区"
-        border="{{ true }}"
-        readonly
-        use-button-slot
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-          选择
-        </van-button>
-    </van-field>
-    <van-field
-        required
-        value="{{ tenementName }}"
+        text="{{ parkName }}"
+        bind:search="onParkFocus"
+    />
+    <searchSelectWrapper 
         label="商户"
         placeholder="请选择商户"
-        border="{{ true }}"
-        readonly
-        use-button-slot
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
-            选择
-        </van-button>
-    </van-field>
+        text="{{ tenementName }}"
+        bind:search="onTenementFocus"
+    />
 </view>
 <van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
 <view wx:else>
@@ -39,7 +25,9 @@
                 <van-col span="24">
                     <view class="tableTitleRow">
                         <van-row gutter="5">
-                            <van-col span="8">{{tenementInfo.shortName}}</van-col>
+                            <van-col span="8">
+                                <view style="text-align:center;">{{tenementInfo.shortName}}</view>
+                            </van-col>
                             <van-col span="16">{{tenementInfo.fullName}}</van-col>
                         </van-row>
                     </view>
@@ -47,10 +35,13 @@
                 <van-col span="24">
                     <view class="tableTitleRow">
                         <van-row gutter="5">
-                            <van-col span="8" wx:if="{{tenementInfo.feeType === 0}}"> 华昌宝能收费 </van-col>
-                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 物业代收1 </van-col>
-                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 物业代收2 </van-col>
-                            <van-col span="8" wx:else> 物业代收线损 </van-col>
+                            <van-col span="8" wx:if="{{tenementInfo.feeType === 0}}"> 
+                                <view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
+                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 
+                                <view style="text-align: center;"> 物业代收1 </view> </van-col>
+                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 
+                                <view style="text-align: center;"> 物业代收2 </view>  </van-col>
+                            <van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
                             <van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
                         </van-row>
                     </view>
diff --git a/pages/workBench/components/account/index.wxss b/pages/workBench/components/account/index.wxss
index 9bb6f1c..e5f7686 100644
--- a/pages/workBench/components/account/index.wxss
+++ b/pages/workBench/components/account/index.wxss
@@ -60,10 +60,16 @@
 
 .tableTitleRow {
     padding: 16rpx;
+    font-weight: 700;
 }
 
 .tableRow {
     padding: 16rpx;
     border: 1rpx solid #ccc;
     border-top: 0rpx;
-}
\ No newline at end of file
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }
\ No newline at end of file
diff --git a/pages/workBench/components/recharge/components/approve/index.json b/pages/workBench/components/recharge/components/approve/index.json
index c992ee6..c064e73 100644
--- a/pages/workBench/components/recharge/components/approve/index.json
+++ b/pages/workBench/components/recharge/components/approve/index.json
@@ -10,6 +10,7 @@
     "empty": "/components/empty/index",
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
-    "van-dialog": "@vant/weapp/dialog/index"
+    "van-dialog": "@vant/weapp/dialog/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/recharge/components/reharge/index.json b/pages/workBench/components/recharge/components/reharge/index.json
index 779a6e1..b387e17 100644
--- a/pages/workBench/components/recharge/components/reharge/index.json
+++ b/pages/workBench/components/recharge/components/reharge/index.json
@@ -4,6 +4,7 @@
     "van-popup": "@vant/weapp/popup/index",
     "search-select": "/components/searchSelect/index",
     "van-field": "@vant/weapp/field/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/recharge/index.js b/pages/workBench/components/recharge/index.js
index 83eb4e8..e11025f 100644
--- a/pages/workBench/components/recharge/index.js
+++ b/pages/workBench/components/recharge/index.js
@@ -22,11 +22,11 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    handleChange(e) {
+    changeQueryType(e) {
       console.log("change", e)
-      const { index } = e.detail;
+      const { type } = e.currentTarget.dataset;
       this.setData({
-        active: index
+        active: type
       })
     },
     
diff --git a/pages/workBench/components/recharge/index.json b/pages/workBench/components/recharge/index.json
index a540c5c..f85134b 100644
--- a/pages/workBench/components/recharge/index.json
+++ b/pages/workBench/components/recharge/index.json
@@ -4,6 +4,8 @@
     "van-button": "@vant/weapp/button/index",
     "segmented": "/components/Segmented/index",
     "recharge": "./components/reharge/index",
-    "approve": "./components/approve/index"
+    "approve": "./components/approve/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/recharge/index.wxml b/pages/workBench/components/recharge/index.wxml
index 1e23e63..4d02b54 100644
--- a/pages/workBench/components/recharge/index.wxml
+++ b/pages/workBench/components/recharge/index.wxml
@@ -1,10 +1,18 @@
 <!--pages/workBench/components/recharge/index.wxml-->
-<view style="margin-top: 20rpx;">
-  <segmented 
-    list="{{segmentedList}}" 
-    active="{{active}}" 
-    bind:change="handleChange"  
-  />
+<view style="">
+  <view class="typeQuery">
+      <van-row>
+        <van-col span="8">
+          <view class="typeQueryText" style="color: {{active === 0 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{0}}"> 待审核 </view>
+        </van-col>
+        <van-col span="8">
+          <view class="typeQueryText" style="color: {{active === 1 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{1}}"> 已审核 </view>
+        </van-col>
+        <van-col span="8">
+          <view class="typeQueryText" style="color: {{active === 2 ? '#0958d9' : '#000'}}" bind:tap="changeQueryType" data-type="{{2}}"> 充值 </view>
+        </van-col>
+      </van-row>
+    </view>
 </view>
 
 <approve status="{{2}}" wx:if="{{active === 0}}" />
diff --git a/pages/workBench/components/recharge/index.wxss b/pages/workBench/components/recharge/index.wxss
index fc3e3af..cf8d8a0 100644
--- a/pages/workBench/components/recharge/index.wxss
+++ b/pages/workBench/components/recharge/index.wxss
@@ -1 +1,27 @@
-/* pages/workBench/components/recharge/index.wxss */
\ No newline at end of file
+/* pages/workBench/components/recharge/index.wxss */
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }
+
+
+  .query {
+    margin: 20rpx 0rpx;
+  }
+  
+  .typeQueryText {
+    text-align: center;
+    padding: 20rpx;
+    background-color: var(--light-green);
+    font-size: 32rpx;
+  }
+  
+  .select {
+    border: 1rpx solid #ccc;
+    padding: 12rpx;
+    border-radius: 12rpx;
+    flex: 1;
+    display: flex;
+    justify-content: space-between;
+    font-size: 30rpx;
+  }
\ No newline at end of file
diff --git a/pages/workBench/components/record/index.js b/pages/workBench/components/record/index.js
index 602d4c5..dccf749 100644
--- a/pages/workBench/components/record/index.js
+++ b/pages/workBench/components/record/index.js
@@ -46,7 +46,6 @@ Component({
       })
     },
     onConfirm(e) {
-      console.log('e', e)
       const { data, type } = e.detail;
       const that = this;
       switch(type) {
@@ -61,7 +60,9 @@ Component({
             meterName: data.address,
             meter: data.id,
           }, () => {
-            that.init();
+            loadingFunc(async () => {
+              await that.init();
+            })
           })
           break;
       }
diff --git a/pages/workBench/components/record/index.json b/pages/workBench/components/record/index.json
index b4547a4..3d5b800 100644
--- a/pages/workBench/components/record/index.json
+++ b/pages/workBench/components/record/index.json
@@ -12,6 +12,7 @@
     "van-radio-group": "@vant/weapp/radio-group/index",
     "van-tag": "@vant/weapp/tag/index",
     "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index"
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/record/index.wxml b/pages/workBench/components/record/index.wxml
index f653736..daa0e92 100644
--- a/pages/workBench/components/record/index.wxml
+++ b/pages/workBench/components/record/index.wxml
@@ -1,38 +1,24 @@
 <!--pages/workBench/components/record/index.wxml-->
-<van-field
-    value="{{ parkName }}"
+<searchSelectWrapper 
+    label="园区" 
     placeholder="请选择园区"
-    label="园区"
-    readonly
-    border="{{ false }}"
-    use-button-slot
-    title-width="100rpx"
->
-    <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-      选择
-    </van-button>
-</van-field>
+    text="{{parkName}}"
+    bind:search="onParkFocus"
+/>
 
 <van-empty wx:if="{{!park}}" description="选择园区后查看" />
 <view wx:else>
-    <van-field
-        value="{{ meterName }}"
+    <searchSelectWrapper 
+        label="电表" 
         placeholder="请选择电表"
-        label="电表"
-        readonly
-        border="{{ false }}"
-        use-button-slot
-        title-width="100rpx"
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onMeterFocus">
-        选择
-        </van-button>
-    </van-field>
+        text="{{meterName}}"
+        bind:search="onMeterFocus"
+    />
     <van-empty wx:if="{{!meter}}" description="选择电表后查看" />
-    <view>
+    <view wx:else>
         <view wx:if="{{list.length}}">
             <view class="operate">
-                <view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
+                <view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
                     <van-button 
                         type="info" 
                         size="small" 
@@ -46,7 +32,9 @@
             <view class="customTable" wx:for="{{list}}" wx:key="id">
                 <view class="customTableTile">
                     <van-row>
-                        <van-col span="8">{{item.tenement.shortName}}</van-col>
+                        <van-col span="8">
+                            <view style="text-align: center;"> {{item.tenement.shortName}} </view>
+                        </van-col>
                         <van-col span="16">{{item.tenement.name}}</van-col>
                     </van-row>
                 </view>
@@ -55,9 +43,12 @@
                         <van-col span="24">
                             <view class="tableRow">
                                 <van-row gutter="5">
-                                    <van-col span="8" wx:if="{{item.type === 0}}">商户电表</van-col>
-                                    <van-col span="8" wx:elif="{{item.type === 2}}">公摊电表</van-col>
-                                    <van-col span="8" wx:else>园区电表</van-col>
+                                    <van-col span="8" wx:if="{{item.type === 0}}">
+                                        <view style="text-align: center;"> 商户电表 </view></van-col>
+                                    <van-col span="8" wx:elif="{{item.type === 2}}">
+                                        <view style="text-align: center;"> 公摊电表 </view></van-col>
+                                    <van-col span="8" wx:else>
+                                        <view style="text-align: center;"> 园区电表 </view></van-col>
                                     <van-col span="16">表号：{{item.meterNo}}</van-col>
                                 </van-row>
                             </view>
@@ -65,7 +56,9 @@
                         <van-col span="24">
                             <view class="tableRow">
                                 <van-row gutter="5">
-                                    <van-col span="8">{{item.address}}</van-col>
+                                    <van-col span="8">
+                                        <view style="text-align: center;"> {{item.address}} </view>
+                                    </van-col>
                                     <van-col span="16">SN：{{item.meterSn}}</van-col>
                                 </van-row>
                             </view>
@@ -73,7 +66,9 @@
                         <van-col span="24">
                             <view class="tableRow">
                                 <van-row gutter="5">
-                                    <van-col span="8">{{item.amount}}</van-col>
+                                    <van-col span="8">
+                                        <view style="text-align: center;"> 表字：{{item.amount}} </view>
+                                    </van-col>
                                     <van-col span="16">余额：{{item.money}}</van-col>
                                 </van-row>
                             </view>
@@ -81,10 +76,11 @@
                         <van-col span="24">
                             <view class="tableRow">
                                 <van-row gutter="5">
-                                    <van-col span="8" wx:if="{{item.onPosition === 0}}">合闸</van-col>
-                                    <van-col span="8" wx:else>拉闸</van-col>
-                                    <van-col span="8" wx:if="{{item.canConnect}}">在线</van-col>
-                                    <van-col span="8" wx:else>失联</van-col>
+                                    <van-col span="8" wx:if="{{item.onPosition === 0}}">
+                                        <view style="text-align: center;">合闸</view> </van-col>
+                                    <van-col span="8" wx:else><view style="text-align: center;">拉闸</view> </van-col>
+                                    <van-col span="8" wx:if="{{item.canConnect}}"><view style="text-align: center;">在线</view> </van-col>
+                                    <van-col span="8" wx:else><view style="text-align: center;">失联</view> </van-col>
                                 </van-row>
                             </view>
                         </van-col>
diff --git a/pages/workBench/components/record/index.wxss b/pages/workBench/components/record/index.wxss
index b82170d..59a86ed 100644
--- a/pages/workBench/components/record/index.wxss
+++ b/pages/workBench/components/record/index.wxss
@@ -48,6 +48,7 @@
     background-color: var(--light-green);
     padding: 16rpx;
     box-sizing: border-box;
+    font-weight: 700;
 }
 
 .tableRow {
@@ -55,3 +56,8 @@
     border: 1rpx solid #ccc;
     border-top: 0rpx;
 }
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }
diff --git a/pages/workBench/components/tenement/components/bindMeter/index.js b/pages/workBench/components/tenement/components/bindMeter/index.js
index f8be3e2..f9aec7b 100644
--- a/pages/workBench/components/tenement/components/bindMeter/index.js
+++ b/pages/workBench/components/tenement/components/bindMeter/index.js
@@ -66,11 +66,12 @@ Component({
     onConfirm(e) {
       const { type, data } = e.detail;
       const that = this;
+      console.log("e.deail", e.detail)
       switch(type) {
         case "meter":
           this.setData({
             meter: data.id,
-            meterName: data.name,
+            meterName: data.address,
             show: false,
           })
           break;
diff --git a/pages/workBench/components/tenement/index.js b/pages/workBench/components/tenement/index.js
index 3385836..a60b50c 100644
--- a/pages/workBench/components/tenement/index.js
+++ b/pages/workBench/components/tenement/index.js
@@ -92,7 +92,8 @@ Component({
       this.setData({
         kaihuVisible: true,
         editType: "add",
-        title: "开户"
+        title: "开户",
+        defaultValue: { feeType: 0, feeTypeName: "华昌宝能收费" }
       })
     },
     startUpdateInfo() {
diff --git a/pages/workBench/components/tenement/index.json b/pages/workBench/components/tenement/index.json
index aedb0e2..f551c64 100644
--- a/pages/workBench/components/tenement/index.json
+++ b/pages/workBench/components/tenement/index.json
@@ -9,6 +9,7 @@
     "bindMeter": "./components/bindMeter/index",
     "unBindMeter": "./components/unBindMeter/index",
     "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index"
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }
\ No newline at end of file
diff --git a/pages/workBench/components/tenement/index.wxml b/pages/workBench/components/tenement/index.wxml
index ba5c582..ae1df4d 100644
--- a/pages/workBench/components/tenement/index.wxml
+++ b/pages/workBench/components/tenement/index.wxml
@@ -1,31 +1,17 @@
 <!--pages/workBench/components/tenement/index.wxml-->
 <view>
-    <van-field
-        required
-        value="{{ parkName }}"
+    <searchSelectWrapper 
         label="园区"
         placeholder="请选择园区"
-        border="{{ true }}"
-        readonly
-        use-button-slot
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-          选择
-        </van-button>
-    </van-field>
-    <van-field
-        required
-        value="{{ tenementName }}"
+        text="{{ parkName }}"
+        bind:search="onParkFocus"
+    />
+    <searchSelectWrapper 
         label="商户"
         placeholder="请选择商户"
-        border="{{ true }}"
-        readonly
-        use-button-slot
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
-            选择
-        </van-button>
-    </van-field>
+        text="{{ tenementName }}"
+        bind:search="onTenementFocus"
+    />
 </view>
 <view style="display: flex; align-items: center;margin: 20rpx">
     <view wx:if="{{tenement}}">
@@ -51,21 +37,35 @@
             <van-row>
                 <van-col span="24">
                     <view class="tableTitleRow">
-                        <van-row gutter="5">
-                            <van-col span="8">{{tenementInfo.shortName}}</van-col>
-                            <van-col span="16">{{tenementInfo.fullName}}</van-col>
-                        </van-row>
+                        <view class="tbody">
+                            <view class="tr">
+                                <view class="th" style="width: 250rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
+                                <view> {{tenementInfo.fullName}} </view>
+                            </view>
+                        </view>
                     </view>
                 </van-col>
                 <van-col span="24">
                     <view class="tableTitleRow">
-                        <van-row gutter="5">
-                            <van-col span="8" wx:if="{{tenementInfo.feeType === 0}}"> 华昌宝能收费 </van-col>
-                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 物业代收1 </van-col>
-                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 物业代收2 </van-col>
-                            <van-col span="8" wx:else> 物业代收线损 </van-col>
+                        <view class="tbody">
+                            <view class="tr">
+                                <view wx:if="{{tenementInfo.feeType === 0}}" class="th" style="width: 250rpx;text-align: center;"> 华昌宝能收费 </view>
+                                <view wx:if="{{tenementInfo.feeType === 1}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收1 </view>
+                                <view wx:if="{{tenementInfo.feeType === 2}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收2 </view>
+                                <view wx:if="{{tenementInfo.feeType === 3}}" class="th" style="width: 250rpx;text-align: center;"> 物业代收线损 </view>
+                                <view> {{tenementInfo.contact}} {{tenementInfo.phone}} </view>
+                            </view>
+                        </view>
+                        <!-- <van-row gutter="5">
+                            <van-col span="8"> 
+                                <view style="text-align: center;"> 华昌宝能收费 </view> </van-col>
+                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 1}}"> 
+                                <view style="text-align: center;"> 物业代收1 </view> </van-col>
+                            <van-col span="8" wx:elif="{{tenementInfo.feeType === 2}}"> 
+                                <view style="text-align: center;"> 物业代收2 </view>  </van-col>
+                            <van-col span="8" wx:else> <view style="text-align: center;"> 物业代收线损 </view> </van-col>
                             <van-col span="16">{{tenementInfo.contact}} {{tenementInfo.phone}} </van-col>
-                        </van-row>
+                        </van-row> -->
                     </view>
                 </van-col>
      
@@ -77,9 +77,9 @@
                 <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
                     <block wx:for="{{meterList}}" wx:for-index="itemIndex" wx:key="item">
                         <view class="tbody">
-                            <view class="tr">
-                                <view class="th" style="width: 250rpx"> {{ item.address }} </view>
-                                <view class="th" style="width: 250rpx"> {{ item.meterSn }} </view>
+                            <view class="tr tableRow">
+                                <view class="th" style="width: 250rpx;padding-right: 16rpx;box-sizing: border-box;border-right: 1rpx solid #ccc;"> {{ item.address }} </view>
+                                <view class="th" style="width: 250rpx;padding-right: 16rpx;box-sizing: border-box;border-right: 1rpx solid #ccc;"> {{ item.meterSn }} </view>
                                 <view class="th" style="width: 200rpx">
                                     <view 
                                         class="primaryTextBtn" 
@@ -103,6 +103,7 @@
     title="{{title}}" 
     type="{{type}}" 
     park="{{park}}"
+    isBack="{{true}}"
     bindconfirm="onConfirm"
     bindcancel="onCancel"
 />
diff --git a/pages/workBench/components/tenement/index.wxss b/pages/workBench/components/tenement/index.wxss
index 32368f1..09f3390 100644
--- a/pages/workBench/components/tenement/index.wxss
+++ b/pages/workBench/components/tenement/index.wxss
@@ -23,13 +23,9 @@
 
 }
 
-.tbody {
-    width: 890rpx;
-}
-
 .tbody .tr {
     padding: 20rpx;
-    border-bottom: 1rpx solid #EEEEEE;
+    box-sizing: border-box;
     display: flex;
     align-items: center;
     flex-wrap: nowrap;
@@ -53,6 +49,7 @@
 .customTableTile {
     background-color: var(--light-green);
     box-sizing: border-box;
+    font-weight: 700;
 }
 
 .tableTitleRow {
@@ -60,7 +57,14 @@
 }
 
 .tableRow {
+
     padding: 16rpx;
     border: 1rpx solid #ccc;
     border-top: 0rpx;
-}
\ No newline at end of file
+    font-size: 32rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }
\ No newline at end of file
diff --git a/pages/workBench/index.js b/pages/workBench/index.js
index e257546..d596302 100644
--- a/pages/workBench/index.js
+++ b/pages/workBench/index.js
@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    active: 3
+    active: 1,
   },
 
   /**