Merge remote-tracking branch 'origin/development'

manifest.config.ts

@@ -24,8 +24,8 @@ export default defineManifestConfig({
   'name': VITE_APP_TITLE,
   'appid': VITE_UNI_APPID,
   'description': '',
-  'versionName': '1.4.5',
-  'versionCode': '145',
+  'versionName': '1.4.7',
+  'versionCode': '147',
   'transformPx': false,
   'locale': VITE_FALLBACK_LOCALE === 'en' ? 'en' : 'bn', // 此app需默认孟加拉语
   'fallbackLocale': 'bn',

src/locale/bn.json

@@ -150,6 +150,8 @@
   "mine.pages.myFavorite.empty": "এখনও পছন্দ নেই",
   "wallet.withdraw.title": "উত্তোলন",
   "wallet.withdraw.balance": "ওয়ালেট উপলব্ধ পরিমাণ",
+  "wallet.withdraw.balanceRevenue": "রাজস্ব উপলব্ধ পরিমাণ",
+  "wallet.withdraw.balanceWallet": "ওয়ালেট উপলব্ধ পরিমাণ",
   "wallet.withdraw.info": "উত্তোলনের তথ্য",
   "wallet.withdraw.form.bankName": "ব্যাংকের নাম",
   "wallet.withdraw.form.bankAccountName": "ব্যাংক অ্যাকাউন্ট নাম",

src/locale/en.json

@@ -137,6 +137,8 @@
   "income.myGroupData": "My Group Data",
   "wallet.withdraw.title": "Withdraw",
   "wallet.withdraw.balance": "Wallet Available Amount",
+  "wallet.withdraw.balanceRevenue": "Revenue Available Amount",
+  "wallet.withdraw.balanceWallet": "Wallet Available Amount",
   "wallet.withdraw.info": "Withdrawal information",
   "wallet.withdraw.form.bankName": "Bank Name",
   "wallet.withdraw.form.bankAccountName": "Bank Account Name",

src/locale/zh-Hans.json

@@ -150,6 +150,8 @@
   "mine.pages.myFavorite.empty": "暂无收藏",
   "wallet.withdraw.title": "提现",
   "wallet.withdraw.balance": "钱包可用金额",
+  "wallet.withdraw.balanceRevenue": "收益可用金额",
+  "wallet.withdraw.balanceWallet": "钱包可用金额",
   "wallet.withdraw.info": "提现信息",
   "wallet.withdraw.form.bankName": "银行名称",
   "wallet.withdraw.form.bankAccountName": "开户名",

src/manifest.json

@@ -2,8 +2,8 @@
   "name": "BandhuBuy",
   "appid": "__UNI__D38110B",
   "description": "",
-  "versionName": "1.4.5",
-  "versionCode": "145",
+  "versionName": "1.4.7",
+  "versionCode": "147",
   "transformPx": false,
   "app-plus": {
     "usingComponents": true,
@@ -41,7 +41,11 @@
         ],
         "minSdkVersion": 30,
         "targetSdkVersion": 30,
-        "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"]
+        "abiFilters": [
+          "armeabi-v7a",
+          "arm64-v8a",
+          "x86"
+        ]
       },
       "ios": {
         "idfa": false

src/pages/wallet/withdraw.vue

@@ -165,7 +165,7 @@ onLoad((options) => {
     </wd-navbar>
     <view class="px-28rpx pb-28rpx pt-40rpx">
       <view class="text-28rpx">
-        {{ $t('wallet.withdraw.balance') }}
+        {{ $t(queryParams.type === '2' ? 'wallet.withdraw.balanceRevenue' : 'wallet.withdraw.balanceWallet') }}
       </view>
       <view>
         <text class="text-28rpx">