21 Incheckningar 22ce678af1 ... 48594a6d64

Upphovsman SHA1 Meddelande Datum
  liangan 48594a6d64 Merge branch 'development' 2 veckor sedan
  liangan 8eceda9c44 chore: sync manifest.config.ts from main branch 2 veckor sedan
  liangan 4cf708b9a5 chore: re-add env folder and manifest.config.ts to version control 2 veckor sedan
  liangan 221c1ad940 fix: 增加忽略文件 2 veckor sedan
  liangan a6864342f4 chore: remove env folder and manifest.config.ts from version control 2 veckor sedan
  liangan 5e3e12bce8 feat: 新增费率功能/忽略会冲突的文件 2 veckor sedan
  liangan f3c760b293 fix: 修复best 进入商品详情入参问题及多语言,支付loading 2 veckor sedan
  liangan 84b508c634 fix: 修改取消订单接口入参 3 veckor sedan
  liangan 5e7ebc38ed fix: 取消订单入参修改 3 veckor sedan
  liangan 537a67deb9 feat: 钱包冻结金额功能 3 veckor sedan
  liangan a991e1cfdd fix: 分库分表修改订单拼团列表入参 1 månad sedan
  liangan 87a1f3fa3f fix: 分库分表修改订单详情入惨 1 månad sedan
  liangan 8e6f65ae77 fix: 修改密码登录后只可以修改自己的账号密码 1 månad sedan
  liangan 46874cb69e fix: 充值记录跳转 1 månad sedan
  liangan 182d435c99 fix: pages.json 更新 1 månad sedan
  liangan 26baad2ce5 feat: 修改h5分享路径 1 månad sedan
  liangan cd92215483 ci: 测试高斯模糊及旋转设置 1 månad sedan
  liangan e413acea89 ci: 修改版本号及打包apk兼容86 1 månad sedan
  liangan 7ebead88a1 fix: 修复\n换行符问题 1 månad sedan
  liangan 6f1841148e fix: 去掉选择规格匹配时的trim 1 månad sedan
  liangan 4994026a51 fix: 修改为测试环境地址 1 månad sedan
3 ändrade filer med 19 tillägg och 2 borttagningar
  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') }}