From 886a03cf162767a2e0fc9f316c4971366b118d66 Mon Sep 17 00:00:00 2001
From: ZiHangQin <1420014281@qq.com>
Date: Tue, 22 Jul 2025 08:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=20->=20=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E5=AE=A1=E6=A0=B8=20->=20=E5=B7=B2=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=87=E7=AD=BE=E5=AD=97=E4=BD=93=E7=BC=A9?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/accountingCard/index.js        |  33 +++--
 .../components/accountingCard/index.wxml      | 124 ++++++++++--------
 .../components/accountingCard/index.wxss      |   2 +-
 .../components/reading/index.wxml             |  17 ++-
 pages/my/index.wxml                           |   2 +-
 pages/rechargeDetail/index.wxml               |   4 +-
 .../recharge/components/approve/index.js      |   2 +-
 .../recharge/components/approve/index.wxml    |  27 ++--
 .../recharge/components/approve/index.wxss    |  13 +-
 project.private.config.json                   |  35 +++++
 10 files changed, 154 insertions(+), 105 deletions(-)

diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.js b/childPackage/pages/electricQuery/components/accountingCard/index.js
index 922326c..e1ed51e 100644
--- a/childPackage/pages/electricQuery/components/accountingCard/index.js
+++ b/childPackage/pages/electricQuery/components/accountingCard/index.js
@@ -1,24 +1,23 @@
 // pages/electricQuery/components/accountingCard/index.js
 Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        data: Object
+    },
 
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    data: Object
-  },
+    /**
+     * 组件的初始数据
+     */
+    data: {
 
-  /**
-   * 组件的初始数据
-   */
-  data: {
+    },
 
-  },
+    /**
+     * 组件的方法列表
+     */
+    methods: {
 
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
+    }
 })
\ No newline at end of file
diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.wxml b/childPackage/pages/electricQuery/components/accountingCard/index.wxml
index 1146bb3..d49642f 100644
--- a/childPackage/pages/electricQuery/components/accountingCard/index.wxml
+++ b/childPackage/pages/electricQuery/components/accountingCard/index.wxml
@@ -1,72 +1,86 @@
 <!--pages/electricQuery/components/accountingCard/index.wxml-->
 <view class="wrapper">
     <view class="title">
-        <span>{{data.meter.address}}</span><span class="tableContent" style="font-size: 30rpx; margin-left: 100rpx;">电表编号：{{data.meter.sn}}</span>
+        <span>{{data.meter.address}}</span>
+        <span style="font-size: 30rpx; margin-left: 100rpx;">电表编号：{{data.meter.sn}}</span>
     </view>
     <van-row>
-        <view class="table-header">
+        <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-col span="7">
-            <view class="tableTitle"> 初始余额 </view>
-        </van-col>
-        <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>
 
-    <van-row>
-        <van-col span="7">
-            <view class="tableTitle"> 累计充值金额 </view>
-        </van-col>
-        <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 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.startMoney}} </view>
+            </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateStartMoneyAt || '--'}} </view>
+            </van-col>
+        </van-row>
+    </view>
 
-    <van-row>
-        <van-col span="7">
-            <view class="tableTitle"> 电费 </view>
-        </van-col>
-        <van-col span="10">
-            <view class="tableContent"> {{data.electricMoney}} </view>
-        </van-col>
-        <van-col span="7">
-            <view calss="tableContent"> {{data.updateElectricMoneyAt}} </view>
-        </van-col>
-    </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="10">
+                <view class="tableContent"> {{data.rechargeMoney}} </view>
+            </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateRechargeMoneyAt || '--'}} </view>
+            </van-col>
+        </van-row>
+    </view>
 
-    <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 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.electricMoney}} </view>
+            </van-col>
+            <van-col span="7">
+                <view calss="tableContent"> {{data.updateElectricMoneyAt  || '--'}} </view>
+            </van-col>
+        </van-row>
+    </view>
 
-    <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 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>
\ No newline at end of file
diff --git a/childPackage/pages/electricQuery/components/accountingCard/index.wxss b/childPackage/pages/electricQuery/components/accountingCard/index.wxss
index bd91984..776e121 100644
--- a/childPackage/pages/electricQuery/components/accountingCard/index.wxss
+++ b/childPackage/pages/electricQuery/components/accountingCard/index.wxss
@@ -17,7 +17,7 @@
 }
 
 .tableContent {
-  margin-top: 10rpx;
+  margin-top: 25rpx;
   margin-bottom: 20rpx;
   text-align: center;
   font-size: 32rpx;
diff --git a/childPackage/pages/electricQuery/components/reading/index.wxml b/childPackage/pages/electricQuery/components/reading/index.wxml
index b73f004..c68d434 100644
--- a/childPackage/pages/electricQuery/components/reading/index.wxml
+++ b/childPackage/pages/electricQuery/components/reading/index.wxml
@@ -75,7 +75,6 @@
         border="{{ false }}"
         label="当前表字(总)"
         readonly
-        wx:if="{{park.meter04kvType !== 1}}"
       />
 
       <van-field
@@ -90,14 +89,14 @@
         border="{{ false }}"
         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}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
 
       <van-field
