update: 代收款明细增加备注信息

src/components/TabBar/index.vue

@@ -112,6 +112,7 @@ onLaunch(() => {
   height: 35rpx;
 }
 ::v-deep .custom-tabbar {
+  z-index: 999;
   > view {
     > view {
       background: #ffffff;

src/pagesReceive/components/detail.vue

@@ -103,7 +103,9 @@ import SmallModal from "@/components/Modal/smallModal.vue";
 import { OrderType, ScaleStatus } from "@/utils/enum";
 
 const props = withDefaults(
-  defineProps<any>(),
+  defineProps<{
+    currentOrder: any;
+  }>(),
   {
     currentOrder: {},
   }

src/pagesShipment/review/index.vue

@@ -114,12 +114,30 @@
         "
       >
         <view v-for="(item, index) in gridList3" :key="index">
-          <text v-if="item.name">{{ item.name }}：</text
+          <view v-if="item.name" style="display: inline-flex"
+            >{{ item.name }}
+            <uni-tooltip v-if="item.isTip" placement="bottom">
+              <u-icon color="#C1C1C1" name="info-circle" size="14"></u-icon>
+              <template v-slot:content>
+                <view
+                  style="
+                    min-width: 100px;
+                    overflow: scroll;
+                    word-break: break-word;
+                    
+                  "
+                >
+                  {{ item.info }}
+                </view>
+              </template>
+            </uni-tooltip>
+            ： </view
           ><text
             >{{ item.isBefore ? item.unit : "" }}
             <text v-if="item.name === '净重误差'">
               {{
-                (state.order.netWeight || 0) - (state.order.settlementNet || 0)
+                (state.order.netWeight || 0) -
+                (state.order.settlementWeight || 0)
               }}
             </text>
             <text v-else-if="item.name === '结算方式'">
@@ -295,11 +313,23 @@ const gridList3 = reactive([
   {},
   {
     name: "结算净重",
+    enName: "settlementNet",
+    num: 0,
+    unit: "KG",
+    isBefore: false,
+    isTip: true,
+    info: "基地或钢厂出具结算单的毛重-皮重",
+  },
+  {
+    name: "结算重量",
     enName: "settlementWeight",
     num: 0,
     unit: "KG",
     isBefore: false,
+    isTip: true,
+    info: "基地或钢厂出具结算单的毛重-皮重-扣杂",
   },
+
   {
     name: "结算单价",
     enName: "unitPrice",
@@ -356,6 +386,8 @@ const gridList3 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    isTip: true,
+    info: "货场过磅净重-结算净重",
   },
 ]);
 // 立即收款 // 先填写结算信息后更新状态为4
@@ -443,7 +475,7 @@ const init = () => {
           if (item.name === "净重误差") {
             item.num =
               (state.order as any).netWeight -
-              (state.order as any).settlementNet;
+              (state.order as any).settlementWeight;
           }
           item.num = state.order[item.enName as string];
         });