From f8a8c15b6fb842e13dea051430170fa5a27547a2 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Thu, 21 Mar 2024 13:52:15 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=BE=85=E8=BF=87=E7=9A=AE=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProductDialog.vue              |   2 +-
 .../components/ProductTypeDialog.vue          |   2 +-
 src/components/PageView/index.vue             |  26 ++-
 src/pages.json                                |   6 -
 src/pagesApp/components/addCustomer.vue       |   2 +-
 src/pagesApp/components/addReceiveProduct.vue |   2 +-
 src/pagesApp/components/addReceiveType.vue    |   2 +-
 src/pagesApp/components/addRole.vue           |   2 +-
 .../components/addShipmentProduct.vue         |   2 +-
 src/pagesApp/components/addShipmentType.vue   |   2 +-
 src/pagesApp/components/addStockCard.vue      |   2 +-
 src/pagesApp/components/addSupplier.vue       |   2 +-
 src/pagesApp/components/addSupplierType.vue   |   2 +-
 src/pagesApp/components/addUser.vue           |   2 +-
 src/pagesApp/customerMgt.vue                  |   2 +-
 src/pagesApp/receiveProduct.vue               |   2 +-
 src/pagesApp/receiveSpl.vue                   |   2 +-
 src/pagesApp/receiveType.vue                  |   2 +-
 src/pagesApp/role.vue                         |   2 +-
 src/pagesApp/shipmentProduct.vue              |   2 +-
 src/pagesApp/shipmentSpl.vue                  |   2 +-
 src/pagesApp/shipmentType.vue                 |   2 +-
 src/pagesApp/stockCard.vue                    |   2 +-
 src/pagesApp/supplierMgt.vue                  |   2 +-
 src/pagesApp/supplierType.vue                 |   2 +-
 src/pagesApp/user.vue                         |   3 +-
 src/pagesHome/index.vue                       |   4 +-
 src/pagesReceive/form/pricingForm.vue         | 206 ++++++++++++------
 src/pagesReceive/pricing.vue                  | 140 ++++++++----
 src/pagesReceive/tareing.vue                  | 166 --------------
 src/pagesScenePhoto/index.vue                 |  10 +-
 src/pagesShipment/form/settlementForm.vue     |   2 +-
 src/pagesShipment/form/shipmentForm.vue       |   2 +-
 src/services/picture.ts                       |   9 +
 src/types/order.d.ts                          |   1 +
 src/utils/http.ts                             |   9 +-
 36 files changed, 317 insertions(+), 313 deletions(-)
 delete mode 100644 src/pagesReceive/tareing.vue

