From 75dab4b1acd8ef27ffd676cc4d4adbad59e3ec43 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 30 Aug 2024 14:39:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=9C=AA=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 childPackage/pages/billDetail/index.js   | 12 ++++++++----
 childPackage/pages/billDetail/index.wxml |  2 +-
 utils/index.js                           |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/childPackage/pages/billDetail/index.js b/childPackage/pages/billDetail/index.js
index 7472ed6..be7ddf3 100644
--- a/childPackage/pages/billDetail/index.js
+++ b/childPackage/pages/billDetail/index.js
@@ -39,13 +39,17 @@ Page({
     this.init(id, time);
   },
   async init(id, time) {
-    const { code, message, detail } = await getReportDetail(id)
+    const { code, message, detail, amount } = await getReportDetail(id)
     if (code !== OK) {
       alertInfo(message)
       return;
     }
     this.setData({
-      id, time, detail, meters: detail?.meters?.map(item => {
+      id, 
+      time, 
+      detail, 
+      amount: amount,
+      meters: detail?.meters?.map(item => {
         const finalAmount = Number(item?.overall?.amount || 0) + Number(item?.loss?.amount || 0) + Number(item?.publicAmount || 0)
         item.finalAmount = Number(finalAmount).toFixed(2)
         return item;
@@ -77,8 +81,8 @@ Page({
           type: 'pie',
           radius: '50%',
           data: [
-            { value: 18.3, name: '本期线损电量', itemStyle: { color: 'rgb(104,187,196)' } },
-            { value: 187.56, name: '本期用电量', itemStyle: { color: 'rgb(80,135,236)' } },
+            { value: detail.comprehensive.lossAmount, name: '本期线损电量', itemStyle: { color: 'rgb(104,187,196)' } },
+            { value: detail.comprehensive.consumption, name: '本期用电量', itemStyle: { color: 'rgb(80,135,236)' } },
   
           ],
         }
diff --git a/childPackage/pages/billDetail/index.wxml b/childPackage/pages/billDetail/index.wxml
index d1057e1..fb72226 100644
--- a/childPackage/pages/billDetail/index.wxml
+++ b/childPackage/pages/billDetail/index.wxml
@@ -32,7 +32,7 @@
     <van-col span="8">
       <view class="colContent">
         <view class="colContentTitle">本期用电量</view>
-        <view class="colContentValue"> {{ detail.comprehensive.consumption }} 千瓦时 </view>
+        <view class="colContentValue"> {{ amount }} 千瓦时 </view>
       </view>
     </van-col>
     <van-col span="8">
diff --git a/utils/index.js b/utils/index.js
index 87f675e..2b00b4b 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -47,6 +47,7 @@ export function getConfigByEnv() {
     case 'develop':
       api = "http://localhost:8000"
       // api = "https://zgd.hbhcbn.com/api3"
+      // api = "https://zgd.hbhcbn.com/api3"
       // api = "https://zgd.hbhcbn.com/wxApi"
       // api = "http://127.0.0.1:4523/m1/4143821-0-default"
       break;