Merge branch 'dev' of https://git.archgrid.xyz/zly/electricity_bill_calc_wx into dev

childPackage/pages/billDetail/index.wxml

@@ -11,7 +11,7 @@
     </view>
     <view class="address">
       <view class="label">
-        用电地址：
+        商户地址：
       </view>
       <view class="value"> {{ detail.tenement.address }} </view>
     </view>

childPackage/pages/electricQuery/components/accountingCard/index.js

@@ -1,6 +1,5 @@
 // pages/electricQuery/components/accountingCard/index.js
 Component({
-
     /**
      * 组件的属性列表
      */

childPackage/pages/electricQuery/components/accountingCard/index.wxml

@@ -1,41 +1,86 @@
 <!--pages/electricQuery/components/accountingCard/index.wxml-->
 <view class="wrapper">
     <view class="title">
-    {{data.meter.address}}
+        <span>{{data.meter.address}}</span>
+        <span style="font-size: 30rpx; margin-left: 100rpx;">电表编号：{{data.meter.sn}}</span>
     </view>
+    <van-row>
+        <view class="table-header" style="border-bottom: 2rpx solid #000; ">
+            <view class="table-header-row">
+                <text class="table-header-cell">类目</text>
+                <text class="table-header-cell">金额</text>
+                <text class="table-header-cell">更新时间</text>
+            </view>
+        </view>
+    </van-row>
+
+    <view style="border-bottom: 2rpx solid rgba(12, 236, 188, 0.26); ">
         <van-row>
             <van-col span="7">
                 <view class="tableTitle"> 初始余额 </view>
             </van-col>
-    <van-col span="16">
+            <van-col span="10">
                 <view class="tableContent"> {{data.startMoney}} </view>
             </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateStartMoneyAt || '--'}} </view>
+            </van-col>
         </van-row>
+    </view>
+
+    <view style="border-bottom: 2rpx solid rgba(12, 236, 188, 0.26); ">
         <van-row>
             <van-col span="7">
-      <view class="tableTitle"> 储值累计金额 </view>
+                <view class="tableTitle"> 累计充值金额 </view>
             </van-col>
-    <van-col span="16">
+            <van-col span="10">
                 <view class="tableContent"> {{data.rechargeMoney}} </view>
             </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateRechargeMoneyAt || '--'}} </view>
+            </van-col>
         </van-row>
+    </view>
+
+    <view style="border-bottom: 2rpx solid rgba(12, 236, 188, 0.26); ">
         <van-row>
             <van-col span="7">
                 <view class="tableTitle"> 电费 </view>
             </van-col>
-    <van-col span="16">
+            <van-col span="10">
                 <view class="tableContent"> {{data.electricMoney}} </view>
             </van-col>
-  </van-row>
-  <van-row>
-   
             <van-col span="7">
-      <view class="tableTitle"> 账务余额 </view>
+                <view calss="tableContent"> {{data.updateElectricMoneyAt  || '--'}} </view>
-    </van-col>
-
-   
-    <van-col span="16">
-      <view class="tableContent">  {{data.currentMoney}} </view>
             </van-col>
         </van-row>
     </view>
+
+    <view style="border-bottom: 2rpx solid rgba(12, 236, 188, 0.26); ">
+        <van-row>
+            <van-col span="7">
+                <view class="tableTitle"> 账务余额 </view>
+            </van-col>
+            <van-col span="10">
+                <view class="tableContent"> {{data.accountMoney}} </view>
+            </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateAccountMoneyAt  || '--'}} </view>
+            </van-col>
+        </van-row>
+    </view>
+
+    <view style="border-bottom: 2rpx solid rgba(12, 236, 188, 0.26); ">
+        <van-row>
+            <van-col span="7">
+                <view class="tableTitle"> 电表余额 </view>
+            </van-col>
+            <van-col span="10">
+                <view class="tableContent"> {{data.meterMoney}} </view>
+            </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateMeterMoneyAt  || '--'}} </view>
+            </van-col>
+        </van-row>
+    </view>
+</view>

childPackage/pages/electricQuery/components/accountingCard/index.wxss

@@ -17,8 +17,25 @@
 }
 
 .tableContent {
-  margin-top: 10rpx;
+  margin-top: 25rpx;
   margin-bottom: 20rpx;
   text-align: center;
   font-size: 32rpx;
 }
