From 4b4c39ae5a482f6fd69d512d2a4f466d02905d8d Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 31 May 2024 14:30:23 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=BB=93=E7=AE=97=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Box/index.vue              |  4 ++--
 src/components/NavBar/NavBar.vue          |  4 ++--
 src/components/NavBar/NavBarLayout.vue    |  4 ++--
 src/pagesHome/index.vue                   |  4 ++--
 src/pagesReceive/review/index.vue         | 11 ++++++++++-
 src/pagesShipment/form/settlementForm.vue | 11 +++++++++--
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/components/Box/index.vue b/src/components/Box/index.vue
index f29cc1d..678e332 100644
--- a/src/components/Box/index.vue
+++ b/src/components/Box/index.vue
@@ -19,8 +19,8 @@ const props = withDefaults(
   }
 );
 const navbarRect = reactive({
-  height: 32,
-  top: 28,
+  height: 42,
+  top: 48,
   safeHeight: 500,
 });
 const getSafeHeight = () => {
diff --git a/src/components/NavBar/NavBar.vue b/src/components/NavBar/NavBar.vue
index 6ddd2a3..46f1fe3 100644
--- a/src/components/NavBar/NavBar.vue
+++ b/src/components/NavBar/NavBar.vue
@@ -67,8 +67,8 @@ const props = withDefaults(
 );
 
 const navbarRect = reactive({
-  height: 32,
-  top: 28,
+  height: 42,
+  top: 48,
   msgCount: 10,
 });
 onMounted(() => {
diff --git a/src/components/NavBar/NavBarLayout.vue b/src/components/NavBar/NavBarLayout.vue
index b23cdd9..65b5345 100644
--- a/src/components/NavBar/NavBarLayout.vue
+++ b/src/components/NavBar/NavBarLayout.vue
@@ -15,8 +15,8 @@
 </template>
 <script setup lang="ts">
 const navbarRect = reactive({
-  height: 32,
-  top: 28,
+  height: 42,
+  top: 48,
   msgCount: 10,
 });
 
diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue
index 7aead7e..9b5cef7 100644
--- a/src/pagesHome/index.vue
+++ b/src/pagesHome/index.vue
@@ -169,8 +169,8 @@ import pinia from "@/store";
 
 const store = useMemberStore(pinia);
 const navbarRect = reactive({
-  height: 32,
-  top: 28,
+  height: 42,
+  top: 48,
   safeHeight: 500,
 });
 
diff --git a/src/pagesReceive/review/index.vue b/src/pagesReceive/review/index.vue
index c60c15d..7f01fb3 100644
--- a/src/pagesReceive/review/index.vue
+++ b/src/pagesReceive/review/index.vue
@@ -436,7 +436,16 @@ onLoad((option) => {
               state.order[item.enName] = state.order["totalPrice"];
             }
           } else {
-            item.num = state.order[item.enName as string];
+            if (item.enName === 'buckleMiscellaneous') {
+              if (state.order[item.enName as string]) {
+                item.num = state.order[item.enName as string];
+              } else {
+                item.num = 0
+              }
+            } else {
+              item.num = state.order[item.enName as string];
+            }
+            
           }
         });
       }
diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue
index df96c71..817d55d 100644
--- a/src/pagesShipment/form/settlementForm.vue
+++ b/src/pagesShipment/form/settlementForm.vue
@@ -113,7 +113,14 @@ const handleClear = (item: any) => {
 };
 const isShowFormItem = (item: any) => {
   if (model1.scaleStatusBtnType === ScaleStatusBtnType.ShipmentPay) {
-    return true;
+    if (
+      model1.order.deliveryMethod === 1 &&
+      ["freight", "incidentals"].indexOf(item.key) > -1
+    ) {
+      return false;
+    } else {
+      return true;
+    }
   } else {
     return (
       item.key !== "paymentMethodName" &&
@@ -574,7 +581,7 @@ const save = () => {
         });
         return;
       }
-      
+
       if (
         parseFloat(model1.order.settlementTare.toString()) >
         parseFloat(model1.order.settlementGross.toString())