update: 结算部分优化

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 = () => {

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(() => {

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,
 });
 

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,
 });
 

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];
+            }
+            
           }
         });
       }

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" &&