diff --git a/src/PagesStatistics/components/ProductDialog.vue b/src/PagesStatistics/components/ProductDialog.vue
index 0643147..011cf8f 100644
--- a/src/PagesStatistics/components/ProductDialog.vue
+++ b/src/PagesStatistics/components/ProductDialog.vue
@@ -92,7 +92,7 @@ onMounted(() => {
     border: 1px solid rgba(153, 153, 153, 0.64);
     text-align: center;
     cursor: pointer;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     margin-bottom: 20rpx;
     margin-left: 10rpx;
     margin-right: 10rpx;
diff --git a/src/PagesStatistics/components/ProductTypeDialog.vue b/src/PagesStatistics/components/ProductTypeDialog.vue
index 17ee13d..6e906e1 100644
--- a/src/PagesStatistics/components/ProductTypeDialog.vue
+++ b/src/PagesStatistics/components/ProductTypeDialog.vue
@@ -115,7 +115,7 @@ onMounted(() => {
     border: 1px solid rgba(153, 153, 153, 0.64);
     text-align: center;
     cursor: pointer;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     margin-bottom: 20rpx;
     margin-left: 10rpx;
     margin-right: 10rpx;
diff --git a/src/components/PageView/index.vue b/src/components/PageView/index.vue
index 122ff37..28afe25 100644
--- a/src/components/PageView/index.vue
+++ b/src/components/PageView/index.vue
@@ -5,11 +5,19 @@
     @scrolltolower="loadMore"
     :style="{ 'max-height': clientHeight + 'px' }"
   >
-    <slot></slot>
+    <slot> </slot>
     <!-- 加载更多提示 -->
-    <view v-if="isLoading" class="loading-text">加载中...</view>
-    <view v-if="noMoreData" class="no-more-data-text">
-      <u-loadmore :status="'nomore'"  :line="true" :fontSize="12" :marginTop="30"/>
+    <view v-if="noMoreData || isLoading" class="no-more-data-text">
+      <u-loadmore
+        :status="isLoading ? 'loading' :'nomore'"
+        :line="true"
+        :fontSize="12"
+        :marginTop="30"
+      />
+    </view>
+    <view v-if="!isLoading && list.length === 0" style="justify-content: center">
+      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+      </u-empty>
     </view>
   </scroll-view>
 </template>
@@ -20,14 +28,19 @@ import { onLoad } from "@dcloudio/uni-app";
 const props = withDefaults(
   defineProps<{
     noMoreData: boolean;
+    isLoading: boolean
+    list: any;
+    height: number;
   }>(),
   {
     noMoreData: false,
+    isLoading: false,
+    list: [],
+    height: 80,
   }
 );
 const emit = defineEmits(["loadList"]);
 
-const isLoading = ref(false);
 const clientHeight = ref(500);
 
 const loadMore = () => {
@@ -50,7 +63,8 @@ const getBarHeight = () => {
 const getClineHeight = () => {
   uni.getSystemInfo({
     success: (res) => {
-      clientHeight.value = res.windowHeight - uni.upx2px(80) - getBarHeight();
+      clientHeight.value =
+        res.windowHeight - uni.upx2px(props.height) - getBarHeight();
     },
   });
 };
diff --git a/src/pages.json b/src/pages.json
index 00e44a1..1e5a198 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -105,12 +105,6 @@
             "navigationBarTitleText": "待定价"
           }
         },
-        {
-          "path": "tareing",
-          "style": {
-            "navigationBarTitleText": "待过皮重"
-          }
-        },
         {
           "path": "payReview",
           "style": {
diff --git a/src/pagesApp/components/addCustomer.vue b/src/pagesApp/components/addCustomer.vue
index f0a3fb3..a751943 100644
--- a/src/pagesApp/components/addCustomer.vue
+++ b/src/pagesApp/components/addCustomer.vue
@@ -186,7 +186,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addReceiveProduct.vue b/src/pagesApp/components/addReceiveProduct.vue
index 2631f03..ac9bb72 100644
--- a/src/pagesApp/components/addReceiveProduct.vue
+++ b/src/pagesApp/components/addReceiveProduct.vue
@@ -203,7 +203,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addReceiveType.vue b/src/pagesApp/components/addReceiveType.vue
index 76a7494..48cd0e5 100644
--- a/src/pagesApp/components/addReceiveType.vue
+++ b/src/pagesApp/components/addReceiveType.vue
@@ -155,7 +155,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addRole.vue b/src/pagesApp/components/addRole.vue
index 60515d7..6b0f695 100644
--- a/src/pagesApp/components/addRole.vue
+++ b/src/pagesApp/components/addRole.vue
@@ -223,7 +223,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addShipmentProduct.vue b/src/pagesApp/components/addShipmentProduct.vue
index 4bc8e0b..54ca567 100644
--- a/src/pagesApp/components/addShipmentProduct.vue
+++ b/src/pagesApp/components/addShipmentProduct.vue
@@ -223,7 +223,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addShipmentType.vue b/src/pagesApp/components/addShipmentType.vue
index 09ac4f2..5d9950f 100644
--- a/src/pagesApp/components/addShipmentType.vue
+++ b/src/pagesApp/components/addShipmentType.vue
@@ -157,7 +157,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addStockCard.vue b/src/pagesApp/components/addStockCard.vue
index 29ef3bd..3961b2e 100644
--- a/src/pagesApp/components/addStockCard.vue
+++ b/src/pagesApp/components/addStockCard.vue
@@ -166,7 +166,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addSupplier.vue b/src/pagesApp/components/addSupplier.vue
index ac0120e..0ca40b7 100644
--- a/src/pagesApp/components/addSupplier.vue
+++ b/src/pagesApp/components/addSupplier.vue
@@ -259,7 +259,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addSupplierType.vue b/src/pagesApp/components/addSupplierType.vue
index 25332fd..3cbb820 100644
--- a/src/pagesApp/components/addSupplierType.vue
+++ b/src/pagesApp/components/addSupplierType.vue
@@ -155,7 +155,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/components/addUser.vue b/src/pagesApp/components/addUser.vue
index 85663b7..4293ff5 100644
--- a/src/pagesApp/components/addUser.vue
+++ b/src/pagesApp/components/addUser.vue
@@ -218,7 +218,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/customerMgt.vue b/src/pagesApp/customerMgt.vue
index f1dc2d9..1a5fbda 100644
--- a/src/pagesApp/customerMgt.vue
+++ b/src/pagesApp/customerMgt.vue
@@ -107,7 +107,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesApp/receiveProduct.vue b/src/pagesApp/receiveProduct.vue
index b6e7841..0213ebc 100644
--- a/src/pagesApp/receiveProduct.vue
+++ b/src/pagesApp/receiveProduct.vue
@@ -119,7 +119,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 28rpx;
     color: #000000;
diff --git a/src/pagesApp/receiveSpl.vue b/src/pagesApp/receiveSpl.vue
index 5af33b4..dda7d97 100644
--- a/src/pagesApp/receiveSpl.vue
+++ b/src/pagesApp/receiveSpl.vue
@@ -366,7 +366,7 @@ const handleTime = (v: any) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/receiveType.vue b/src/pagesApp/receiveType.vue
index b47b56b..f0edf03 100644
--- a/src/pagesApp/receiveType.vue
+++ b/src/pagesApp/receiveType.vue
@@ -106,7 +106,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesApp/role.vue b/src/pagesApp/role.vue
index bbf69df..cb1c4ba 100644
--- a/src/pagesApp/role.vue
+++ b/src/pagesApp/role.vue
@@ -122,7 +122,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesApp/shipmentProduct.vue b/src/pagesApp/shipmentProduct.vue
index 51d4247..a073d45 100644
--- a/src/pagesApp/shipmentProduct.vue
+++ b/src/pagesApp/shipmentProduct.vue
@@ -119,7 +119,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 28rpx;
     color: #000000;
diff --git a/src/pagesApp/shipmentSpl.vue b/src/pagesApp/shipmentSpl.vue
index f341119..48177ad 100644
--- a/src/pagesApp/shipmentSpl.vue
+++ b/src/pagesApp/shipmentSpl.vue
@@ -387,7 +387,7 @@ const handleTime = (v: any) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesApp/shipmentType.vue b/src/pagesApp/shipmentType.vue
index 56e1906..081f6d7 100644
--- a/src/pagesApp/shipmentType.vue
+++ b/src/pagesApp/shipmentType.vue
@@ -130,7 +130,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesApp/stockCard.vue b/src/pagesApp/stockCard.vue
index 90d4127..bdc2cb2 100644
--- a/src/pagesApp/stockCard.vue
+++ b/src/pagesApp/stockCard.vue
@@ -108,7 +108,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesApp/supplierMgt.vue b/src/pagesApp/supplierMgt.vue
index b8850f0..ebcf67c 100644
--- a/src/pagesApp/supplierMgt.vue
+++ b/src/pagesApp/supplierMgt.vue
@@ -141,7 +141,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 28rpx;
     color: #000000;
diff --git a/src/pagesApp/supplierType.vue b/src/pagesApp/supplierType.vue
index d62a57e..334ff6d 100644
--- a/src/pagesApp/supplierType.vue
+++ b/src/pagesApp/supplierType.vue
@@ -130,7 +130,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesApp/user.vue b/src/pagesApp/user.vue
index c0cea77..1ef9122 100644
--- a/src/pagesApp/user.vue
+++ b/src/pagesApp/user.vue
@@ -20,6 +20,7 @@
         }
       "
       :noMoreData="pageList.noMoreData"
+      :list="pageList.list"
     >
       <view class="box">
         <view v-for="(item, index) in pageList.list" :key="index">
@@ -142,7 +143,7 @@ onMounted(() => {
     background: #ffffff;
     box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
     border-radius: 13rpx;
-    padding: 10rpx 20rpx;
+    padding: 0rpx 20rpx;
     font-weight: 400;
     font-size: 26rpx;
     color: #000000;
diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue
index 58660b8..05d070c 100644
--- a/src/pagesHome/index.vue
+++ b/src/pagesHome/index.vue
@@ -212,7 +212,7 @@ const receiveList = reactive([
     num: 0,
     fn: () => {
       uni.navigateTo({
-        url: "/pagesReceive/pricing", // 要跳转到的页面路径
+        url: "/pagesReceive/pricing?scaleStatus=0", // 要跳转到的页面路径
       });
     },
   },
@@ -221,7 +221,7 @@ const receiveList = reactive([
     num: 0,
     fn: () => {
       uni.navigateTo({
-        url: "/pagesReceive/tareing", // 要跳转到的页面路径
+        url: "/pagesReceive/pricing?scaleStatus=1", // 要跳转到的页面路径
       });
     },
   },
diff --git a/src/pagesReceive/form/pricingForm.vue b/src/pagesReceive/form/pricingForm.vue
index 0a71897..1512665 100644
--- a/src/pagesReceive/form/pricingForm.vue
+++ b/src/pagesReceive/form/pricingForm.vue
@@ -7,14 +7,16 @@
       ref="form"
       :labelWidth="80"
       :labelStyle="{ padding: '0rpx 10rpx' }"
+      :errorType="'border-bottom'"
     >
       <u-form-item
-        :prop="`order[${item.key}]`"
+        :prop="`order.${item.key}`"
         :label="item.name"
         :required="item.required"
         v-for="(item, index) in formAttrList"
         :key="index"
         @click="item.fn"
+        :borderBottom="false"
       >
         <u-textarea
           v-if="item.type === 'textarea'"
@@ -44,15 +46,14 @@
           @delete="deletePic" -->
         <uni-file-picker
           v-if="item.type === 'upload'"
-          v-model="model1.order.fileList"
-          limit="10"
+          :limit="10"
           title="最多可上传10张图片"
           :auto-upload="false"
           fileMediatype="image"
-          mode="grid"
           ref="filesRef"
+          v-model="model1.order.fileLists"
+          @delete="handleDelete"
         ></uni-file-picker>
-
         <u-radio-group
           v-if="item.type === 'radio'"
           v-model="(model1.order as any)[item.key]"
@@ -85,7 +86,7 @@
     </block>
   </view>
   <view class="btn-box">
-    <u-button text="暂不定价"></u-button>
+    <u-button text="暂不定价" @click="handleBack()"></u-button>
     <u-button type="primary" text="保存" @click="save()"></u-button>
   </view>
 </template>
@@ -112,21 +113,45 @@ const model1 = reactive<{ order: Order }>({
     buttonType: 0, // 0扣杂1扣点
     weighingMethod: 0, // 0：有皮重 1：零皮重
     multiCategory: 0, // 0：单品类 1：多品类
-    fileList: [],
+    fileLists: [],
     scaleStatus: 1,
   },
 });
-const rules = ref({
-  "userInfo.userName": {
+const rules = reactive({
+  "order.userName": {
     type: "string",
     required: true,
-    message: "请输入手机号",
+    message: "请输入选择供应商",
     trigger: ["blur", "change"],
   },
-  "userInfo.password": {
+  "order.productName": {
     type: "string",
     required: true,
-    message: "请输入密码",
+    message: "请选择收货产品名称",
+    trigger: ["blur", "change"],
+  },
+  "order.price": {
+    type: "number",
+    required: true,
+    message: "请输入单价",
+    trigger: ["blur", "change"],
+  },
+  "order.grossWeight": {
+    type: "number",
+    required: true,
+    message: "请输入毛重",
+    trigger: ["blur", "change"],
+  },
+  "order.weighingMethod": {
+    type: "number",
+    required: true,
+    message: "请选择称重方式",
+    trigger: ["blur", "change"],
+  },
+  "order.multiCategory": {
+    type: "number",
+    required: true,
+    message: "请选择品类",
     trigger: ["blur", "change"],
   },
 });
@@ -282,67 +307,97 @@ const handleSelect = (key: string, v: any) => {
   }
 };
 
-onLoad((option) => {
-  model1.order.id = parseInt((option as any).id);
-  if (model1.order.id) {
-    ReceiveApi.getDetailById({ id: model1.order.id }).then((res) => {
-      if (res.code === 200) {
-        model1.order = res.data;
-      }
-    });
-    PictureApi.getAnnex({
-      businessId: model1.order.id.toString(),
-      orderType: 1,
-      imagesType: ImagesType.NORMARL,
-    }).then((res) => {
-      if (res.code === 200) {
-      }
-    });
-  }
-});
+const handleBack = () => {
+  uni.navigateBack();
+};
+
 // const files = ref<FileObj[]>([]);
 const filesRef = ref();
 const handleUpload = () => {
   // console.log(event.tempFilePaths)
-  const list = filesRef.value[0].filesList;
-  return list.map((item: any) => {
+  return filesRef.value[0].filesList.map((item: any, index: number) => {
+    if (item.fileID) {
+      return;
+    }
     return new Promise((resolve) => {
       PictureApi.upload({
         files: item,
         path: item.path,
-      }).then((res) => {
-        if (res.code === 200) {
-          resolve({
-            ...(res.data as any),
-            businessId: model1.order.id,
-            imagesType: ImagesType.NORMARL, // 普通资源
-            orderType: OrderType.Receive, // 入库单
-          });
-        }
-      });
+      })
+        .then((res) => {
+          if (res.code === 200) {
+            resolve({
+              ...(res.data as any),
+              businessId: model1.order.id,
+              imagesType: ImagesType.NORMARL, // 普通资源
+              orderType: OrderType.Receive, // 入库单
+            });
+          }
+        })
+        .catch((e) => {
+          return;
+        });
     });
   });
 };
 
+/**
+ *
+ */
+const handleDelete = (e: any) => {
+  console.log(model1.order.fileLists);
+  if (e.tempFile.fileID) {
+    PictureApi.deleteById({ id: e.tempFile.fileID }).then((res) => {
+      if (res.code === 200) {
+        uni.showToast({ title: "已删除" });
+      }
+    });
+  }
+};
+
 /**
  * 点击保存 先执行upload接口
  * 上传成功后 保存图片资源 和更新订单数据
  */
-const save = () => {
-  Promise.all(handleUpload()).then((res) => {
-    // 上传多个资源
-    if (res.length > 0) {
-      PictureApi.addListAnnex({ annexPos: res }).then((res1) => {
-        if (res1.code === 200) {
-          uni.showToast({
-            title: "图片资源上传成功",
-            icon: "success",
-          });
-        }
+const form = ref();
+const check = () => {
+  return new Promise((resolve) => {
+    form.value
+      .validate()
+      .then((res: boolean) => {
+        resolve(res);
+      })
+      .catch((errors: any) => {
+        resolve(false);
+        uni.showToast({
+          icon: "none",
+          title: errors[0].message || "校验失败",
+        });
       });
+  });
+};
+const save = () => {
+  check().then((res) => {
+    if (res) {
+      startSave();
     }
   });
+};
+const startSave = () => {
+  Promise.all(handleUpload()).then((res) => {
+    if (res.filter((item) => item).length > 0) {
+      PictureApi.addListAnnex({ annexPos: res.filter((item) => item) }).then(
+        (res1) => {
+          if (res1.code === 200) {
+            updateOrder()
+          }
+        }
+      );
+    }
+  });
+};
 
+const updateOrder = () => {
   // 更新定价单
   /**
    * 0：有皮重 1：零皮重
@@ -375,18 +430,43 @@ const save = () => {
         icon: "success",
       });
       // 0：有皮重 1：零皮重
-      if (model1.order.weighingMethod === 0) {
-        uni.navigateTo({
-          url: "/pagesReceive/tareing", // 要跳转到的页面路径
-        });
-      } else if (model1.order.weighingMethod === 1) {
-        uni.navigateTo({
-          url: "/pages/index/payReview", // 要跳转到的页面路径
-        });
-      }
+      uni.redirectTo({
+        url: "/pagesHome/index", // 要跳转到的页面路径
+      });
     }
   });
 };
+
+onLoad((option) => {
+  model1.order.id = parseInt((option as any).id);
+  if (model1.order.id) {
+    ReceiveApi.getDetailById({ id: model1.order.id }).then((res) => {
+      if (res.code === 200) {
+        // 基于id查询重新赋值
+        model1.order = {
+          ...res.data,
+          buttonType: res.data.buttonType !== null ? res.data.buttonType : 0,
+          weighingMethod:
+            res.data.weighingMethod !== null ? res.data.weighingMethod : 0,
+          multiCategory:
+            res.data.multiCategory !== null ? res.data.multiCategory : 0,
+          fileLists: model1.order.fileLists.map((item: any) => {
+            return { ...item, fileID: item.id };
+          }),
+        };
+      }
+    });
+    PictureApi.getAnnex({
+      businessId: model1.order.id.toString(),
+      orderType: 1,
+      imagesType: ImagesType.NORMARL,
+    }).then((res) => {
+      if (res.code === 200) {
+        model1.order.fileLists = res.data;
+      }
+    });
+  }
+});
 </script>
 <style lang="scss" scoped>
 .c-card {
@@ -394,7 +474,7 @@ const save = () => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesReceive/pricing.vue b/src/pagesReceive/pricing.vue
index 30ddbc4..a59c491 100644
--- a/src/pagesReceive/pricing.vue
+++ b/src/pagesReceive/pricing.vue
@@ -1,44 +1,64 @@
 <template>
-  <view class="card-box" v-for="(item, index) in pageList.list" :key="index">
-    <view class="top-flex-box">
-      <view>
+  <page-view
+    @loadList="
+      (v) => {
+        getList(v);
+      }
+    "
+    :noMoreData="pageList.noMoreData"
+    :list="pageList.list"
+    :height="0"
+    :isLoading="pageList.isLoading"
+  >
+    <view class="card-box" v-for="(item, index) in pageList.list" :key="index">
+      <view class="top-flex-box">
         <view>
-          <text class="address">{{ item.deviceName || "-" }}</text>
+          <view>
+            <text class="address">{{ item.deviceName || "-" }}</text>
+          </view>
+          <view>
+            <text class="number"
+              >收货单号：{{ item.receiptNumber }}</text
+            >
+          </view>
+          <view>
+            <text class="name">{{ item.userName }}</text>
+          </view>
         </view>
         <view>
-          <text class="number">收货单号：{{ item.receiptNumber }}</text>
-        </view>
-        <view>
-          <text class="name">{{ item.userName }}</text>
+          <u-button
+            :customStyle="{ border: '1px solid #00dcee', color: '#00dcee' }"
+            @click="handleScenePhoto(item.id as number)"
+            text="现场照片"
+            plain
+            shape="circle"
+            type="success"
+            size="small"
+          ></u-button>
         </view>
       </view>
       <view>
-        <text class="btn" @click="handleScenePhoto((item.imagesId as number))"
-          >现场照片</text
-        >
+        <text class="desc">过毛时间：{{ item.grossTime }}</text>
+      </view>
+      <view class="flex-box">
+        <text>毛重：{{ item.grossWeight }}kg</text>
+        <text>单价：{{ state.scaleStatus === 0 ? '未定价' : item.price + '元/KG'}}</text>
+      </view>
+      <view class="btn-box">
+        <u-button
+          text="点击作废"
+          color="#E8E8E8"
+          :customStyle="{ color: '#999' }"
+          @click="handleModal(true, item.id as number)"
+        ></u-button>
+        <u-button
+          type="primary"
+          :text="state.scaleStatus === 0 ? '点击定价' : '点击编辑'"
+          @click="pricingDetail(item.id as number)"
+        ></u-button>
       </view>
     </view>
-    <view>
-      <text class="desc">过毛时间：{{ item.grossTime }}</text>
-    </view>
-    <view class="flex-box">
-      <text>毛重：{{ item.grossWeight }}kg</text>
-      <text>单价：未定价</text>
-    </view>
-    <view class="btn-box">
-      <u-button
-        text="点击作废"
-        color="#E8E8E8"
-        :customStyle="{ color: '#999' }"
-        @click="handleModal(true, (item.id as number))"
-      ></u-button>
-      <u-button
-        type="primary"
-        text="点击定价"
-        @click="pricingDetail((item.id as number))"
-      ></u-button>
-    </view>
-  </view>
+  </page-view>
 
   <SmallModal
     :title="'确认作废吗？'"
@@ -53,13 +73,21 @@
 <script setup lang="ts">
 import { ReceiveApi } from "@/services/index";
 import SmallModal from "@/components/Modal/smallModal.vue";
+import PageView from "@/components/PageView/index.vue";
+import { onLoad } from "@dcloudio/uni-app";
+import { ScaleStatus } from "@/utils/enum";
 
 const pageList: PageResult<Order> = reactive({
+  isLoading: false,
+  noMoreData: false,
   total: 0,
   list: [],
   pageNum: 1,
   pageSize: 10,
 });
+const state = reactive({
+  scaleStatus: 0
+})
 const isShowCancelModal = ref(false);
 const deleteId = ref(0);
 const handleModal = (v: boolean, id: number) => {
@@ -68,7 +96,7 @@ const handleModal = (v: boolean, id: number) => {
 };
 const handleScenePhoto = (imagesId: number) => {
   uni.navigateTo({
-    url: "/pagesScenePhoto/index?orderType=1&id=" + imagesId, // 要跳转到的页面路径
+    url: `/pagesScenePhoto/index?orderType=1&id=${imagesId}&imagesType=1`, // 要跳转到的页面路径
   });
 };
 const pricingDetail = (id: number) => {
@@ -76,24 +104,58 @@ const pricingDetail = (id: number) => {
     url: "/pagesReceive/form/pricingForm?id=" + id, // 要跳转到的页面路径
   });
 };
-const getOrderList = () => {
-  ReceiveApi.getOrderPage({ pageNumber: 1, pageSize: 10, scaleStatus: 0 }).then((res) => {
+
+const getList = (v?: boolean) => {
+  if (v) {
+    if (Math.ceil(pageList.total / pageList.pageSize) > pageList.pageNum) {
+      pageList.pageNum++;
+    } else {
+      pageList.noMoreData = true;
+      return;
+    }
+  }
+  let params: any = {
+    pageSize: pageList.pageSize,
+    pageNumber: pageList.pageNum,
+    scaleStatus: state.scaleStatus,
+  };
+  pageList.isLoading = true;
+  ReceiveApi.getOrderPage(params).then((res) => {
     if (res.code === 200) {
-      (pageList as any).list = res.data.list;
+      pageList.isLoading = false;
+      (pageList as any).list = (pageList as any).list = (
+        pageList as any
+      ).list.concat(res.data.list);
+      pageList.total = (res.data as any).total;
     }
   });
 };
 const handleOk = () => {
   console.log(deleteId.value);
-  ReceiveApi.deleteOrder({ids:[deleteId.value]}).then((res) => {
+  ReceiveApi.deleteOrder({ ids: [deleteId.value] }).then((res) => {
     if (res.code === 200) {
-      getOrderList();
+      getList();
     }
   });
 };
 
 onMounted(() => {
-  getOrderList();
+  getList();
+});
+
+onLoad((option) => {
+  // 接收传递的标题参数
+  state.scaleStatus = parseInt((option as any).scaleStatus);
+      // 设置页面标题
+  if (state.scaleStatus === ScaleStatus.ToBePriced) {
+    uni.setNavigationBarTitle({
+      title: '待定价',
+    });
+  } else if (state.scaleStatus === ScaleStatus.ToBeTare) {
+    uni.setNavigationBarTitle({
+      title: '待过皮重',
+    });
+  }
 });
 </script>
 <style lang="scss" scoped>
diff --git a/src/pagesReceive/tareing.vue b/src/pagesReceive/tareing.vue
deleted file mode 100644
index 7b1678d..0000000
--- a/src/pagesReceive/tareing.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-  <view class="card-box" v-for="(item, index) in pageList.list" :key="index">
-    <view class="top-flex-box">
-      <view>
-        <view>
-          <text class="address">{{ item.deviceName || "-" }}</text>
-        </view>
-        <view>
-          <text class="number">收货单号：{{ item.receiptNumber }}</text>
-        </view>
-        <view>
-          <text class="name">{{ item.userName }}</text>
-        </view>
-      </view>
-      <view>
-        <text class="btn" @click="handleScenePhoto((item.imagesId as number))"
-          >现场照片</text
-        >
-      </view>
-    </view>
-    <view>
-      <text class="desc">过毛时间：{{ item.grossTime }}</text>
-    </view>
-    <view class="flex-box">
-      <text>毛重：{{ item.grossWeight }}KG</text>
-      <text>单价：{{ item.price }} 元/KG</text>
-    </view>
-    <view class="btn-box">
-      <u-button
-        text="点击作废"
-        color="#E8E8E8"
-        :customStyle="{ color: '#999' }"
-        @click="handleModal(true, (item.id as number))"
-      ></u-button>
-      <u-button
-        type="primary"
-        text="点击编辑"
-        @click="pricingDetail((item.id as number))"
-      ></u-button>
-    </view>
-  </view>
-
-  <SmallModal
-    :title="'确认作废吗？'"
-    :content="'确认作废后，该订单不能恢复！'"
-    :okText="'确认作废'"
-    :isMain="true"
-    :show="isShowCancelModal"
-    @handleModal="(v:boolean) => {handleModal(v, deleteId)}"
-    @handleOk="handleOk()"
-  />
-</template>
-<script setup lang="ts">
-import { ReceiveApi } from "@/services/index";
-import SmallModal from "@/components/Modal/smallModal.vue";
-
-interface PageResult<T> {
-  total: number;
-  list: T[];
-  pageNum: number;
-  pageSize: number;
-}
-const pageList: PageResult<Order> = reactive({
-  total: 0,
-  list: [],
-  pageNum: 1,
-  pageSize: 10,
-});
-const isShowCancelModal = ref(false);
-const deleteId = ref(0);
-const handleModal = (v: boolean, id: number) => {
-  isShowCancelModal.value = v;
-  deleteId.value = id;
-};
-const handleScenePhoto = (imagesId: number) => {
-  uni.navigateTo({
-    url: "/pagesScenePhoto/index?orderType=1&id=" + imagesId, // 要跳转到的页面路径
-  });
-};
-const pricingDetail = (id: number) => {
-  uni.navigateTo({
-    url: "/pagesReceive/form/pricingForm?id=" + id, // 要跳转到的页面路径
-  });
-};
-const getOrderList = () => {
-  ReceiveApi.getOrderPage({ pageNumber: 1, pageSize: 10, scaleStatus: 1 }).then((res) => {
-    if (res.code === 200) {
-      (pageList as any).list = res.data.list;
-    }
-  });
-};
-const handleOk = () => {
-  console.log(deleteId.value);
-  ReceiveApi.deleteOrder([deleteId.value]).then((res) => {
-    if (res.code === 200) {
-      getOrderList();
-    }
-  });
-};
-
-onMounted(() => {
-  getOrderList();
-});
-</script>
-<style lang="scss" scoped>
-.card-box {
-  padding: 38rpx 50rpx;
-  box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
-  border-radius: 13rpx;
-  margin: 0rpx 25rpx;
-  margin-top: 35rpx;
-  font-family: Source Han Sans CN;
-  font-weight: 400;
-  font-size: 26rpx;
-  color: #000000;
-  line-height: 41rpx;
-  .top-flex-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .btn {
-      border-radius: 24rpx;
-      border: 1px solid #00dcee;
-      padding: 10rpx 30rpx;
-      font-weight: 500;
-      font-size: 24rpx;
-      color: #00dcee;
-      line-height: 41rpx;
-      cursor: pointer;
-    }
-  }
-  .address {
-    margin-right: 30rpx;
-  }
-  .desc {
-    font-size: 24rpx;
-    color: #999999;
-    margin-top: 30rpx;
-    display: inline-block;
-  }
-  .name {
-    font-size: 26rpx;
-    color: #000000;
-    font-weight: bold;
-  }
-  .flex-box {
-    font-weight: 400;
-    font-size: 26rpx;
-    color: #000000;
-    line-height: 41rpx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-  .btn-box {
-    margin-top: 60rpx;
-    display: flex;
-    ::v-deep button {
-      border-radius: 43rpx;
-    }
-    ::v-deep button + button {
-      margin-left: 50rpx;
-    }
-  }
-}
-</style>
diff --git a/src/pagesScenePhoto/index.vue b/src/pagesScenePhoto/index.vue
index f71a462..2e606b4 100644
--- a/src/pagesScenePhoto/index.vue
+++ b/src/pagesScenePhoto/index.vue
@@ -17,12 +17,16 @@
         </view>
       </up-col>
     </up-row>
+    <view v-if="list.length === 0" style="justify-content: center">
+      <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
+      </u-empty>
+    </view>
   </view>
 </template>
 <script setup lang="ts">
 import { onLoad } from "@dcloudio/uni-app";
 import { PictureApi } from "@/services/index";
-import {ImagesType} from '@/utils/enum'
+import { ImagesType } from "@/utils/enum";
 let list: any = ref([]);
 const getType = (v: number) => {
   if (v === ImagesType.Tare) {
@@ -38,7 +42,7 @@ onLoad((option: any) => {
   PictureApi.getAnnex({
     businessId: option.id,
     orderType: parseInt(option.orderType),
-    imagesType: ImagesType.Tare,
+    imagesType: option.imagesType,
   }).then((res) => {
     if (res.code === 200) {
       list.value = res.data;
@@ -81,7 +85,7 @@ onLoad((option: any) => {
       font-weight: 400;
       font-size: 24rpx;
       color: #ffffff;
-      padding: 10rpx 20rpx;
+      padding: 0rpx 20rpx;
       position: absolute;
       top: 30rpx;
       left: 9rpx;
diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue
index fdb38be..bb20877 100644
--- a/src/pagesShipment/form/settlementForm.vue
+++ b/src/pagesShipment/form/settlementForm.vue
@@ -430,7 +430,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/pagesShipment/form/shipmentForm.vue b/src/pagesShipment/form/shipmentForm.vue
index b03f82c..88f6129 100644
--- a/src/pagesShipment/form/shipmentForm.vue
+++ b/src/pagesShipment/form/shipmentForm.vue
@@ -304,7 +304,7 @@ onLoad((option) => {
   // box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(5, 68, 37, 0.12);
   border-radius: 13rpx;
   margin: 30rpx 25rpx;
-  padding: 10rpx 20rpx;
+  padding: 0rpx 20rpx;
   ::v-deep .u-form-item {
     height: auto;
   }
diff --git a/src/services/picture.ts b/src/services/picture.ts
index f576523..0ae8e54 100644
--- a/src/services/picture.ts
+++ b/src/services/picture.ts
@@ -45,6 +45,15 @@ export const upload = (data: any) => {
   });
 };
 
+// 删除图片
+export const deleteById = (data: any) => {
+  return http({
+    method: "POST",
+    url: "/api/annex/delete",
+    data,
+  });
+};
+
 
 
 
diff --git a/src/types/order.d.ts b/src/types/order.d.ts
index e45bdc2..0ecda66 100644
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@@ -1,4 +1,5 @@
 interface PageResult<T> {
+  isLoading?: boolean
   noMoreData?: boolean,
   total: number;
   list: T[];
diff --git a/src/utils/http.ts b/src/utils/http.ts
index 6b5a85d..f34667a 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -78,6 +78,7 @@ export const http = <T>(options: UniApp.RequestOptions) => {
         },
         fail(err) {
           console.log(err);
+          resolve(err as any)
         },
       });
     } else {
@@ -105,13 +106,17 @@ export const http = <T>(options: UniApp.RequestOptions) => {
                 url: "/pages/login/index",
               });
               return;
-            }
-            if ((res1 as any).code === 10001) {
+            }else if ((res1 as any).code === 10001) {
               uni.showToast({
                 icon: "none",
                 title: (res1 as Data<T>).message || "请求失败",
               });
               return 
+            } else if ((res1 as any).code === 5001) {
+              uni.showToast({
+                icon: "none",
+                title: (res1 as Data<T>).message || "请求失败",
+              });
             }
             resolve(res1 as Data<T>);
           } else {