From f5f5cafe107285dae7cd2f7af52cc6e6d00cce03 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Fri, 8 Apr 2022 20:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-detail/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 0675914..30f8bfe 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -132,7 +132,7 @@
     </qn-footer>
     <qn-footer fixed height="120rpx" v-if="showSendImgs(orderInfo.status)">
       <view class="flex-row-center-end" style="padding: 0 32rpx">
-        <view class="button button_cancel" v-show="orderInfo.status === supplierOrderStatusEnum.WAIT_DELIVERY" style="width: 220rpx" @click="cancel">
+        <view class="button button_cancel" v-show="orderInfo.status === supplierOrderStatusEnum.WAIT_DELIVERY" style="width: 220rpx" @click="cancel(orderInfo)">
           取消订单
         </view>
         <view class="button button_contact" @click="viewContract">查看合同</view>
@@ -465,7 +465,8 @@ export default {
     },
     // 上传送货凭证
     uploadVoucher() {
-      uploadImage(['album'], 5 - this.orderInfo.proofDelivery.length)
+      let num = this.orderInfo.proofDelivery && this.orderInfo.proofDelivery.length ? 5 - this.orderInfo.proofDelivery.length : 0
+      uploadImage(['album'], num)
         .then((urls) => {
           if (urls) {
             supplierUploadVoucher({