暂存样式修改

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

components/searchSelectWrapper/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "van-icon": "@vant/weapp/icon/index"
+  }
+}

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>

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;
+}

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 }}" />

pages/workBench/components/account/components/updatePhoneModal/index.js

@@ -19,7 +19,11 @@ Component({
     parentName:String, 
     parentId:String, 
   },
-
+  observers: {
+    "parentPhone": function (newPhone) {
+      this.setData({ phone: newPhone })
+    }
+  },
   /**
    * 组件的初始数据
    */

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,
@@ -103,7 +102,9 @@ Component({
       this.handleCancel();
     },
     onUpdatePhoneConfirm() {
+      this.setData({ parentPhone: "", phone: "", type: "", title: "" })
       this.getTenementInfo();
+      this.initUserList()
     },
     async getTenementInfo() {
       const { tenement, park } = this.data;
@@ -135,18 +136,12 @@ Component({
       })
     },
     handleChangeMain() {
-      // const { list = [] } = this.data;
+      const { tenementInfo = {} } = this.data;
-      // const main = list?.find(item => item.Permissions)
-      // if (!main) {
-      //   alertInfo("没有主账号")
-      //   return
-      // }
-      // console.log("main", main)
       this.setData({
         updatePhoneVisible: true,
         type: "update",
         title: "编辑管理员",
-        // phone: main.WechatPhone,
+        parentPhone: tenementInfo.phone,
         // name: main.WechatUserName,
         // id: main.WechatUserID,
       })
@@ -156,6 +151,7 @@ Component({
         updatePhoneVisible: false,
         type: "",
         phone: "",
+        parentPhone: "",
         name: "",
         id: "",
       })

pages/workBench/components/account/index.json

@@ -12,6 +12,9 @@
     "van-radio-group": "@vant/weapp/radio-group/index",
     "van-tag": "@vant/weapp/tag/index",
     "edit-modal": "./components/editModal/index",
-    "updatePhoneModal": "./components/updatePhoneModal/index"
+    "updatePhoneModal": "./components/updatePhoneModal/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }

pages/workBench/components/account/index.wxml

@@ -1,88 +1,85 @@
 <!--pages/workBench/components/account/index.wxml-->
 <view>
-    <van-field
+    <searchSelectWrapper 
-        required
-        value="{{ parkName }}"
         label="园区"
         placeholder="请选择园区"
-        border="{{ true }}"
+        text="{{ parkName }}"
-        readonly
+        bind:search="onParkFocus"
-        use-button-slot
+    />
-    >
+    <searchSelectWrapper 
-        <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-          选择
-        </van-button>
-    </van-field>
-    <van-field
-        required
-        value="{{ tenementName }}"
         label="商户"
         placeholder="请选择商户"
-        border="{{ true }}"
+        text="{{ tenementName }}"
-        readonly
+        bind:search="onTenementFocus"
-        use-button-slot
+    />
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
-            选择
-        </van-button>
-    </van-field>
 </view>
 <van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
 <view wx:else>
-    <van-field
-        value="{{tenementInfo.fullName}}"
-        label="商户名称"
-        readonly
-        title-width="140rpx"
-    />
-    
-    <van-field
-        value="{{tenementInfo.shortName}}"
-        label="商户简称"
-        readonly
-        title-width="140rpx"
-    />
-    <van-field
-        value="{{tenementInfo.phone}}"
-        label="预留电话"
-        readonly
-        title-width="140rpx"
-    />
     <view class="operateBox">
         <van-button type="info" size="small" style="margin-right: 20rpx;" bind:click="handleAddSon"> 添加子账号 </van-button>
         <van-button type="info" size="small" style="margin-right: 20rpx;" bind:click="handleChangeMain"> 修改主账号 </van-button>
     </view>
-    <view wx:if="{{list.length}}">
+    <view class="customTable">
-        <view class="tableWrapper">
+        <view class="customTableTile">
-            <view class="table">
+            <van-row>
-                <view class="thead">
+                <van-col span="24">
-                    <view class="th" style="width: 70rpx"> 序号 </view>
+                    <view class="tableTitleRow">
-                    <view class="th" style="width: 200rpx"> 昵称 </view>
+                        <van-row gutter="5">
-                    <view class="th" style="width: 300rpx"> 手机号 </view>
+                            <van-col span="8">
-                    <view class="th" style="width: 100rpx"> 操作 </view>
+                                <view style="text-align:center;">{{tenementInfo.shortName}}</view>
-                </view>
+                            </van-col>
-                <view class="tbody">
+                            <van-col span="16">{{tenementInfo.fullName}}</van-col>
-                    <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
+                        </van-row>
-                        <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
+                    </view>
+                </van-col>
+                <van-col span="24">
+                    <view class="tableTitleRow">
+                        <van-row gutter="5">
+                            <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>
+                </van-col>
+     
+            </van-row>
+        </view>
+        <view class="customTableContent">
+            <van-row wx:if="{{list.length}}">
+                <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
+                    <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
+                        <view class="tbody">
                             <view class="tr">
                                 <view class="th" style="width: 70rpx"> {{ itemIndex + 1 }} </view>
                                 <view class="th" style="width: 200rpx"> {{ item.WechatUserName }} </view>
                                 <view class="th" style="width: 300rpx"> {{ item.WechatPhone }} </view>
                                 <view class="th" style="width: 100rpx; display: flex;">
-                                    <view class="primaryTextBtn" bind:tap="handleDelete" data-id="{{item.WechatUserID}}" data-name="{{item.WechatUserName}}" wx:if="{{!item.Permissions}}">
+                               
+                                    <view 
+                                        class="primaryTextBtn" 
+                                        bind:tap="handleDelete" 
+                                        data-id="{{item.WechatUserID}}" 
+                                        data-name="{{item.WechatUserName}}" 
+                                        wx:if="{{!item.Permissions}}"
+                                    >
                                         移除
                                     </view>
-                                    <van-tag type="info" wx:else>管理员</van-tag>
+                                    <van-tag type="primary" wx:else>管理员</van-tag>
                                 </view>
                             </view>
-                        </block>
+                        </view>
-                    </van-radio-group>
+                        
-                </view>
+                    </block>
-            </view>
+                </van-radio-group>
+            </van-row>
+            <empty wx:else bind:refresh="initUserList" />
         </view>
-       
     </view>
-    <empty wx:else bind:refresh="initUserList" />
 </view>
 <search-select 
     show="{{show}}" 
@@ -109,6 +106,7 @@
     visible="{{updatePhoneVisible}}"  
     tenement="{{tenement}}"
     park="{{park}}"  
+    parentPhone="{{parentPhone}}"
     bind:ok="onUpdatePhoneConfirm"
     bind:cancel="handleUpdatePhoneCancel"
 />

pages/workBench/components/account/index.wxss

@@ -46,4 +46,30 @@
 }
 .primaryTextBtn {
     color: #1989fa;
-}
+}
+
+.customTable {
+    margin: 20rpx;
+    font-size: 32rpx;
+}
+
+.customTableTile {
+    background-color: var(--light-green);
+    box-sizing: border-box;
+}
+
+.tableTitleRow {
+    padding: 16rpx;
+    font-weight: 700;
+}
+
+.tableRow {
+    padding: 16rpx;
+    border: 1rpx solid #ccc;
+    border-top: 0rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }

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

pages/workBench/components/recharge/components/approve/index.wxml

@@ -28,6 +28,25 @@
 </van-field>
 <view>
     <view wx:if="{{list.length}}">
+        <view class="operate" wx:if="{{status === 2}}">
+            <view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
+                <van-button 
+                    type="info" 
+                    size="small" 
+                    style="margin-right: 30rpx;" 
+                    bind:click="handleApprove"
+                    data-status="0"
+                    disabled="{{!record}}"
+                > 同意 </van-button>
+                <van-button 
+                    size="small" 
+                    bind:click="handleClear"  
+                    disabled="{{!record}}" 
+                    bind:click="handleApprove"
+                    data-status="1"
+                > 拒绝 </van-button>
+            </view>
+        </view>
         <view class="tableWrapper">
             <view class="table">
                 <view class="thead">
@@ -65,25 +84,7 @@
         
     </view>
     <empty bind:refresh="init" wx:else />
-    <view class="operate" wx:if="{{status === 2}}">
+    
-        <view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
-            <van-button 
-                type="info" 
-                size="small" 
-                style="margin-right: 30rpx;" 
-                bind:click="handleApprove"
-                data-status="0"
-                disabled="{{!record}}"
-            > 同意 </van-button>
-            <van-button 
-                size="small" 
-                bind:click="handleClear"  
-                disabled="{{!record}}" 
-                bind:click="handleApprove"
-                data-status="1"
-            > 拒绝 </van-button>
-        </view>
-    </view>
 </view>
 
 

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

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
       })
     },
     

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