@@ -105,14 +104,14 @@
         border="{{ false }}"
         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}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
 
       <van-field
@@ -120,14 +119,14 @@
         border="{{ false }}"
         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}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
 
       <van-field
@@ -135,14 +134,14 @@
         border="{{ false }}"
         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}}"
+        wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
       />
       <view class="text">上次抄表记录起,至现在时间内的用电量</view>
     </van-cell-group>
diff --git a/pages/my/index.wxml b/pages/my/index.wxml
index 5c0684b..b898aa1 100644
--- a/pages/my/index.wxml
+++ b/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
diff --git a/pages/rechargeDetail/index.wxml b/pages/rechargeDetail/index.wxml
index 41cf703..c40f38a 100644
--- a/pages/rechargeDetail/index.wxml
+++ b/pages/rechargeDetail/index.wxml
@@ -11,8 +11,8 @@
     border="{{ false }}"
   />
   <van-field
-    value="{{detail.meter.code}}"
-    label="电表Sn"
+    value="{{detail.meter.sn}}(SN)"
+    label="电表编号"
     readonly
     autosize="{{true}}"
     type="textarea"
diff --git a/pages/workBench/components/recharge/components/approve/index.js b/pages/workBench/components/recharge/components/approve/index.js
index 351877d..0a156f7 100644
--- a/pages/workBench/components/recharge/components/approve/index.js
+++ b/pages/workBench/components/recharge/components/approve/index.js
@@ -120,7 +120,7 @@ Component({
             }
             this.setData({
                 list: data.map(item => {
-                    item.topTime = dayjs(item.topTime).format("MM-DD HH:mm:ss")
+                    item.topTime = dayjs(item.topTime).format("MM-DD")
                     return item
                 }),
                 total: total,
diff --git a/pages/workBench/components/recharge/components/approve/index.wxml b/pages/workBench/components/recharge/components/approve/index.wxml
index 9849d66..6e2a30a 100644
--- a/pages/workBench/components/recharge/components/approve/index.wxml
+++ b/pages/workBench/components/recharge/components/approve/index.wxml
@@ -13,33 +13,34 @@
         <view class="tableWrapper">
             <view class="table">
                 <view class="thead">
-                    <view class="th" style="flex: 0 0 100rpx;"> </view>
-                    <view class="th" style="flex: 0 0 200rpx;"> 商户名字 </view>
-                    <view class="th" style="flex: 0 0 250rpx;"> 充值金额 </view>
-                    <view class="th" style="flex: 0 0 350rpx; display: {{status === 1 ? 'block' : 'none'}};">状态</view>
-                    <view class="th"  style="flex: 0 0 250rpx;">提交时间</view>
-                    <view class="th"style="flex: 1; justify-content: flex-end; display: flex; align-items: center;"> 操作 </view>
+                    <view class="th" style="flex: 0 0 80rpx; display: {{status === 2 ? 'block' : 'none'}};"> </view>
+                    <!-- <view class="th" style="flex: 0 0 0rpx; display: {{status === 1 ? 'block' : 'none'}};"> </view> -->
+                    <view class="th" style="flex: 0 0 130rpx;"> 商户名字</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" style="display: flex; align-items: center;">
-                                <view class="th" style="flex: 0 0 100rpx;">
+                            <view class="tr" style="display: flex; align-items: center; ">
+                                <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="flex: 0 0 200rpx;">
+                                <view class="th" style="flex: 0 0 130rpx;">
                                     {{ item.tenement.shortName }}
                                 </view>
-                                <view class="th" style="flex: 0 0 250rpx;">
+                                <view class="th" style="flex: 0 0 150rpx;">
                                     {{ item.money }}
                                 </view>
-                                <view class="th" style="flex: 0 0 350rpx; display: {{status === 1 ? 'block' : 'none'}};">
+                                <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 250rpx; font-size: 30rpx;">
+                                <view class="th" style="flex: 0 0 150rpx; font-size: 30rpx;">
                                     {{item.topTime}}
                                 </view>
-                                <view class="th" style="flex: 1; justify-content: flex-end; display: flex; align-items: center;">
+                                <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>
diff --git a/pages/workBench/components/recharge/components/approve/index.wxss b/pages/workBench/components/recharge/components/approve/index.wxss
index bb7ede4..641964d 100644
--- a/pages/workBench/components/recharge/components/approve/index.wxss
+++ b/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;
@@ -55,11 +55,12 @@
 /* 基础标签样式 */
 .tag {
     display: inline-block;
-    padding: 8px 16px;
-    margin-right: 12px;
+    padding: 4px 5px;
+    margin-right: 0px;
     border-radius: 16px;
     background: #07c160;
     color: white;
+    font-size: 25rpx;
   }
   
   /* 激活状态样式 */
diff --git a/project.private.config.json b/project.private.config.json
index 09bced0..7cbcbb6 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -30,6 +30,41 @@
           "scene": null,
           "launchMode": "default"
         },
+        {
+          "name": "pages/workBench/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": "pages/workBench/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": "pages/workBench/index",
+          "pathName": "pages/workBench/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "childPackage/pages/electricQuery/index",
           "pathName": "childPackage/pages/electricQuery/index",