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

pages/order-detail/index.vue

@@ -101,11 +101,11 @@
           </view>
         </view>
         <view class="imgs flex-row-start-start">
-          <view v-for="item in supplierOrder.proofReceipt" :key="item.id" class="upload_img">
+          <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>
             <image style="width: 120rpx; height: 120rpx" :src="item.imgUrl"></image>
           </view>
-          <view class="default-upload" @click="uploadVoucher(supplierOrder.supplierOrderId)">
+          <view class="default-upload" @click="uploadVoucher(supplierOrder.supplierOrderId, supplierOrder.proofReceipt)">
             <image src="/static/imgs/order/camera.png" class="icon"></image>
             <text style="font-size: 26rpx; color: #4c4a58">上传凭证</text>
           </view>
@@ -383,8 +383,9 @@ export default {
       })
     },
     // 上传收货凭证
-    uploadVoucher(supplierOrderId) {
-      uploadImage(['album'], 5)
+    uploadVoucher(supplierOrderId, arr) {
+      let num = arr && arr.length ? 5 - arr.length : 5
+      uploadImage(['album'], num)
         .then((urls) => {
           if (urls) {
             clientUploadVoucher({