Jelajahi Sumber

Merge branch 'development'

# Conflicts:
#	env/.env
#	package.json
#	src/manifest.json
liangan 2 minggu lalu
induk
melakukan
48594a6d64
3 mengubah file dengan 19 tambahan dan 2 penghapusan
  1. 4 0
      .gitignore
  2. 2 2
      src/manifest.json
  3. 13 0
      src/pages/wallet/withdraw.vue

+ 4 - 0
.gitignore

@@ -29,6 +29,10 @@ docs/.vitepress/cache
 
 src/types
 
+# 环境配置文件和 manifest 配置
+env/
+manifest.config.ts
+
 # lock 文件还是不要了,我主要的版本写死就好了
 # pnpm-lock.yaml
 # package-lock.json

+ 2 - 2
src/manifest.json

@@ -2,8 +2,8 @@
   "name": "BandhuBuy",
   "appid": "__UNI__D38110B",
   "description": "",
-  "versionName": "1.3.8",
-  "versionCode": "138",
+  "versionName": "1.3.2",
+  "versionCode": "132",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,

+ 13 - 0
src/pages/wallet/withdraw.vue

@@ -117,6 +117,16 @@ async function getConfig() {
   }
 }
 
+// 计算服务费
+const serviceFee = computed(() => {
+  const amount = Number(formData.value.amount)
+  if (!amount || Number.isNaN(amount) || !withdrawRate.value) {
+    return '0.00'
+  }
+  const rate = Number(withdrawRate.value)
+  return formatNumber(amount * (rate / 100))
+})
+
 onLoad((options) => {
   getConfig()
   queryParams.value = options
@@ -201,6 +211,9 @@ onLoad((options) => {
               {{ $t('wallet.withdraw.form.allAmount') }}
             </wd-button>
           </view>
+          <view class="text-24rpx">
+            Service Fee:৳{{ serviceFee }}
+          </view>
         </view>
         <wd-button plain block custom-class="h-80rpx!" :loading="loading" @click="submit">
           {{ $t('wallet.withdraw.form.submit') }}