2
0

2 Commits 010e13ea00 ... eeb77a475f

Autor SHA1 Nachricht Datum
  liangan eeb77a475f Merge branch 'development' vor 2 Wochen
  liangan ad4ff2ba32 feat: 提现区分收益和钱包费率,文案修改 vor 2 Wochen

+ 2 - 0
src/locale/bn.json

@@ -405,6 +405,8 @@
   "orderDetail.bandhuBuyWallet": "BandhuBuy ওয়ালেট",
   "orderDetail.paymentMethod": "পেমেন্ট",
   "orderDetail.walletBalanceText": "ভারসাম্য",
+  "orderDetail.walletAmountText": "নগদ প্রত্যাহার",
+  "orderDetail.walletFeeText": "পরিষেবা মাল্য",
   "productDetail.fullRefundText": "জিততে না পারলে পুরো ফেরত + নগদ পুরস্কার",
   "app.notificationPermission": "আপনি বিজ্ঞপ্তি অনুমতি খুলেননি",
   "wallet.recharge.record": "রেকর্ড",

+ 2 - 0
src/locale/en.json

@@ -405,6 +405,8 @@
   "orderDetail.bandhuBuyWallet": "BandhuBuy Wallet",
   "orderDetail.paymentMethod": "Payment",
   "orderDetail.walletBalanceText": "Balance",
+  "orderDetail.walletAmountText": "Withdraw amount",
+  "orderDetail.walletFeeText": "Service Fee",
   "productDetail.fullRefundText": "Full refund if not won + cash reward",
   "app.notificationPermission": "You have not opened notification permissions",
   "wallet.recharge.record": "Record",

+ 2 - 0
src/locale/zh-Hans.json

@@ -405,6 +405,8 @@
   "orderDetail.bandhuBuyWallet": "BandhuBuy 钱包",
   "orderDetail.paymentMethod": "支付",
   "orderDetail.walletBalanceText": "余额",
+  "orderDetail.walletAmountText": "提现金额",
+  "orderDetail.walletFeeText": "服务费",
   "productDetail.fullRefundText": "未中奖全额退款 + 现金奖励",
   "app.notificationPermission": "您还没有打开通知权限",
   "wallet.recharge.record": "记录",

+ 2 - 2
src/pages/wallet/withdraw.vue

@@ -109,7 +109,7 @@ async function submit() {
 const withdrawRate = ref<any>()
 async function getConfig() {
   try {
-    const res = await getConfigByCode({ code: 'withdraw_rate' })
+    const res = await getConfigByCode({ code: queryParams.value.type === '2' ? 'earning_withdraw_rate' : 'withdraw_rate' })
     withdrawRate.value = res.data.valueInfo
   }
   catch {
@@ -128,8 +128,8 @@ const serviceFee = computed(() => {
 })
 
 onLoad((options) => {
-  getConfig()
   queryParams.value = options
+  getConfig()
 })
 </script>
 

+ 4 - 1
src/pages/wallet/withdrawRecord.vue

@@ -61,7 +61,10 @@ onLoad((options) => {
           <wd-text :type="item.status === 4 ? 'success' : 'primary'" bold :text="statusEnum.find(i => i.code === item.status)?.name" />
         </view>
         <view class="flex items-center justify-between text-22rpx text-#3A444C">
-          <view>{{ $t('orderDetail.walletBalanceText') }}:-{{ formatNumber(item.amount) }}</view>
+          <view>{{ $t('orderDetail.walletAmountText') }}:-{{ formatNumber(item.amount) }}</view>
+        </view>
+        <view class="flex items-center justify-between text-22rpx text-#3A444C">
+          <view>{{ $t('orderDetail.walletFeeText') }}:-{{ formatNumber(item.fee) }}</view>
           <view>{{ item.createTime }}</view>
         </view>
       </view>