diff --git a/lang/en.json b/lang/en.json index 044e93aa..fcdea010 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1279,6 +1279,7 @@ "cash-create": { "cash-create": { "qg404q": "Withdrawal amount", + "9ugssd": "Handling fees", "5o1q52": "Gift amount cannot be withdrawn", "iaw845": "Withdrawable amount", "1dbkw2": "Available amount", @@ -1301,7 +1302,8 @@ "0mn186": "Please fill in the receiving account number", "c7h4mu": "Please fill in the name of the account holder", "724kn8": "Withdrawals cannot be lower than", - "duo0ts": "Withdrawal cannot be greater than" + "duo0ts": "Withdrawal cannot be greater than", + "678iu2": "Estimated handling fee" } }, "payment-code": { diff --git a/lang/zh.json b/lang/zh.json index 342435ac..e1386d65 100644 --- a/lang/zh.json +++ b/lang/zh.json @@ -1270,6 +1270,7 @@ "cash-create": { "cash-create": { "qg404q": "提现金额", + "9ugssd": "手续费", "5o1q52": "赠送金额不可提现", "iaw845": "可提现金额", "1dbkw2": "可用金额", @@ -1292,7 +1293,8 @@ "0mn186": "请填写收款账号", "c7h4mu": "请填写开户人姓名", "724kn8": "提现不能低于", - "duo0ts": "提现不能大于" + "duo0ts": "提现不能大于", + "678iu2": "预计手续费" } }, "payment-code": { diff --git a/pages/plugins/wallet/cash-create/cash-create.vue b/pages/plugins/wallet/cash-create/cash-create.vue index 519d68d5..4d89dcd3 100644 --- a/pages/plugins/wallet/cash-create/cash-create.vue +++ b/pages/plugins/wallet/cash-create/cash-create.vue @@ -5,24 +5,28 @@ {{$t('cash-create.cash-create.qg404q')}}* - - - {{$t('cash-create.cash-create.5o1q52')}} + + {{$t('cash-auth.cash-auth.27b4w5')}} - {{ data_base.cash_minimum_amount }} + {{ data_base.cash_minimum_amount }} {{$t('cash-create.cash-create.iaw845')}} - {{ can_cash_max_money }} + {{ can_cash_max_money }} {{$t('cash-create.cash-create.1dbkw2')}} - {{ user_wallet.normal_money }} + {{ user_wallet.normal_money }} {{$t('cash-create.cash-create.162f7o')}} - {{ user_wallet.give_money }} + {{ user_wallet.give_money }} + {{$t('cash-create.cash-create.5o1q52')}} + + + {{$t('cash-create.cash-create.678iu2')}} + {{cash_commission_value}} @@ -57,9 +61,7 @@ {{$t('cash-create.cash-create.858o54')}} - - - + @@ -85,7 +87,8 @@ user_wallet: {}, default_data: {}, check_status: null, - can_cash_max_money: 0.0, + can_cash_max_money: 0.00, + cash_commission_value: 0.00 }; }, @@ -174,6 +177,16 @@ app.globalData.showToast(this.$t('common.internet_error_tips')); }, }); + }, + + // 提现金额事件 + cash_money_event(e) { + if((this.data_base || null) != null && (this.data_base.cash_commission_rate || 0) != 0) { + var value = parseFloat(e.detail.value || 0); + this.setData({ + cash_commission_value: app.globalData.price_two_decimal(value*parseFloat(this.data_base.cash_commission_rate)), + }) + } }, // 数据提交 @@ -240,10 +253,15 @@ }, }); } - }, + }, + + // url事件 + url_event(e) { + app.globalData.url_event(e); + } }, }; + \ No newline at end of file diff --git a/pages/plugins/wallet/components/user-cash/user-cash.vue b/pages/plugins/wallet/components/user-cash/user-cash.vue index 2dc9c41a..1f6d32c7 100644 --- a/pages/plugins/wallet/components/user-cash/user-cash.vue +++ b/pages/plugins/wallet/components/user-cash/user-cash.vue @@ -70,7 +70,8 @@ nav_status_index: 0, content_list: [ { name: this.$t('user-cash-detail.user-cash-detail.e8a3e8'), field: 'cash_no' }, - { name: this.$t('cash-create.cash-create.qg404q'), field: 'money' }, + { name: this.$t('cash-create.cash-create.qg404q'), field: 'money' }, + { name: this.$t('cash-create.cash-create.9ugssd'), field: 'commission' }, ], }; }, diff --git a/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue b/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue index cdf0713d..c3c26219 100644 --- a/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue +++ b/pages/plugins/wallet/user-cash-detail/user-cash-detail.vue @@ -90,7 +90,8 @@ export default { detail_list: [ { name: this.$t('user-cash-detail.user-cash-detail.e8a3e8'), value: data.data.cash_no || "" }, { name: this.$t('user-cash-detail.user-cash-detail.wyad6w'), value: data.data.status_name || "" }, - { name: this.$t('cash-create.cash-create.qg404q'), value: data.data.money || "" }, + { name: this.$t('cash-create.cash-create.qg404q'), value: data.data.money || "" }, + { name: this.$t('cash-create.cash-create.9ugssd'), value: data.data.commission || "" }, { name: this.$t('user-cash-detail.user-cash-detail.j5s3u6'), value: data.data.bank_name || "" }, { name: this.$t('user-cash-detail.user-cash-detail.53k647'), value: data.data.bank_username || "" }, { name: this.$t('user-cash-detail.user-cash-detail.m556tl'), value: data.data.bank_accounts || "" },