修改样式

components/searchSelectWrapper/index.js

@@ -7,14 +7,23 @@ Component({
   properties: {
     label: String,
     placeholder: String,
-    text: String
+    text: String,
+    fieldType: {
+      type: String,
+      value: "text"
+    },
+    type: {
+      type: String,
+      value: "select"
+    }
   },
 
   /**
    * 组件的初始数据
    */
   data: {
-
+    keyword: "",
+    text: "",
   },
 
   /**
@@ -23,6 +32,17 @@ Component({
   methods: {
     onSearch() {
       this.triggerEvent("search")
+    },
+    onChangeKeyword(e) {
+      this.setData({ keyword: e.detail });
+    },
+    onChangeText(e) {
+      this.setData({ text: e.detail });
+      this.triggerEvent("changeText", e.detail)
+    },
+    onSearchKeyword() {
+      this.triggerEvent("searchKeyword", this.data.keyword)
+      this.setData({ keyword: "" })
     }
   }
 })

components/searchSelectWrapper/index.json

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

components/searchSelectWrapper/index.wxml

@@ -1,9 +1,35 @@
 <!--components/searchSelectWrapper/index.wxml-->
-<view class="wrapper">
+<view class="wrapper" wx:if="{{type === 'select'}}">
-    <view> {{ label }} </view>
+    <view class="label"> {{ 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>
+<view class="wrapper" wx:if="{{type === 'inputSearch'}}">
+    <view class="label"> {{ label }} </view>
+    <view class="inputContent" bind:tap="clickTime">
+        <van-field
+            value="{{ value }}"
+            placeholder="{{placeholder}}"
+            border="{{ false }}"
+            bind:change="onChangeKeyword"
+            custom-style="padding: 0;font-size: 30rpx;line-height: 32rpx;"
+        />
+    </view>
+    <van-button type="info" size="small" bind:click="onSearchKeyword"> 搜索 </van-button>
+</view>
+<view class="wrapper" wx:if="{{type === 'input'}}">
+    <view class="label"> {{ label }} </view>
+    <view class="inputContent" bind:tap="clickTime">
+        <van-field
+            value="{{ value }}"
+            placeholder="{{placeholder}}"
+            border="{{ false }}"
+            type="fieldType"
+            bind:change="onChangeText"
+            custom-style="padding: 0;font-size: 30rpx;line-height: 32rpx;"
+        />
+    </view>
+</view>

components/searchSelectWrapper/index.wxss

@@ -17,6 +17,21 @@
     background-color: #fff;
 }
 
+.inputContent {
+    flex: 1;
+    margin-left: 30rpx;
+    margin-right: 30rpx;
+    display: flex;
+    padding: 0 20rpx;
+    border-radius: 12rpx;
+    border: 1rpx solid #ccc;
+    background-color: #fff;
+}
+  
 .text {
     flex: 1;
 }
+
+.label {
+    width: 120rpx;
+}

pages/workBench/components/account/index.json

@@ -15,6 +15,7 @@
     "updatePhoneModal": "./components/updatePhoneModal/index",
     "van-row": "@vant/weapp/row/index",
     "van-col": "@vant/weapp/col/index",
-    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+    "searchSelectWrapper": "/components/searchSelectWrapper/index",
+    "van-image": "@vant/weapp/image/index"
   }
 }

pages/workBench/components/account/index.wxml

@@ -84,7 +84,7 @@
                                                 data-id="{{item.WechatUserID}}" 
                                                 data-name="{{item.WechatUserName}}" 
                                             >
-                                                移除
+                                            <van-image width="40rpx" height="40rpx" src="/assets/images/stop.png" />
                                             </view>
                                             <view 
                                                 class="primaryTextBtn" 
@@ -93,7 +93,7 @@
                                                 data-name="{{item.WechatUserName}}" 
                                                 style="margin-left: 16rpx;"
                                             >
-                                                设为管理
+                                            <van-image width="40rpx" height="40rpx" src="/assets/images/tihuan.png" />
                                             </view>
                                         </view>
                    

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

@@ -53,6 +53,16 @@ Component({
       })
       this.onCancel();
     },
+    onSearchKeyword(e) {
+      const that = this;
+      that.setData({
+        keyword: e.detail
+      }, () => {
+        loadingFunc(async () => {
+          await that.init();
+        })
+      })
+    },
     onChangeKeyword(e) {
       this.setData({ keywordTemp: e.detail })
     },

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

@@ -1,31 +1,18 @@
 <!--pages/workBench/components/recharge/components/waitApprove/index.wxml-->
-<van-field
+<searchSelectWrapper 
-    value="{{ parkName }}"
-    placeholder="请选择园区"
     label="园区" 
-    readonly
+    placeholder="请选择园区"
-    border="{{ false }}"
+    text="{{parkName}}"
-    use-button-slot
+    bind:search="onParkFocus"
-    title-width="100rpx"
+/>
->
-    <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
-      选择
-    </van-button>
-</van-field>
 
-<van-field
+<searchSelectWrapper 
-    value="{{ keyword }}"
-    placeholder="请输入关键字"
     label="关键字" 
-    border="{{ false }}"
+    placeholder="请输入关键字"
-    use-button-slot
+    text="{{meterName}}"
-    bind:change="onChangeKeyword"
+    bind:searchKeyword="onSearchKeyword"
-    title-width="100rpx"
+    type="inputSearch"
->
+/>
-    <van-button slot="button" size="small" type="info" bind:click="onSearch">
-    搜索
-    </van-button>
-</van-field>
 <view>
     <view wx:if="{{list.length}}">
         <view class="operate" wx:if="{{status === 2}}">
@@ -87,7 +74,6 @@
     
 </view>
 
-
 <search-select 
     show="{{show}}" 
     title="{{title}}" 

pages/workBench/components/recharge/components/reharge/index.js

@@ -32,7 +32,6 @@ Component({
         type: 'park'
       })
     },
-    
     onMeterFocus() {
       const { park } = this.data;
       if (!park) {

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

@@ -1,68 +1,37 @@
 <!--pages/workBench/components/recharge/components/reharge/index.wxml-->
 <van-cell-group>
-  <van-field
+  <searchSelectWrapper 
-    value="{{ parkName }}"
-    placeholder="请选择园区"
     label="园区" 
-    readonly
+    placeholder="请选择园区"
-    border="{{ false }}"
+    text="{{parkName}}"
-    use-button-slot
+    bind:search="onParkFocus"
-    title-width="70rpx"
+  />
-  >
+
-    <van-button slot="button" size="small" type="info" bind:click="onParkFocus">
+  <searchSelectWrapper 
-      选择
-    </van-button>
-  </van-field>
-  <van-field
-    value="{{ meterName }}"
-    placeholder="请选择电表"
     label="电表" 
-    readonly
+    placeholder="请选择电表"
-    border="{{ false }}"
+    text="{{meterName}}"
-    use-button-slot
+    bind:search="onMeterFocus"
-    title-width="70rpx"
+  />
-  >
+  <searchSelectWrapper 
-    <van-button slot="button" size="small" type="info" bind:click="onMeterFocus">
-      选择
-    </van-button>
-  </van-field>
-  <van-field
-    value="{{ money }}"
-    placeholder="请输入金额"
     label="金额" 
-    type="number"
+    placeholder="请输入金额"
-    border="{{ false }}"
+    text="{{meterName}}"
-    use-button-slot
+    fieldType="number"
-    title-width="70rpx"
+    type="input"
-    bind:change="onChangeMoney"
+    bind:changeText="onChangeMoney"
-  >
+  />
-  </van-field>
+  <searchSelectWrapper 
-  <van-field
-    value="{{ payName }}"
-    placeholder="请选择付款方式"
     label="付款方式" 
-    readonly
+    placeholder="请选择付款方式"
-    border="{{ false }}"
+    text="{{payName}}"
-    use-button-slot
+    bind:search="onPayFocus"
-    title-width="140rpx"
+  />
-  >
+  <searchSelectWrapper 
-    <van-button 
-      slot="button" 
-      size="small" 
-      type="info" 
-      bind:click="onPayFocus"
-    >
-      选择
-    </van-button>
-  </van-field>
-  <van-field
-    value="{{ voucherNo }}"
-    placeholder="请输入凭证"
     label="凭证" 
-    border="{{ false }}"
+    placeholder="请输入凭证"
-    use-button-slot
+    type="input"
-    title-width="70rpx"
+    bind:changeText="onChangeVoucherNo"
-    bind:change="onChangeVoucherNo"
   />
 </van-cell-group>
 

pages/workBench/components/record/index.wxml

@@ -6,16 +6,14 @@
     bind:search="onParkFocus"
 />
 
-<van-empty wx:if="{{!park}}" description="选择园区后查看" />
+<searchSelectWrapper 
-<view wx:else>
-    <searchSelectWrapper 
     label="电表" 
     placeholder="请选择电表"
     text="{{meterName}}"
     bind:search="onMeterFocus"
-    />
+/>
-    <van-empty wx:if="{{!meter}}" description="选择电表后查看" />
+<van-empty wx:if="{{!meter}}" description="选择电表后查看" />
-    <view wx:else>
+<view wx:else>
     <view wx:if="{{list.length}}">
         <view class="operate">
             <view style="margin-top: 24rpx; margin-bottom: 24rpx;display: flex; justify-content: center; align-items: center;">
@@ -84,15 +82,12 @@
                             </van-row>
                         </view>
                     </van-col>
-                
-          
                 </van-row>
             </view>
         </view>
     </view>
     <empty bind:refresh="init" wx:else />
     
-    </view>
 </view>
 
 <search-select 

pages/workBench/index.js

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

service/meter.js

@@ -27,6 +27,7 @@ export const getParkSimpleMeterList = async function({park = "", keyword = "", p
   return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}`);
 }
 
+
 // 获取商户下的电表，后台
 export const getBackTenementMeters = async function(park, tenement) {
   return await GET(`/vx/getWorkMeterDetails?park=${park}&tenement=${tenement}`);