Merge branch 'devlop' of http://git.qniao.cn/qniao/print-package-app into devlop

pages/order-detail/index.vue

@@ -102,10 +102,10 @@
         </view>
         <view class="imgs flex-row-start-start">
           <view v-for="(item, index) in supplierOrder.proofReceipt" :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(supplierOrder.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(supplierOrder.supplierOrderId)">
+          <view v-show="showUploadBtn(supplierOrder.status)" class="default-upload" @click="uploadVoucher(supplierOrder.supplierOrderId)">
             <image src="/static/imgs/order/camera.png" class="icon"></image>
             <text style="font-size: 26rpx; color: #4c4a58">上传凭证</text>
           </view>
@@ -174,6 +174,12 @@ const showVoucherStatus = [
   supplierOrderStatusEnum.REPAYING,
   supplierOrderStatusEnum.CANCELED
 ]
+const showUploadStatus = [
+  supplierOrderStatusEnum.FINISHED,
+  supplierOrderStatusEnum.WAIT_CLIENT_REPAY,
+  supplierOrderStatusEnum.REPAYING,
+  supplierOrderStatusEnum.CANCELED
+]
 export default {
   data() {
     return {
@@ -298,6 +304,10 @@ export default {
     showReceiveImgs(status) {
       return showVoucherStatus.includes(status)
     },
+    // 根据状态是否展示上传按钮
+    showUploadBtn(status) {
+      return !showUploadStatus.includes(status)
+    },
     // 去借款
     goFsPage() {
       getFeisuanUrl().then((res) => {