pages/workBench/components/recharge/index.wxml

@@ -1,9 +1,19 @@
 <!--pages/workBench/components/recharge/index.wxml-->
-<segmented 
+<view style="">
-  list="{{segmentedList}}" 
+  <view class="typeQuery">
-  active="{{active}}" 
+      <van-row>
-  bind:change="handleChange"  
+        <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}}" />
 <approve status="{{1}}" wx:if="{{active === 1}}" />

pages/workBench/components/recharge/index.wxss

@@ -1 +1,27 @@
-/* pages/workBench/components/recharge/index.wxss */
+/* 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;
+  }

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;
       }
@@ -122,11 +123,10 @@ Component({
     },
     async handleMeterSwitchOn() {
       const that = this;
-      const { meter, list } = this.data;
+      const { meter, meterName } = this.data;
-      const item = list.find(ele => ele.id === meter)
       wx.showModal({
         title: '提示',
-        content: `您确认要对${item?.address || 当前电表}进行合闸吗？`,
+        content: `您确认要对${meterName || 当前电表}进行合闸吗？`,
         complete: async (res) => {
           if (res.cancel) {
             
@@ -149,11 +149,10 @@ Component({
     },
     async handleMeterSwitchOff() {
       const that = this;
-      const { meter, list } = this.data;
+      const { meter, meterName } = this.data;
-      const item = list.find(ele => ele.id === meter)
       wx.showModal({
         title: '提示',
-        content: `您确认要对${item?.address || 当前电表}进行拉闸吗？`,
+        content: `您确认要对${meterName || 当前电表}进行拉闸吗？`,
         complete: async (res) => {
           if (res.cancel) {
             return;

pages/workBench/components/record/index.json

@@ -10,6 +10,9 @@
     "empty": "/components/empty/index",
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
-    "van-tag": "@vant/weapp/tag/index"
+    "van-tag": "@vant/weapp/tag/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }

pages/workBench/components/record/index.wxml

@@ -1,142 +1,97 @@
 <!--pages/workBench/components/record/index.wxml-->
-<van-field
+<searchSelectWrapper 
-    value="{{ parkName }}"
+    label="园区" 
     placeholder="请选择园区"
-    label="园区"
+    text="{{parkName}}"
-    readonly
+    bind:search="onParkFocus"
-    border="{{ false }}"
+/>
-    use-button-slot
-    title-width="100rpx"
->
-    <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-      选择
-    </van-button>
-</van-field>
 
 <van-empty wx:if="{{!park}}" description="选择园区后查看" />
 <view wx:else>
-    <van-field
+    <searchSelectWrapper 
-        value="{{ meterName }}"
+        label="电表" 
         placeholder="请选择电表"
-        label="电表"
+        text="{{meterName}}"
-        readonly
+        bind:search="onMeterFocus"
-        border="{{ false }}"
+    />
-        use-button-slot
-        title-width="100rpx"
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onMeterFocus">
-        选择
-        </van-button>
-    </van-field>
     <van-empty wx:if="{{!meter}}" description="选择电表后查看" />
-    <view>
+    <view wx:else>
         <view wx:if="{{list.length}}">
-            <van-radio-group value="{{ radio }}" bind:change="onChangeSelectMeter">
+            <view class="operate">
-                <view class="classWrapper" wx:for="{{list}}" wx:key="id">
+                <view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
-                    <van-field
+                    <van-button 
-                        value="{{item.tenement.name}}"
+                        type="info" 
-                        label="商户名称"
+                        size="small" 
-                        readonly
+                        style="margin-right: 30rpx;" 
-                        title-width="140rpx"
+                        bind:click="handleMeterSwitchOn"
-                    />
+                        disabled="{{!meter}}"
-                    <van-field
+                    > 合闸 </van-button>
-                        value="商户电表"
+                    <van-button size="small" bind:click="handleClear"  disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button>
-                        label="电表类型"
-                        readonly
-                        wx:if="{{item.type === 0}}"
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="公摊电表"
-                        label="电表类型"
-                        readonly
-                        wx:if="{{item.type === 2}}"
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="园区电表"
-                        label="电表类型"
-                        readonly
-                        wx:else
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="{{item.meterNo}}"
-                        label="表号"
-                        readonly
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="{{item.address}}"
-                        label="表计地址"
-                        readonly
-                        title-width="140rpx"
-                    />
-                     <van-field
-                        value="{{item.meterSn}}"
-                        label="SN"
-                        readonly
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="{{item.amount}}"
-                        label="表字"
-                        readonly
-        
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="{{item.money}}"
-                        label="电表余额"
-                        readonly
-    
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="合闸"
-                        label="合闸状态"
-                        readonly
-                        wx:if="{{item.onPosition === 0}}"
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="拉闸"
-                        label="合闸状态"
-                        readonly
-                        wx:else
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="在线"
-                        label="在线状态"
-                        readonly
-                        wx:if="{{item.canConnect}}"
-                        title-width="140rpx"
-                    />
-                    <van-field
-                        value="失联"
-                        label="在线状态"
-                        readonly
-                        wx:else
-                        title-width="140rpx"
-                    />
                 </view>
+            </view> 
+            <view class="customTable" wx:for="{{list}}" wx:key="id">
+                <view class="customTableTile">
+                    <van-row>
+                        <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>
+                <view class="customTableContent">
+                    <van-row >
+                        <van-col span="24">
+                            <view class="tableRow">
+                                <van-row gutter="5">
+                                    <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>
+                        </van-col>
+                        <van-col span="24">
+                            <view class="tableRow">
+                                <van-row gutter="5">
+                                    <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>
+                        </van-col>
+                        <van-col span="24">
+                            <view class="tableRow">
+                                <van-row gutter="5">
+                                    <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>
+                        </van-col>
+                        <van-col span="24">
+                            <view class="tableRow">
+                                <van-row gutter="5">
+                                    <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>
                 
-            </van-radio-group>
+          
+                    </van-row>
+                </view>
+            </view>
         </view>
         <empty bind:refresh="init" wx:else />
-        <view class="operate">
+        
-            <view style="margin-top: 60rpx; margin-bottom: 60rpx;display: flex; justify-content: center; align-items: center;">
-                <van-button 
-                    type="info" 
-                    size="small" 
-                    style="margin-right: 30rpx;" 
-                    bind:click="handleMeterSwitchOn"
-                    disabled="{{!meter}}"
-                > 合闸 </van-button>
-                <van-button size="small" bind:click="handleClear"  disabled="{{!meter}}" bind:click="handleMeterSwitchOff"> 拉闸 </van-button>
-            </view>
-        </view> 
     </view>
 </view>
 

pages/workBench/components/record/index.wxss

@@ -39,3 +39,25 @@
     word-break: break-all;
     text-align: center;
 }
+
+.customTable {
+    margin: 20rpx;
+}
+
+.customTableTile {
+    background-color: var(--light-green);
+    padding: 16rpx;
+    box-sizing: border-box;
+    font-weight: 700;
+}
+
+.tableRow {
+    padding: 16rpx;
+    border: 1rpx solid #ccc;
+    border-top: 0rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }

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;

pages/workBench/components/tenement/index.js

@@ -92,7 +92,8 @@ Component({
       this.setData({
         kaihuVisible: true,
         editType: "add",
-        title: "开户"
+        title: "开户",
+        defaultValue: { feeType: 0, feeTypeName: "华昌宝能收费" }
       })
     },
     startUpdateInfo() {

pages/workBench/components/tenement/index.json

@@ -7,6 +7,9 @@
     "van-empty": "@vant/weapp/empty/index",
     "kaihu": "./components/kaihu/index",
     "bindMeter": "./components/bindMeter/index",
-    "unBindMeter": "./components/unBindMeter/index"
+    "unBindMeter": "./components/unBindMeter/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "searchSelectWrapper": "/components/searchSelectWrapper/index"
   }
 }

pages/workBench/components/tenement/index.wxml

@@ -1,31 +1,17 @@
 <!--pages/workBench/components/tenement/index.wxml-->
 <view>
-    <van-field
+    <searchSelectWrapper 
-        required
-        value="{{ parkName }}"
         label="园区"
         placeholder="请选择园区"
-        border="{{ true }}"
+        text="{{ parkName }}"
-        readonly
+        bind:search="onParkFocus"
-        use-button-slot
+    />
-    >
+    <searchSelectWrapper 
-        <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-          选择
-        </van-button>
-    </van-field>
-    <van-field
-        required
-        value="{{ tenementName }}"
         label="商户"
         placeholder="请选择商户"
-        border="{{ true }}"
+        text="{{ tenementName }}"
-        readonly
+        bind:search="onTenementFocus"
-        use-button-slot
+    />
-    >
-        <van-button slot="button" size="small" type="info" bind:click="onTenementFocus">
-            选择
-        </van-button>
-    </van-field>
 </view>
 <view style="display: flex; align-items: center;margin: 20rpx">
     <view wx:if="{{tenement}}">
@@ -46,39 +32,54 @@
 </view>
 <van-empty wx:if="{{!tenement}}" description="选择园区和商户后查看" />
 <view wx:else>
-    <van-field
+    <view class="customTable">
-        value="{{tenementInfo.fullName}}"
+        <view class="customTableTile">
-        label="商户名称"
+            <van-row>
-        readonly
+                <van-col span="24">
-        title-width="140rpx"
+                    <view class="tableTitleRow">
-    />
+                        <view class="tbody">
-    
-    <van-field
-        value="{{tenementInfo.shortName}}"
-        label="商户简称"
-        readonly
-        title-width="140rpx"
-    />
-    <van-field
-        value="{{tenementInfo.phone}}"
-        label="预留电话"
-        readonly
-        title-width="140rpx"
-    />
-    <view wx:if="{{meterList.length}}">
-        <view class="tableWrapper">
-            <view class="table">
-                <view class="thead">
-                    <view class="th" style="width: 250rpx"> 电表地址 </view>
-                    <view class="th" style="width: 250rpx"> SN </view>
-                    <view class="th" style="width: 200rpx"> 操作 </view>
-                </view>
-                <view class="tbody">
-                    <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
-                        <block wx:for="{{meterList}}" wx:for-index="itemIndex" wx:key="item">
                             <view class="tr">
-                                <view class="th" style="width: 250rpx"> {{ item.address }} </view>
+                                <view class="th" style="width: 250rpx;text-align: center;"> {{tenementInfo.shortName}} </view>
-                                <view class="th" style="width: 250rpx"> {{ item.meterSn }} </view>
+                                <view> {{tenementInfo.fullName}} </view>
+                            </view>
+                        </view>
+                    </view>
+                </van-col>
+                <van-col span="24">
+                    <view class="tableTitleRow">
+                        <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> -->
+                    </view>
+                </van-col>
+     
+            </van-row>
+        </view>
+        <view class="customTableContent">
+       
+            <van-row>
+                <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 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" 
@@ -90,12 +91,11 @@
                                     </view>
                                 </view>
                             </view>
-                        </block>
+                        </view>
-                    </van-radio-group>
+                    </block>
-                </view>
+                </van-radio-group>
-            </view>
+            </van-row>
         </view>
-    
     </view>
 </view>
 <search-select 
@@ -103,6 +103,7 @@
     title="{{title}}" 
     type="{{type}}" 
     park="{{park}}"
+    isBack="{{true}}"
     bindconfirm="onConfirm"
     bindcancel="onCancel"
 />

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;
@@ -42,4 +38,33 @@
 
 .primaryTextBtn {
     color: #1989fa;
-}
+}
+
+
+.customTable {
+    margin: 20rpx;
+    font-size: 32rpx;
+}
+
+.customTableTile {
+    background-color: var(--light-green);
+    box-sizing: border-box;
+    font-weight: 700;
+}
+
+.tableTitleRow {
+    padding: 16rpx;
+}
+
+.tableRow {
+
+    padding: 16rpx;
+    border: 1rpx solid #ccc;
+    border-top: 0rpx;
+    font-size: 32rpx;
+}
+
+page {
+    background-color: rgb(228,240,236);
+    font-size: 32rpx;
+  }

pages/workBench/index.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    active: 0
+    active: 1,
   },
 
   /**