From 883461c852236e202cc41fb0240562e6aa36ff5d Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 18 Nov 2024 17:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A4=84=E7=90=86=E7=89=B9=E6=AE=8A?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/searchSelect/index.js              |   2 +-
 components/searchSelect/index.wxss            |   4 +-
 pages/workBench/components/approve/index.js   |   8 +-
 pages/workBench/components/approve/index.wxml | 132 +++++++++---------
 pages/workBench/components/record/index.js    |   3 +
 service/meter.js                              |   4 +-
 service/recharge.js                           |   4 +-
 7 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index 8885541..aef7a6e 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -109,7 +109,7 @@ Component({
         return
       }
       this.setData({
-        columns: parks?.map(item => `${item.meterNo}-${item.address}${item.tenement?.name ? '-' + item.tenement?.name : ''}`),
+        columns: parks?.map(item => `${item.meterNo}-${item.address}${item.shortName ? '-' + item.shortName : ''}`),
         list: parks,
       })
     }
diff --git a/components/searchSelect/index.wxss b/components/searchSelect/index.wxss
index a6bad63..540bed4 100644
--- a/components/searchSelect/index.wxss
+++ b/components/searchSelect/index.wxss
@@ -1 +1,3 @@
-/* components/searchSelect/index.wxss */
\ No newline at end of file
+/* components/searchSelect/index.wxss */
+.van-ellipsis van-picker-column__item {
+}
\ No newline at end of file
diff --git a/pages/workBench/components/approve/index.js b/pages/workBench/components/approve/index.js
index dd00b16..6fbd81c 100644
--- a/pages/workBench/components/approve/index.js
+++ b/pages/workBench/components/approve/index.js
@@ -14,7 +14,7 @@ Component({
   properties: {
 
   },
-
+  
   /**
    * 组件的初始数据
    */
@@ -23,7 +23,11 @@ Component({
     keywordTemp: "",
     page: 1,
   },
-
+  lifetimes: {
+    attached() {
+      this.init();
+    }
+  },
   /**
    * 组件的方法列表
    */
diff --git a/pages/workBench/components/approve/index.wxml b/pages/workBench/components/approve/index.wxml
index f2dd0c0..219b909 100644
--- a/pages/workBench/components/approve/index.wxml
+++ b/pages/workBench/components/approve/index.wxml
@@ -14,82 +14,80 @@
     </van-button>
 </van-field>
 
-<van-empty wx:if="{{!park}}" description="选择园区后查看" />
-<view wx:else>
-    <van-field
-        value="{{ keyword }}"
-        placeholder="请输入关键字"
-        label="关键字"
-        border="{{ false }}"
-        use-button-slot
-        bind:change="onChangeKeyword"
-        title-width="100rpx"
-    >
-        <van-button slot="button" size="small" type="primary" bind:click="onSearch">
-        搜索
-        </van-button>
-    </van-field>
-    <view>
-        <view wx:if="{{list.length}}">
-            <view class="tableWrapper">
-                <view class="table">
-                    <view class="thead">
-                        <view class="th" style="width: 70rpx">  </view>
-                        <view class="th" style="width: 250rpx"> 商户名字 </view>
-                        <view class="th" style="width: 150rpx"> 充值金额 </view>
-                        <view class="th" style="width: 200rpx"> 操作 </view>
-                    </view>
-                    <view class="tbody">
-                        <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
-                            <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
-                                <view class="tr">
-                                    <view class="th" style="width: 60rpx">
-                                        <van-radio wx:if="{{item.orderStatus !== '已退回'}}" name="{{item.id}}"></van-radio>
-                                    </view>
-                                    <view class="th" style="width: 200rpx"> {{ item.tenement.shortName }} </view>
-                                    <view class="th" style="width: 200rpx"> {{ item.money }} </view>
-                                    <view class="th" style="width: 200rpx">
-                                        <view class="primaryTextBtn" bind:tap="jumpToDetail" data-id="{{item.id}}">
-                                            查看详细
-                                        </view>
+<van-field
+    value="{{ keyword }}"
+    placeholder="请输入关键字"
+    label="关键字"
+    border="{{ false }}"
+    use-button-slot
+    bind:change="onChangeKeyword"
+    title-width="100rpx"
+>
+    <van-button slot="button" size="small" type="primary" bind:click="onSearch">
+    搜索
+    </van-button>
+</van-field>
+<view>
+    <view wx:if="{{list.length}}">
+        <view class="tableWrapper">
+            <view class="table">
+                <view class="thead">
+                    <view class="th" style="width: 70rpx">  </view>
+                    <view class="th" style="width: 250rpx"> 商户名字 </view>
+                    <view class="th" style="width: 150rpx"> 充值金额 </view>
+                    <view class="th" style="width: 200rpx"> 操作 </view>
+                </view>
+                <view class="tbody">
+                    <van-radio-group value="{{ record }}" bind:change="onChangeSelectRecharge">
+                        <block wx:for="{{list}}" wx:for-index="itemIndex" wx:key="item">
+                            <view class="tr">
+                                <view class="th" style="width: 60rpx">
+                                    <van-radio wx:if="{{item.orderStatus !== '已退回'}}" name="{{item.id}}"></van-radio>
+                                </view>
+                                <view class="th" style="width: 200rpx"> {{ item.tenement.shortName }} </view>
+                                <view class="th" style="width: 200rpx"> {{ item.money }} </view>
+                                <view class="th" style="width: 200rpx">
+                                    <view class="primaryTextBtn" bind:tap="jumpToDetail" data-id="{{item.id}}">
+                                        查看详细
                                     </view>
                                 </view>
-                            </block>
-                        </van-radio-group>
-                    </view>
+                            </view>
+                        </block>
+                    </van-radio-group>
                 </view>
             </view>
-            
-            <pagination 
-                currentIndex="{{page}}" 
-                totalPage="{{totalPage}}" 
-                bind:pagingChange="onChangePage"  
-            />
-            
         </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="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>
+        
+        <pagination 
+            currentIndex="{{page}}" 
+            totalPage="{{totalPage}}" 
+            bind:pagingChange="onChangePage"  
+        />
+        
+    </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="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>
 
+
 <search-select 
     show="{{show}}" 
     title="{{title}}" 
diff --git a/pages/workBench/components/record/index.js b/pages/workBench/components/record/index.js
index 855b4de..d16e606 100644
--- a/pages/workBench/components/record/index.js
+++ b/pages/workBench/components/record/index.js
@@ -61,6 +61,9 @@ Component({
     },
     async init() {
       const { page, keyword, park } = this.data;
+      if (!park) {
+        return;
+      }
       const { code, message, data, total } = await getParkMeterList({ park, keyword, page })
       if (code !== OK) {
         alertInfo(message);
diff --git a/service/meter.js b/service/meter.js
index 91027a6..3d1191e 100644
--- a/service/meter.js
+++ b/service/meter.js
@@ -18,12 +18,12 @@ export const getTenementMeterList = async function(tid) {
 
 // 获取某一园区下的电表列表
 export const getParkMeterList = async function({park = "", keyword = "", page = 1}) {
-  return await GET(`/equipment/getOperateMeterList?page=${page}&park=${park}&keyword=${keyword}`);
+  return await GET(`/equipment/getOperateMeterList?page=${page}&park=${park}&keyword=${escape(keyword)}`);
 }
 
 // 获取某一园区下的简洁电表列表
 export const getParkSimpleMeterList = async function({park = "", keyword = "", page = 1}) {
-  return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${keyword}`);
+  return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${escape(keyword)}`);
 }
 
 
diff --git a/service/recharge.js b/service/recharge.js
index 5a8ce21..723990e 100644
--- a/service/recharge.js
+++ b/service/recharge.js
@@ -33,8 +33,8 @@ export const handleRecharge = async function(park, data) {
 }
 
 // 获取后台审核列表
-export const getRechargeApproveList = async function({park, page, keyword}) {
-  return await GET(`/wx/getTopExamineList?park=${park}&page=${page}&keyword=${keyword}`)
+export const getRechargeApproveList = async function({park = "", page, keyword}) {
+  return await GET(`/wx/getTopExamineList?park=${park}&page=${page}&keyword=${escape(keyword)}`)
 }
 
 // 对公审核