From 5184d81bf84880164e57e9662d5d41084673aa86 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Fri, 8 Apr 2022 20:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-detail/index.vue | 12 ++++++++----
 pages/trade/orderList.vue    |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 55e2cda..0675914 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -82,11 +82,11 @@
         </view>
       </view>
       <view class="imgs flex-row-start-start">
-        <view v-for="item in orderInfo.proofDelivery" :key="item.id" class="upload_img">
+        <view v-for="(item, index) in orderInfo.proofDelivery" :key="index" class="upload_img">
           <uni-icons type="clear" size="16" class="close-icon" @click="deleteVoucher(item.id)"></uni-icons>
           <image style="width: 120rpx; height: 120rpx" :src="item.imgUrl"></image>
         </view>
-        <view class="default-upload" @click="uploadVoucher()">
+        <view class="default-upload" @click="uploadVoucher()" v-show="!orderInfo.proofDelivery || orderInfo.proofDelivery.length < 5">
           <image src="/static/imgs/order/camera.png" class="icon"></image>
           <text style="font-size: 26rpx; color: #4c4a58">上传凭证</text>
         </view>
@@ -200,7 +200,8 @@ export default {
     return {
       orderInfo: {
         deliveryAddress: {},
-        supplierOrder: []
+        supplierOrder: [],
+        proofDelivery: []
       },
       supplierOrderStatusMap: Object.freeze(supplierOrderStatusMap),
       supplierOrderStatusEnum: Object.freeze(supplierOrderStatusEnum),
@@ -464,7 +465,7 @@ export default {
     },
     // 上传送货凭证
     uploadVoucher() {
-      uploadImage(['album'], 5)
+      uploadImage(['album'], 5 - this.orderInfo.proofDelivery.length)
         .then((urls) => {
           if (urls) {
             supplierUploadVoucher({
@@ -529,6 +530,7 @@ export default {
     },
     // 删除送货凭证
     deleteVoucher(id) {
+      console.log('id', id)
       supplierDeleteVoucher({ id }).then((res) => {
         if (res) {
           uni.showToast({
@@ -644,6 +646,7 @@ export default {
   .imgs {
     padding: 16rpx 32rpx 32rpx;
     min-height: 120rpx;
+    flex-wrap: wrap;
   }
 }
 .fee {
@@ -695,6 +698,7 @@ export default {
   align-items: center;
   position: relative;
   margin-right: 12rpx;
+  margin-bottom: 12rpx;
   overflow: hidden;
   .close-icon {
     position: absolute;
diff --git a/pages/trade/orderList.vue b/pages/trade/orderList.vue
index 12619b3..9e67f91 100644
--- a/pages/trade/orderList.vue
+++ b/pages/trade/orderList.vue
@@ -203,6 +203,10 @@ export default {
     color: #000000;
     letter-spacing: 0;
     font-weight: 600;
+    max-width: 420rpx;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   .list-title-Subtitle {
     font-family: PingFangSC-Medium;