+.table-header {
+    display: flex;
+    width: 100%;
+    background-color: #f5f5f5;
+    border-bottom: 1rpx solid #eaeaea;
+  }
+  .table-header-row {
+    display: flex;
+    width: 100%;
+  }
+  .table-header-cell {
+    flex: 1;
+    text-align: center;
+    padding: 20rpx 0;
+    font-size: 25rpx;
+    color: #333;
+  }

childPackage/pages/electricQuery/components/reading/index.js

@@ -35,7 +35,7 @@ Component({
     meterReadingHeader: [
       { key: 'address', title: '电表地址', renderBody: (item) => item.meter?.address },
       { title: '倍率', key: 'ratio' },
-      { key: 'number', title: '抄表记录' },
+      { key: 'number', title: '当前表字' },
     ],
     meterReadingList: [],
     yearMonthDayReading: dayjs().format("YYYY-MM-DD"),

childPackage/pages/electricQuery/components/reading/index.wxml

@@ -49,54 +49,101 @@
         label="地址"
         readonly
       />
+      <van-field
+        value="{{ readingDetail.meter.sn }}（SN）"
+        border="{{ false }}"
+        label="编号"
+        readonly
+      />
+
       <van-field
         value="{{ readingDetail.readAt }}"
         border="{{ false }}"
         label="时间"
         readonly
       />
+
       <van-field
         value="{{ readingDetail.ratio }}"
         border="{{ false }}"
         label="倍率"
         readonly
       />
+     
       <van-field
         value="{{ readingDetail.number }}"
         border="{{ false }}"
-        label="表字"
+        label="当前表字(总)"
+        readonly
+      />
+
+      <van-field
+        value="{{ readingDetail.overall }}"
+        border="{{ false }}"
+        label="总用电量"
         readonly
-        wx:if="{{park.meter04kvType !== 1}}"
       />
      
       <van-field
         value="{{ readingDetail.sharp }}"
         border="{{ false }}"
-        label="表字（尖）"
+        label="当前表字(尖)"
         readonly
-        wx:if="{{park.meter04kvType === 1}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
+      <van-field
+        value="{{ readingDetail.sharpAmount }}"
+        border="{{ false }}"
+        label="尖用电量"
+        readonly
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
+      />
+
       <van-field
         value="{{ readingDetail.peak }}"
         border="{{ false }}"
-        label="表字（峰）"
+        label="当前表字(峰)"
         readonly
-        wx:if="{{park.meter04kvType === 1}}"
+        wx:if="{{park.meter04kvType === 1 || park.meter04kvType === 2}}"
       />
+      <van-field
+        value="{{ readingDetail.peakAmount }}"
+        border="{{ false }}"
+        label="峰用电量"
+        readonly
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
+      />
+
       <van-field
         value="{{ readingDetail.flat }}"
         border="{{ false }}"
-        label="表字（平）"
+        label="当前表字(平)"
         readonly
-        wx:if="{{park.meter04kvType === 1}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
+      <van-field
+        value="{{ readingDetail.flatAmount }}"
+        border="{{ false }}"
+        label="平用电量"
+        readonly
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
+      />
+
       <van-field
         value="{{ readingDetail.valley }}"
         border="{{ false }}"
-        label="表字（谷）"
+        label="当前表字(谷)"
         readonly
-        wx:if="{{park.meter04kvType === 1}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
+      <van-field
+        value="{{ readingDetail.valleyAmount }}"
+        border="{{ false }}"
+        label="谷用电量"
+        readonly
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
+      />
+      <view class="text">上次抄表记录起,至现在时间内的用电量</view>
     </van-cell-group>
   
   </view>

childPackage/pages/electricQuery/components/reading/index.wxss

@@ -93,3 +93,10 @@ page {
     display:block; 
     clear:both
   }
+
+  .text{
+    font-size: 28rpx;
+    color: #999999;
+    margin: 10rpx 0;
+    text-align: center;
+  }

childPackage/pages/electricQuery/index.js

@@ -142,14 +142,14 @@ Page({
       const times = [...new Set(data?.map(item => item.time))].
       map(item => Number(item.replace(point, ""))).
       sort((a, b) => a - b).
-      map(ele => `${ele}${point}`.padStart(2, "0"));
+      map(ele => `${ele}${point}`.padStart(3, "0"));
- 
+      console.log(times)
       const options  = {
         tooltip: {
           trigger: 'axis'
         },
         legend: {
-          data: parkInfo?.category === 1 ? ["尖", "峰", "平", "谷"] : data?.map(item => item?.meter?.address),
+          data:  data?.map(item => item?.meter?.address),
         },
         grid: {
           left: '3%',
@@ -165,34 +165,13 @@ Page({
         yAxis: {
           type: 'value'
         },
-        series: parkInfo?.category === 1 ? [
+        series: ids?.map(item => {
-          {
-            name: "尖",
-            type: 'line',
-            data: data?.map(item => Number(item?.critical || 0))
-          },
-          {
-            name: "峰",
-            type: 'line',
-            data: data?.map(item => Number(item?.peak || 0))
-          },
-          {
-            name: "平",
-            type: 'line',
-            data: data?.map(item => Number(item?.flat || 0))
-          },
-          {
-            name: "谷",
-            type: 'line',
-            data: data?.map(item => Number(item?.valley || 0))
-          }
-        ] : ids?.map(item => {
           const element = data?.find(i => i?.meter?.id === item)
           const list = data?.filter(ele => ele?.meter?.id === item)
           const newList = [...times].map(item => {
             const exist = list.find(ele => ele.time === item)
             if (exist) {
-              return exist.number;
+              return Number(exist.critical)+ Number(exist.peak)+Number(exist.flat)+Number(exist.valley);
             }
             return null
           })

childPackage/pages/electricQuery/index.wxml

@@ -30,23 +30,25 @@
     <view class="timeQuery" wx:if="{{queryType === 0}}">
       <van-row>
         <van-col span="8">
-          <view class="timeQueryText" style="color: {{timeType === 0 ? '#0958d9' : '#000'}}" bind:tap="changeTimeType" data-type="{{0}}"> 日耗量 </view>
+          <view class="timeQueryText" style="color: {{timeType === 0 ? '#0958d9' : '#000'}}" bind:tap="changeTimeType" data-type="{{0}}"> 日用电量 </view>
         </van-col>
         <van-col span="8">
-          <view class="timeQueryText" style="color: {{timeType === 1 ? '#0958d9' : '#000'}}" bind:tap="changeTimeType" data-type="{{1}}"> 月耗量 </view>
+          <view class="timeQueryText" style="color: {{timeType === 1 ? '#0958d9' : '#000'}}" bind:tap="changeTimeType" data-type="{{1}}"> 月电用量 </view>
         </van-col>
         <van-col span="8">
-          <view class="timeQueryText" style="color: {{timeType === 2 ? '#0958d9' : '#000'}}" bind:tap="changeTimeType" data-type="{{2}}"> 年耗量 </view>
+          <view class="timeQueryText" style="color: {{timeType === 2 ? '#0958d9' : '#000'}}" bind:tap="changeTimeType" data-type="{{2}}"> 年用电量 </view>
         </van-col>
       </van-row>
     </view>
   </view>
   <view wx:if="{{queryType === 0}}">
     <view class="tooltip">
-      不包括线损电量，显示为电表实际消耗电量。仅供参考，实际能耗电量以电费账单为主。如有疑问，请联系客服。
+      不包括线损电量，显示为电表实际消用电量。仅供参考，实际能用电量以电费账单为主。如有疑问，请联系客服。
     </view>
     <view class="timeChooseWrapper">
-      <view> 选择时间 </view>
+      <view wx:if="{{timeType === 0}}"> 选择时间 </view>
+      <view  wx:elif="{{timeType === 1}}"> 选择日期 </view>
+      <view  wx:else="{{timeType === 2}}"> 选择月份 </view>
       <view class="time" bind:tap="clickTime">
         <view class="timeText" wx:if="{{timeType === 0}}"> {{yearMonthDay}} </view>
         <view class="timeText" wx:elif="{{timeType === 1}}"> {{yearMonth}} </view>
@@ -63,7 +65,10 @@
   </view>
   <view wx:elif="{{queryType === 2}}">
     <view class="tooltip">
-      账务余额更新时间为：每次预存电费后，每次账单发布后，剩余的实际金额。电表余额与账务余额相差较大的用户，每半年统一处理一次。
+        账务余额更新时间为：每次预存电费后，每次发布账单后剩余的实际金额。
+    </view>
+    <view class="tooltip">
+        计算公式：账务余额 = 初始余额 + 累充充值金额 - 电费
     </view>
   </view>
   
@@ -95,7 +100,7 @@
       />
     </view>
     <view class="sum">
-      合计：表计数量：{{meterNumber}}，耗电量：{{electricNumber}}
+      合计：表计数量：{{meterNumber}}，用电量：{{electricNumber}}
     </view>
   </view>
   <view wx:if="{{queryType === 1}}">

pages/my/index.wxml

@@ -88,7 +88,7 @@
     <van-cell title="退出登录" icon="revoke" value="" is-link bind:tap="logout" />
   </view>
 
-  <!-- <van-dialog id="van-dialog" /> -->
+  <van-dialog id="van-dialog" />
 </view>
 
 <van-dialog

pages/rechargeDetail/index.wxml

@@ -11,7 +11,7 @@
     border="{{ false }}"
   />
   <van-field
-    value="{{detail.meter.code}}"
+    value="{{detail.meter.sn}}(SN)"
     label="电表编号"
     readonly
     autosize="{{true}}"

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

@@ -1,8 +1,18 @@
 // pages/workBench/components/recharge/components/waitApprove/index.js
-import { alertInfo, alertSuccess, loadingFunc } from "../../../../../../utils/index";
+import {
-import { getRechargeApproveList, rechargeApprove } from "../../../../../../service/recharge"
+    alertInfo,
+    alertSuccess,
+    loadingFunc
+} from "../../../../../../utils/index";
+import {
+    getRechargeApproveList,
+    rechargeApprove
+} from "../../../../../../service/recharge"
 import request from "../../../../../../utils/request"
-const { OK } = request
+import dayjs from "../../../../../../utils/dayjs"
+const {
+    OK
+} = request
 
 // pages/workBench/components/record/index.js
 Component({
@@ -21,7 +31,13 @@ Component({
         keyword: "",
         keywordTemp: "",
         page: 1,
+        currentActionSheet: null,
+        actionItems: [{
+            name: '查看详细',
+            value: 'detail'
+        }],
     },
+
     lifetimes: {
         attached() {
             loadingFunc(async () => {
@@ -41,7 +57,9 @@ Component({
             })
         },
         onConfirm(e) {
-      const { data } = e.detail;
+            const {
+                data
+            } = e.detail;
             const that = this;
             this.setData({
                 parkName: data.name,
@@ -64,7 +82,9 @@ Component({
             })
         },
         onChangeKeyword(e) {
-      this.setData({ keywordTemp: e.detail })
+            this.setData({
+                keywordTemp: e.detail
+            })
         },
         onSearch() {
             const that = this;
@@ -77,14 +97,32 @@ Component({
             })
         },
         async init() {
-      const { page, keyword, park, status } = this.data;
+            const {
-      const { code, message, data, total } = await getRechargeApproveList({ park, page, keyword, status })
+                page,
+                keyword,
+                park,
+                status
+            } = this.data;
+            const {
+                code,
+                message,
+                data,
+                total
+            } = await getRechargeApproveList({
+                park,
+                page,
+                keyword,
+                status
+            })
             if (code !== OK) {
                 alertInfo(message);
                 return;
             }
             this.setData({
-        list: data,
+                list: data.map(item => {
+                    item.topTime = dayjs(item.topTime).format("MM-DD")
+                    return item
+                }),
                 total: total,
                 totalPage: Math.ceil(total / 20)
             })
@@ -101,14 +139,24 @@ Component({
             })
         },
         onApproveConfirm() {
-      const { reason, record } = this.data;
+            const {
+                reason,
+                record
+            } = this.data;
             const that = this;
             if (!reason) {
                 alertInfo("请输入拒绝理由")
                 return;
             }
             loadingFunc(async () => {
-        const { code, message } = await rechargeApprove({ id: record, status: 1, reason })
+                const {
+                    code,
+                    message
+                } = await rechargeApprove({
+                    id: record,
+                    status: 1,
+                    reason
+                })
                 if (code !== OK) {
                     alertInfo(message)
                     return;
@@ -132,7 +180,10 @@ Component({
                 })
                 return;
             }
-      const { record, list } = this.data;
+            const {
+                record,
+                list
+            } = this.data;
             const item = list.find(ele => ele.id === record)
 
             wx.showModal({
@@ -144,7 +195,13 @@ Component({
                     }
                     if (res.confirm) {
                         loadingFunc(async () => {
-              const { code, message } = await rechargeApprove({ id: record, status: 0,  })
+                            const {
+                                code,
+                                message
+                            } = await rechargeApprove({
+                                id: record,
+                                status: 0,
+                            })
                             if (code !== OK) {
                                 alertInfo(message)
                                 return;
@@ -157,8 +214,40 @@ Component({
                 }
             })
         },
+
+        showActionMenu(e) {
+            this.setData({
+                currentActionSheet: e.currentTarget.dataset.id
+            });
+        },
+
+        hideActionMenu() {
+            this.setData({
+                currentActionSheet: null
+            });
+        },
+
+        onMenuSelect(e) {
+            const {
+                value
+            } = e.detail;
+            const id = e.currentTarget.dataset.id;
+
+            if (value === 'detail') {
+                this.jumpToDetail({
+                    currentTarget: {
+                        dataset: {
+                            id
+                        }
+                    }
+                });
+            }
+        },
+
         jumpToDetail(e) {
-      const { id } = e.currentTarget.dataset;
+            const {
+                id
+            } = e.currentTarget.dataset;
             wx.navigateTo({
                 url: '/pages/rechargeDetail/index?id=' + id,
             })

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

@@ -11,6 +11,8 @@
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
     "van-dialog": "@vant/weapp/dialog/index",
-    "searchSelectWrapper": "/components/searchSelectWrapper/index"
+    "searchSelectWrapper": "/components/searchSelectWrapper/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index"    
   }
 }

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

@@ -1,100 +1,66 @@
 <!--pages/workBench/components/recharge/components/waitApprove/index.wxml-->
-<searchSelectWrapper 
+<searchSelectWrapper label="园区" placeholder="请选择园区" text="{{parkName}}" bind:search="onParkFocus" />
-    label="园区" 
-    placeholder="请选择园区"
-    text="{{parkName}}"
-    bind:search="onParkFocus"
-/>
 
-<searchSelectWrapper 
+<searchSelectWrapper label="关键字" placeholder="请输入关键字" text="{{meterName}}" bind:searchKeyword="onSearchKeyword" type="inputSearch" />
-    label="关键字" 
-    placeholder="请输入关键字"
-    text="{{meterName}}"
-    bind:searchKeyword="onSearchKeyword"
-    type="inputSearch"
-/>
 <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 
+                <van-button type="info" size="small" style="margin-right: 30rpx;" bind:click="handleApprove" data-status="0" disabled="{{!record}}"> 同意 </van-button>
-                    type="info" 
+                <van-button size="small" bind:click="handleClear" disabled="{{!record}}" bind:click="handleApprove" data-status="1"> 拒绝 </van-button>
-                    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">
-                    <view class="th" style="width: 70rpx">  </view>
+                    <view class="th" style="flex: 0 0 80rpx; display: {{status === 2 ? 'block' : 'none'}};"> </view>
-                    <view class="th" style="width: 250rpx"> 商户名字 </view>
+                    <!-- <view class="th" style="flex: 0 0 0rpx; display: {{status === 1 ? 'block' : 'none'}};"> </view> -->
-                    <view class="th" style="width: 150rpx"> 充值金额 </view>
+                    <view class="th" style="flex: 0 0 130rpx;"> 商户名字</view>
-                    <view class="th" style="width: 200rpx"> 操作 </view>
+                    <view class="th" style="flex: 0 0 150rpx;"> 充值金额 </view>
+                    <view class="th" style="flex: 0 0 150rpx; display: {{status === 1 ? 'block' : 'none'}};">状态</view>
+                    <view class="th"  style="flex: 0 0 150rpx;">提交时间</view>
+                    <view class="th"style="flex: 0 0 120rpx; justify-content: flex-end; display: flex; align-items: center;"> 操作 </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="tr" style="display: flex; align-items: center; ">
-                                <view class="th" style="width: 70rpx">
+                                <view class="th" style="flex: 0 0 80rpx; ; display: {{status === 2 ? 'block' : 'none'}};">
                                     <van-radio wx:if="{{status === 2}}" name="{{item.id}}"></van-radio>
                                 </view>
-                                <view class="th" style="width: 250rpx"> {{ item.tenement.shortName }} </view>
+                                <view class="th" style="flex: 0 0 130rpx;">
-                                <view class="th" style="width: 150rpx"> {{ item.money }} </view>
+                                    {{ item.tenement.shortName }}
-                                <view class="th" style="width: 200rpx">
+                                </view>
-                                    <view class="primaryTextBtn" bind:tap="jumpToDetail" data-id="{{item.id}}">
+                                <view class="th" style="flex: 0 0 150rpx;">
-                                        查看详细
+                                    {{ item.money }}
-                                    </view>
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx; display: {{status === 1 ? 'block' : 'none'}};">
+                                    <view class="tag">{{item.orderStatus}}</view>
+                                </view>
+                                <view class="th" style="flex: 0 0 150rpx; font-size: 30rpx;">
+                                    {{item.topTime}}
+                                </view>
+                                <view class="th" style="flex: 0 0 120rpx; justify-content: flex-end; display: flex; align-items: center;">
+                                    <van-icon name="ellipsis" size="24px" bind:tap="showActionMenu" data-id="{{item.id}}" class="more-icon" />
+                                    <van-action-sheet show="{{ currentActionSheet === item.id }}" actions="{{ actionItems }}" bind:close="hideActionMenu" bind:select="onMenuSelect" data-id="{{item.id}}" close-on-click-action />
                                 </view>
                             </view>
+
                         </block>
                     </van-radio-group>
                 </view>
             </view>
         </view>
 
-        <pagination 
+        <pagination currentIndex="{{page}}" totalPage="{{totalPage}}" bind:pagingChange="onChangePage" />
-            currentIndex="{{page}}" 
-            totalPage="{{totalPage}}" 
-            bind:pagingChange="onChangePage"  
-        />
 
     </view>
     <empty bind:refresh="init" wx:else />
 
 </view>
 
-<search-select 
+<search-select show="{{show}}" title="{{title}}" type="{{type}}" park="{{park}}" bindconfirm="onConfirm" bindcancel="onCancel" />
-    show="{{show}}" 
-    title="{{title}}" 
-    type="{{type}}" 
-    park="{{park}}"
-    bindconfirm="onConfirm"
-    bindcancel="onCancel"
-/>
 
-<van-dialog
+<van-dialog use-slot title="审核" show="{{ approveShow }}" show-cancel-button bind:close="onApproveClose" bind:confirm="onApproveConfirm">
-  use-slot
+    <van-field label="拒绝理由" value="{{ reason }}" placeholder="请输入拒绝理由" bind:change="onChangeReason" />
-  title="审核"
-  show="{{ approveShow }}"
-  show-cancel-button
-  bind:close="onApproveClose"
-  bind:confirm="onApproveConfirm"
->
-    <van-field
-        label="拒绝理由"
-        value="{{ reason }}"
-        placeholder="请输入拒绝理由"
-        bind:change="onChangeReason"
-    />
 </van-dialog>

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

@@ -1,6 +1,6 @@
 /* pages/workBench/components/recharge/components/waitApprove/index.wxss */
 .table {
-    width: 810rpx;
+    width: 500rpx;
 
 }
 
@@ -17,7 +17,7 @@
 }
 
 .thead  .th {
-    padding: 20rpx;
+    padding: 10rpx;
     white-space: nowrap;
     text-align: center;
     box-sizing: border-box;
@@ -28,11 +28,11 @@
   }
 
 .tbody {
-    width: 810rpx;
+    width: 500rpx;
 }
 
 .tbody .tr {
-    padding: 20rpx;
+    padding: 10rpx;
     border-bottom: 1rpx solid #EEEEEE;
     display: flex;
     align-items: center;
@@ -43,3 +43,28 @@
     word-break: break-all;
     text-align: center;
 }
+
+.more-icon {
+    padding: 20rpx;
+    color: #1989fa;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  
+/* 基础标签样式 */
+.tag {
+    display: inline-block;
+    padding: 4px 5px;
+    margin-right: 0px;
+    border-radius: 16px;
+    background: #07c160;
+    color: white;
+    font-size: 25rpx;
+  }
+  
+  /* 激活状态样式 */
+  .tag.active {
+    background: #07c160;
+    color: white;
+  }

project.config.json

@@ -37,7 +37,15 @@
       }
     ],
     "minifyWXSS": true,
-    "ignoreUploadUnusedFiles": false
+    "ignoreUploadUnusedFiles": false,
+    "compileWorklet": false,
+    "minifyWXML": true,
+    "localPlugins": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "condition": false,
+    "swc": false,
+    "disableSWC": true
   },
   "editorSetting": {
     "tabIndent": "insertSpaces",
@@ -48,5 +56,7 @@
     "ignore": [],
     "include": []
   },
-  "appid": "wxb34b4e70f8a5c6f1"
+  "appid": "wxb34b4e70f8a5c6f1",
+  "libVersion": "development",
+  "simulatorPluginLibVersion": {}
 }

project.private.config.json

@@ -4,57 +4,35 @@
   "setting": {
     "compileHotReLoad": true,
     "urlCheck": false,
-    "skylineRenderEnable": true
+    "skylineRenderEnable": true,
+    "coverView": true,
+    "lazyloadPlaceholderEnable": false,
+    "preloadBackgroundData": false,
+    "autoAudits": false,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": true,
+    "useStaticServer": false,
+    "useLanDebug": false,
+    "showES6CompileOption": false,
+    "checkInvalidKey": true,
+    "ignoreDevUnusedFiles": true,
+    "bigPackageSizeSupport": false
   },
   "libVersion": "development",
   "condition": {
     "miniprogram": {
       "list": [
         {
-          "name": "childPackage/pages/billDetail/index",
+          "name": "pages/workBench/index",
-          "pathName": "childPackage/pages/billDetail/index",
+          "pathName": "pages/workBench/index",
-          "query": "id=R00103882183475201&time=2025-03",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "childPackage/pages/electricQuery/index",
-          "pathName": "childPackage/pages/electricQuery/index",
           "query": "",
-          "launchMode": "default",
+          "scene": null,
-          "scene": null
+          "launchMode": "default"
         },
         {
-          "name": "pages/handleLogin/index",
+          "name": "pages/workBench/index",
-          "pathName": "pages/handleLogin/index",
+          "pathName": "pages/workBench/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/ticket/index",
-          "pathName": "pages/ticket/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/aid/consult/index",
-          "pathName": "pages/aid/consult/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/aid/law/index",
-          "pathName": "pages/aid/law/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/my/index",
-          "pathName": "pages/my/index",
           "query": "",
           "launchMode": "default",
           "scene": null
@@ -74,15 +52,29 @@
           "scene": null
         },
         {
-          "name": "pages/publicTransfer/index",
+          "name": "childPackage/pages/electricQuery/index",
-          "pathName": "pages/publicTransfer/index",
+          "pathName": "childPackage/pages/electricQuery/index",
-          "query": "money=50&meterId=METER00071009940341737&tenementId=T00069259189616641&tenementName=%E5%8D%8E%E6%98%8C%E5%AE%9D%E8%83%BD&park=P00070370277523457",
+          "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "pages/special/index",
+          "name": "pages/workBench/index",
-          "pathName": "pages/special/index",
+          "pathName": "pages/workBench/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "childPackage/pages/electricQuery/index",
+          "pathName": "childPackage/pages/electricQuery/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "childPackage/pages/electricQuery/index",
+          "pathName": "childPackage/pages/electricQuery/index",
           "query": "",
           "launchMode": "default",
           "scene": null

utils/index.js

@@ -47,6 +47,7 @@ export function getConfigByEnv() {
     case 'develop':
       api = "http://localhost:8000"
       // api = "https://zgd.hbhcbn.com/api3"
+      // TODO: 发布正式时使用此路径
     //   api = "https://zgd.hbhcbn.com/wxApi"
       // api = "http://127.0.0.1:4523/m1/4143821-0-default"
       break;