上传文件修改&税率修改

pages/otherpage/money/uploadInvoice.vue

@@ -12,12 +12,14 @@
       <div class="stitle">发票图片(不超过2MB)</div>
       <div class="uploadInfo">
         <el-upload
+          v-loading="uploading"
           class="avatar-uploader"
           action="#"
           :show-file-list="false"
           :multiple="false"
+          :limit="1"
           accept="image/png, image/jpeg"
-          :before-upload="(file) => handleFileChange(file, 'invoiceImg')"
+          :before-upload="handleFileChange"
         >
           <i v-if="invoiceImg" class="el-icon-delete avatar-uploader-icon"
             @click.stop="() => handleDeleteFile('invoiceImg') "></i>
@@ -95,6 +97,7 @@
             this.uploading = false;
             console.log('upload end')
           });
+        return false
       },
       /** 删除问及爱你 **/
       handleDeleteFile() {

pages/otherpage/money/withdraw.vue

@@ -41,7 +41,8 @@
                 <span @click="onJumpToUpload">{{!fpUrl ? '去上传电子发票' : '已上传电子发票'}}</span>
               </div>
             </div>
-            <div class="taxContent">代缴综合费率{{item.kaifabao_rate}}%, 预计到账￥{{calcOkMoney(item)}}元</div>
+            <div class="taxContent">代缴综合费率{{calcRate(item)}}%, 预计到账￥{{calcOkMoney(item)
+              }}元</div>
           </div>
         </div>
       </div>
@@ -124,7 +125,10 @@
     },
     methods: {
       calcOkMoney(item) {
-        return Math.floor(this.vCoins * (100 - item.kaifabao_rate)) / 100
+        return Math.floor(this.vCoins * (100 - item.kaifabao_rate - item.original_rate)) / 100
+      },
+      calcRate(item) {
+        return Math.round((Number(item.kaifabao_rate) + Number(item.original_rate)) * 100) / 100
       },
       getWithdrawType() {
         this.$axios.post('/api/kaifabao/getBuckleConfigList').then(res => {