xiongzhu пре 3 година
родитељ
комит
2c4a04b24b
2 измењених фајлова са 7 додато и 20 уклоњено
  1. 4 18
      src/views/OrderDetailPage.vue
  2. 3 2
      src/views/WalletPage.vue

+ 4 - 18
src/views/OrderDetailPage.vue

@@ -305,24 +305,10 @@ export default {
     },
     methods: {
         delegate() {
-            this.$http
-                .get('/saleBatch/get/' + this.orderInfo.batchId)
-                .then(res => {
-                    this.batchInfo = res
-                    if (res.delayDelegate) {
-                        return showDialog({
-                            title: this.$t('common.alert'),
-                            message:
-                                this.$t('delegate.tips2') +
-                                Math.ceil(this.batchInfo.delayDuration / 3600) +
-                                this.$t('delegate.tips3')
-                        })
-                    }
-                    return Promise.resolve()
-                })
-                .then(() => {
-                    this.show = true
-                })
+            this.$http.get('/saleBatch/get/' + this.orderInfo.batchId).then(res => {
+                this.batchInfo = res
+                this.show = true
+            })
         },
         showTip() {
             showDialog({

+ 3 - 2
src/views/WalletPage.vue

@@ -222,8 +222,8 @@ export default {
             let feeRate, fee
             if (
                 this.balance.rechargeAccumulation &&
-                this.balance.transactionVolume &&
-                this.balance.transactionVolume / this.balance.rechargeAccumulation >= this.lowFeeFactor
+                this.balance.credits &&
+                this.balance.credits / this.balance.rechargeAccumulation >= this.lowFeeFactor
             ) {
                 feeRate = this.withdrawFeeLowRate
                 fee = this.withdrawFeeLowRate * amount
@@ -232,6 +232,7 @@ export default {
                 fee = this.withdrawFeeRate * amount
             }
             return {
+                feeRate,
                 fee: fee.toFixed(2),
                 realReceipt: amount.toFixed(2)
             }