From 426640fc6a9cfc613f729c832d13ceebfa039336 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 10 May 2024 14:01:12 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=8E=BB=E6=8E=89=E6=80=BB=E4=BB=B7?=
 =?UTF-8?q?=E5=80=BC=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                            | 6 ------
 src/pagesShipment/form/settlementForm.vue | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 25acc6a..91e9320 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -242,12 +242,6 @@
             "navigationBarTitleText": "客户详情"
           }
         }
-        // {
-        //   "path": "uni_modules/lime-echart",
-        //   "style": {
-        //     "navigationBarTitleText": "组件库"
-        //   }
-        // }
       ]
     },
     {
diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue
index df07150..6b78190 100644
--- a/src/pagesShipment/form/settlementForm.vue
+++ b/src/pagesShipment/form/settlementForm.vue
@@ -462,9 +462,9 @@ watch(
         (model1.order.unitPrice || 0) * (model1.order.settlementWeight || 0)
       ).toFixed(2)
     );
-    if (!model1.order.totalPrice) {
-      model1.order.totalPrice = model1.order.estimatePrice;
-    }
+    // if (!model1.order.totalPrice) {
+    //   model1.order.totalPrice = model1.order.estimatePrice;
+    // }
 
     model1.order.realIncome =
       (model1.order.totalPrice || 0) -