开发宝

pages/otherpage/money/uploadInvoice.vue

@@ -61,8 +61,8 @@
       }
     },
     created() {
-      const {coins=1} = this.$route.query || {}
-      this.coins = Number(coins) || 0
+      const {vCoins=1} = this.$route.query || {}
+      this.vCoins = Number(vCoins) || 0
     },
     methods: {
       /** 图片文件上传 **/
@@ -102,7 +102,9 @@
           this._toast('请上传发票', 'error')
           return
         }
-        location.href = `/otherpage/money/withdraw?coins=${this.coins}&fpUrl=${encodeURIComponent(this.invoiceImg)}`
+        location.href = `/otherpage/money/withdraw?vCoins=${this.vCoins || ''
+        }&fpUrl=${encodeURIComponent(this.invoiceImg)
+        || ''}`
       }
     }
   }

pages/otherpage/money/withdraw.vue

@@ -41,7 +41,7 @@
                 <span @click="onJumpToUpload">{{!fpUrl ? '去上传电子发票' : '已上传电子发票'}}</span>
               </div>
             </div>
-            <div class="taxContent">代缴综合费率{{item.kaifabao_rate}}%, 预计到账￥{{calcOkMoney}}元</div>
+            <div class="taxContent">代缴综合费率{{item.kaifabao_rate}}%, 预计到账￥{{calcOkMoney(item)}}元</div>
           </div>
         </div>
       </div>
@@ -94,12 +94,6 @@
       }
     },
     computed: {
-      calcOkMoney() {
-        if (this.selectedId === -1) {
-          return 0
-        }
-        return this.vCoins * (1 - this.selectedItem.kaifabao_rate)
-      },
       selectedItem() {
         return this.list.filter(v=>v.id === this.selectedId)[0] || {}
       }
@@ -114,14 +108,17 @@
       }
     },
     created() {
-      const {coins='', fpUrl=''} = this.$route.query || {}
-      this.vCoins = coins
+      const {vCoins='', fpUrl=''} = this.$route.query || {}
+      this.vCoins = vCoins
       this.fpUrl = fpUrl
       this.getAccountBalanceInfo()
       this.getAccountBankAccountInfo()
       this.getWithdrawType()
     },
     methods: {
+      calcOkMoney(item) {
+        return Math.floor(this.vCoins * (100 - item.kaifabao_rate)) / 100
+      },
       getWithdrawType() {
         this.$axios.post('/api/kaifabao/getBuckleConfigList').then(res => {
           if (Number(res.data.status) === 1) {
@@ -169,7 +166,7 @@
       },
       onJumpToUpload() {
         const {vCoins, fpUrl} = this
-        location.href = `/otherpage/money/uploadInvoice?coins=${vCoins}&fpUrl=${fpUrl}`
+        location.href = `/otherpage/money/uploadInvoice?vCoins=${vCoins || ''}&fpUrl=${fpUrl || ''}`
       },
       onJumpToBankSetting() {
         location.href = 'proginn://edit_bankcard_info'
@@ -180,11 +177,11 @@
           this._toast('请选择缴税方案')
           return
         }
-        if (!this.coins || this.coins < 10) {
+        if (!this.vCoins || this.vCoins < 10) {
           this._toast('提现金额不得低于10元')
           return
         }
-        if (this.coins > 30000) {
+        if (this.vCoins > 30000) {
           this._toast('单日提现总额度不得超过30000元')
           return
         }
@@ -196,19 +193,23 @@
         //自行提供发票
         if (Number(is_auto) === 1) {
           this.$axios.post('/api/recruit/addInvoiceWithdrawalApply', {
-            coins: this.coins,
+            coins: this.vCoins,
             invoice_url: this.fpUrl
           }).then(res=>{
-            this._toast('上传成功')
-            location.href = '/otherpage/money/'
+            if (Number(res.data.status) === 1) {
+              this._toast('提交成功')
+              location.href = '/otherpage/money/'
+            }
           })
         } else {
           this.$axios.post('/api/account/takeSalary', {
-            coins: this.coins,
+            coins: this.vCoins,
             payment_id: id
           }).then(res=>{
-            this._toast('上传成功')
-            location.href = '/otherpage/money/'
+            if (Number(res.data.status) === 1) {
+              this._toast('提交成功')
+              location.href = '/otherpage/money/'
+            }
           })
         }
       },