Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages/order-detail/index.vue

@@ -83,10 +83,14 @@
       </view>
       <view class="imgs flex-row-start-start">
         <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>
+          <uni-icons v-show="showUploadBtn(orderInfo.status)" 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()" v-show="!orderInfo.proofDelivery || orderInfo.proofDelivery.length < 5">
+        <view
+          class="default-upload"
+          @click="uploadVoucher()"
+          v-show="(!orderInfo.proofDelivery || orderInfo.proofDelivery.length < 5) && showUploadBtn(orderInfo.status)"
+        >
           <image src="/static/imgs/order/camera.png" class="icon"></image>
           <text style="font-size: 26rpx; color: #4c4a58">上传凭证</text>
         </view>
@@ -195,6 +199,13 @@ import {
 } from '@/apis/orderApi.js'
 import { supplierOrderStatusMap, supplierOrderStatusEnum, paymentMethodEnum, invoiceStatusMap } from '@/enums/index.js'
 import { transformFileToImg } from '@/apis/commonApi.js'
+
+const showUploadStatus = [
+  supplierOrderStatusEnum.FINISHED,
+  supplierOrderStatusEnum.WAIT_CLIENT_REPAY,
+  supplierOrderStatusEnum.REPAYING,
+  supplierOrderStatusEnum.CANCELED
+]
 export default {
   data() {
     return {
@@ -304,6 +315,10 @@ export default {
         }
       })
     },
+    // 根据状态是否展示上传按钮
+    showUploadBtn(status) {
+      return !showUploadStatus.includes(status)
+    },
     // 生成步骤条
     transformStep(list, quantity) {
       // 分切 出库 完成