zhb 1 неделя назад
Родитель
Сommit
a63281ba70

+ 3 - 2
pages/activities/index.vue

@@ -849,7 +849,8 @@ const confirm = useConfirm()
 const { t, locale } = useI18n()
 let { Code, Host05 } = Config
 const showPage = ref(false)
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 // 国家列表
 const countries = [
     "DZ", "AO", "BJ", "BW", "BF", "CM", "CG", "CD", "CI", "DJ", "EG", "ET",
@@ -1244,7 +1245,7 @@ const getDateList = async () => {
         // loginOptions1.value = res.data
         loginOptions1.value = res.data.map(item => ({
             ...item,
-            label: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+            label: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
             disable: item.closeFunctions.includes('1')
         }))
     } else {

+ 3 - 2
pages/customer/deposit-select.vue

@@ -520,7 +520,8 @@ const router = useRouter()
 import tool from "@/global/tool"
 import { object } from 'uview-plus/libs/function/test'
 // import { createUploadRequest } from "@/lib/upload"
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 // 常量
 const countries = [
     "DZ", "AO", "BJ", "BW", "BF", "CM", "CG", "CD", "CI", "DJ", "EG", "ET", "GA", "GM", "GH", "GN", "KE", "MG", "MW", "ML", "MR", "MA", "MZ", "NA", "NE", "NG", "RW", "SN", "SL", "SO", "ZA", "SS", "SD", "TZ", "TG", "TN", "UG", "ZM", "ZW", "LS", "BH", "IR", "IQ", "IL", "JO", "KW", "LB", "OM", "PS", "QA", "SA", "SY", "TR", "AE", "YE", "AR", "BO", "BR", "CL", "CO", "EC", "GY", "PY", "PE", "SR", "UY", "VE", "BZ", "CR", "SV", "GT", "HN", "NI", "PA", "AU", "CA", "AL", "AD", "AM", "AT", "AZ", "BY", "BE", "BA", "BG", "HR", "CY", "CZ", "DK", "EE", "FI", "FR", "GE", "DE", "GR", "HU", "IS", "IE", "IT", "XK", "LV", "LI", "LT", "LU", "MT", "MD", "MC", "ME", "NL", "MK", "NO", "PL", "PT", "RO", "RU", "SM", "RS", "SK", "SI", "ES", "SE", "CH", "UA", "VA",
@@ -1697,7 +1698,7 @@ const showTable = () => {
 }
 const loginComboxOptions = computed(() => {
     return loginOptions.value.map((item) => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login,
       disable: item.disable,
     }))

+ 3 - 1
pages/customer/deposit.vue

@@ -413,6 +413,8 @@ import { openExternalUrl } from '@/utils/openExternalUrl'
 import tool from "@/global/tool"
 import { userToken } from '@/composables/config'
 // import { createUploadRequest } from "@/lib/upload"
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 // 常量
 const countries = [
     "DZ", "AO", "BJ", "BW", "BF", "CM", "CG", "CD", "CI", "DJ", "EG", "ET", "GA", "GM", "GH", "GN", "KE", "MG", "MW", "ML", "MR", "MA", "MZ", "NA", "NE", "NG", "RW", "SN", "SL", "SO", "ZA", "SS", "SD", "TZ", "TG", "TN", "UG", "ZM", "ZW", "LS", "BH", "IR", "IQ", "IL", "JO", "KW", "LB", "OM", "PS", "QA", "SA", "SY", "TR", "AE", "YE", "AR", "BO", "BR", "CL", "CO", "EC", "GY", "PY", "PE", "SR", "UY", "VE", "BZ", "CR", "SV", "GT", "HN", "NI", "PA", "AU", "CA", "AL", "AD", "AM", "AT", "AZ", "BY", "BE", "BA", "BG", "HR", "CY", "CZ", "DK", "EE", "FI", "FR", "GE", "DE", "GR", "HU", "IS", "IE", "IT", "XK", "LV", "LI", "LT", "LU", "MT", "MD", "MC", "ME", "NL", "MK", "NO", "PL", "PT", "RO", "RU", "SM", "RS", "SK", "SI", "ES", "SE", "CH", "UA", "VA",
@@ -1629,7 +1631,7 @@ const showTable = (type) => {
 }
 const loginComboxOptions = computed(() => {
     return loginOptions.value.map((item) => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login
     }))
 })

+ 4 - 2
pages/customer/transfer.vue

@@ -83,6 +83,8 @@ import { isAfterJuly28 } from '@/utils/dateUtils'
 import { customApi } from '@/service/custom'
 import { financialApi } from '@/service/financial'
 import { ibApi } from '@/service/ib'
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 // import ServiceA from "@/service/activity"; // 原注释保留
 import useUserStore from '@/stores/use-user-store'
 const userStore = useUserStore()
@@ -330,7 +332,7 @@ const cancle = () => {
 // 转出账户列表 
 const withdrawDisplayList = computed(() => {
     return loginOptions.value.map(item => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login,
         disable: isWithdrawDisabled(item)
     }))
@@ -344,7 +346,7 @@ const currencyOptions = ref([{ value: 'USD', text: 'USD' }])
 // 转入账户列表 
 const depositDisplayList = computed(() => {
     return toOptions.value.map(item => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login,
         disable: isDepositDisabled(item)
     }))

+ 3 - 2
pages/customer/wallet-transfer.vue

@@ -65,7 +65,8 @@ import { drawApi } from '@/service/draw'
 import Config from '@/config/index'
 const { Code } = Config
 const { t, locale } = useI18n()
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 const loading = ref(false)
 const flag = ref(false)
 const RES = ref('')
@@ -99,7 +100,7 @@ function groupCurrency(type) {
 }
 const toOptionsDisplay = computed(() => {
     return toOptions.value.map(item => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login
     }))
 })

+ 3 - 2
pages/customer/withdrawal-select.vue

@@ -429,7 +429,8 @@ import { useConfirm } from '@/hooks/useConfirm'
 const confirm = useConfirm()
 // 获取组件实例,用于访问全局挂载的属性和方法(替代 this)
 const { proxy } = getCurrentInstance()
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 // -------------------- data --------------------
 const loginValue = ref("")
 const loginValueDoc = ref("")
@@ -802,7 +803,7 @@ const dialogSuccess = computed(() => dialogCheck.value && dialogVisible.value)
 const dialogError = computed(() => dialogCheck.value && !dialogVisible.value)
 const loginComboxOptions = computed(() => {
   return loginOptions.value.map((item, index) => ({
-    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
     value: item.login,
     disable: item.disable,
   }))

+ 3 - 2
pages/customer/withdrawal.vue

@@ -686,7 +686,8 @@ const confirm = useConfirm()
 const isZh = computed(() => ['cn', 'zhHant'].includes(locale.value))
 // 获取组件实例,用于访问全局挂载的属性和方法(替代 this)
 const { proxy } = getCurrentInstance()
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 // -------------------- data --------------------
 const loginValue = ref("")
 const loginValueDoc = ref("")
@@ -1063,7 +1064,7 @@ const dialogSuccess = computed(() => dialogCheck.value && dialogVisible.value)
 const dialogError = computed(() => dialogCheck.value && !dialogVisible.value)
 const loginComboxOptions = computed(() => {
   return loginOptions.value.map((item, index) => ({
-    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
     value: item.login
   }))
 })

+ 3 - 1
pages/follow/components/applySignalDialog.vue

@@ -181,6 +181,8 @@ import { useI18n } from 'vue-i18n'
 import Config from '@/config/index'
 import { documentaryApi } from '@/service/documentary'
 import {useFollowEnum} from '@/pages/follow/const/enum'
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 
 const props = defineProps({
   visible: { type: Boolean, default: false },
@@ -222,7 +224,7 @@ const accountTypeOptions = [
 
 const loginOptionsData = computed(() => {
   return props.loginOptions.map(item => ({
-    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
     value: item.login,
     disable: item.balance < 1000
   }))

+ 3 - 2
pages/follow/trading-center.vue

@@ -186,7 +186,8 @@ import { useI18n } from 'vue-i18n'
 import { documentaryApi } from '@/service/documentary'
 import useUserStore from '@/stores/use-user-store'
 import {useFollowEnum} from '@/pages/follow/const/enum'
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 const { t, locale } = useI18n()
 const userStore = useUserStore()
 const userInfo = computed(() => userStore.userInfo)
@@ -480,7 +481,7 @@ watch(locale, () => {
 const followLoginOptions = computed(() => {
   return dialogFllowLoginData.value.map(item => ({
     value: item.login,
-    text: `${item.login} - ${getAccountTypeText(item.loginType)} - ${t('Custom.Deposit.AvailableBalance')}: $${item.balance || 0}`,
+    text: `${item.login} - ${getAccountTypeText(item.loginType)} - ${t('Custom.Deposit.AvailableBalance')}: $${numberDecimal(item.balance || 0)}`,
   }))
 })
 

+ 1 - 1
pages/follow/trading-management.vue

@@ -832,7 +832,7 @@ function groupTypeName(type) {
 }
 
 const loginOptions = computed(() => loginOptionsLogin.value.map(item => ({
-    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance || 0}`,
+    text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance || 0)}`,
     value: item.login,
     disable: item.balance < 1000
 })))

+ 3 - 2
pages/follow/transfer.vue

@@ -57,7 +57,8 @@ import { useI18n } from 'vue-i18n'
 import { customApi } from '@/service/custom'
 import { documentaryApi } from '@/service/documentary'
 import Config from '@/config/index'
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 const { Code } = Config
 const { t, locale } = useI18n()
 
@@ -94,7 +95,7 @@ function groupCurrency(type) {
 }
 const toOptionsDisplay = computed(() => {
     return toOptions.value.map(item => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login
     }))
 })

+ 4 - 3
pages/ib/agent-transfer.vue

@@ -152,7 +152,8 @@ const userStore = useUserStore()
 const ibInfo = computed(() => {
     return userStore?.userInfo?.ibInfo || {}
 })
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 const { Code } = Config
 const { t, locale } = useI18n()
 
@@ -360,7 +361,7 @@ function groupTypeName(type) {
 // 转出账户列表
 const withdrawDisplayList = computed(() => {
     return loginOptions.value.map(item => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login,
         disable: item.closeFunctions?.indexOf('3') != -1 || item.closeFunctions?.indexOf('5') != -1
     }))
@@ -369,7 +370,7 @@ const withdrawDisplayList = computed(() => {
 // 转入账户列表
 const depositDisplayList = computed(() => {
     return toOptions.value.map(item => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login
     }))
 })

+ 2 - 2
pages/ib/transfer.vue

@@ -202,7 +202,7 @@ import Config from '@/config/index'
 import useUserStore from '@/stores/use-user-store'
 import BonusAgreementPopup from './components/BonusAgreementPopup.vue'
 import { useFilters } from '@/composables/useFilters'
-const { numberFormat } = useFilters()
+const { numberFormat, numberDecimal } = useFilters()
 const userStore = useUserStore()
 import { isAfterJuly28 } from '@/utils/dateUtils'
 const ibInfo = computed(() => {
@@ -444,7 +444,7 @@ function groupTypeName(type) {
 const depositDisplayList = computed(() => {
     if (activeTab.value != 3) {
         return toInfo.value.map(item => ({
-            text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+            text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
             value: item.login,
             disable: item.status
         }))

+ 3 - 2
pages/ib/withdraw-select.vue

@@ -447,7 +447,8 @@ import CwgCheckConfirmPopup from '../customer/components/WithdrawCheckConfirmPop
 import CwgKycPopup from '../customer/components/KycPopup.vue'
 import PaymentMethodsList from '../customer/components/PaymentMethodsList.vue'
 import { useI18n } from 'vue-i18n'
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 const { t, locale } = useI18n()
 const { Code, Host80 } = Config
 import useRouter from '@/hooks/useRouter'
@@ -858,7 +859,7 @@ const validateAmount = () => {
 // ---------- 计算属性 ----------
 const loginComboxOptions = computed(() => {
     return loginOptions.value.map((item, index) => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login
     }))
 })

+ 3 - 2
pages/ib/withdraw.vue

@@ -729,7 +729,8 @@ import CwgCheckConfirmPopup from '../customer/components/WithdrawCheckConfirmPop
 import CwgKycPopup from '../customer/components/KycPopup.vue'
 import PaymentMethodsList from '../customer/components/PaymentMethodsList.vue'
 import { useI18n } from 'vue-i18n'
-
+import { useFilters } from '@/composables/useFilters'
+const { numberDecimal } = useFilters()
 const { t, locale } = useI18n()
 const { Code, Host80, Host05 } = Config
 
@@ -1176,7 +1177,7 @@ const validateAmount = () => {
 // ---------- 计算属性 ----------
 const loginComboxOptions = computed(() => {
     return loginOptions.value.map((item, index) => ({
-        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${item.balance}`,
+        text: `${item.login} - ${groupTypeName(item.type)} - ${t('Custom.Deposit.AvailableBalance')}${groupCurrency(item.currency)}${numberDecimal(item.balance)}`,
         value: item.login
     }))
 })