From 7d9e99e1ab5c5661e6f5d6a90bba3927b7620645 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 24 Mar 2023 18:17:00 +0800
Subject: [PATCH 1/2] optimize bug

---
 public/pages/machine/meterMachineManage/meterMachineManage.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/pages/machine/meterMachineManage/meterMachineManage.html b/public/pages/machine/meterMachineManage/meterMachineManage.html
index b5dd4570b..336714b6f 100644
--- a/public/pages/machine/meterMachineManage/meterMachineManage.html
+++ b/public/pages/machine/meterMachineManage/meterMachineManage.html
@@ -148,7 +148,7 @@
                                 <td class="text-center">{{meterMachine.roomName}}</td>
                                 <td class="text-center">{{meterMachine.feeConfigName}}</td>
                                 <td class="text-center">{{meterMachine.implBeanName}}</td>
-                                <td class="text-center" v-if="meterMachine.machineModel == '1001'">{{meterMachine.prestoreDegrees}}</td>
+                                <td class="text-center" v-if="meterMachine.machineModel == '1001'">{{meterMachine.degree?meterMachine.degree:meterMachine.prestoreDegrees}}</td>
                                 <td class="text-center" v-else>-</td>
                                 <td class="text-center" v-if="meterMachine.machineModel == '1001'">-</td>
                                 <td class="text-center" v-else>{{meterMachine.curDegrees}}(每月{{meterMachine.readDay}}日{{meterMachine.readHours}}时抄表)</td>

From 6299ecc9267640112539e85ba2f1abf09b380a9f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 25 Mar 2023 18:43:02 +0800
Subject: [PATCH 2/2] optimize bug

---
 public/pages/property/owePayFeeOrder/owePayFeeOrder.html | 2 +-
 public/pages/property/owePayFeeOrder/owePayFeeOrder.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.html b/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
index 7a676b562..2738ef648 100755
--- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
+++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
@@ -68,7 +68,7 @@
                                 <td class="text-center">{{oweFee.feeId}}</td>
                                 <td class="text-center">{{_getEndTime(oweFee)}}</td>
                                 <td class="text-center"> {{_getDeadlineTime(oweFee)}}</td>
-                                <td class="text-center">{{oweFee.feePrice}}</td>
+                                <td class="text-center">{{oweFee.feeTotalPrice}}</td>
                             </tr>
                         </tbody>
                         <tfoot>
diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
index 4874fb81d..687846b9c 100755
--- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
+++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.js
@@ -74,7 +74,7 @@
                         $that.owePayFeeOrderInfo.toFixedSign = _fees[0].val;
                         $that.owePayFeeOrderInfo.oweFees.forEach(item => {
                             //item.feePrice = $that._getFixedNum(item.feePrice);
-                            item.receivableAmount = item.feePrice;
+                            item.receivableAmount = item.feeTotalPrice;
                             item.feePrice = item.feeTotalPrice;
                             $that.owePayFeeOrderInfo.selectPayFeeIds.push(item.feeId);