1

components/cwg-complex-search.vue

@@ -13,7 +13,7 @@
                             </template>
                             <template v-else-if="field.type === 'select'">
                                 <cwg-combox v-model:value="formData[field.key]" :options="field.options"
-                                    :placeholder="field.placeholder || '请选择'" :clearable="false"
+                                    :placeholder="field.placeholder || '请选择'" :clearable="field.clearable || false"
                                     @change="(e) => field.onChange?.(e) || handleSearch()" />
                             </template>
                             <template v-else-if="field.type === 'date'">

components/cwg-tabel.vue

@@ -52,8 +52,10 @@
                                     </text>
                                 </view>
                             </view>
-                            <cwg-icon v-else-if="column.type === 'more'" name="crm-chevron-down"
-                                class="crm-chevron-down" :size="16" color="#007" />
+                            <template v-else-if="column.type === 'more'">
+                                <cwg-icon v-if="isMobile" name="crm-chevron-down" class="crm-chevron-down" :size="16" color="#007" />
+                            </template>
+
                             <template v-else>
                                 {{ formatCellValue(row[column.prop], column, row) }}
                             </template>
@@ -520,10 +522,10 @@ const openRowDetail = (row) => {
 
     if (props.isPages) {
         emit('go-pages', row)
-    } else if (!isMobile.value){
-      // 只有移动端才打开详情弹窗
-      return
-    }else {
+    } else if (!isMobile.value) {
+        // 只有移动端才打开详情弹窗
+        return
+    } else {
         // 保存当前行和需要显示的列（有 prop 且有 label） pc 详情不展示操作按钮
         detailRow.value = { ...row, note: getNoteText(row, locale.value, userStore) }
         detailColumns.value = !isMobile.value ? props.columns.filter(col => col && col.prop && col.label && col.type !== 'action') : props.columns.filter(col => col && col.prop && col.label)

manifest.json

@@ -1,11 +1,13 @@
 {
     "name" : "CWGMarkets",
-    "appid" : "__UNI__60A9455",
+    "appid" : "__UNI__F1BC8D2",
     "description" : "应用描述",
     "versionName" : "1.0.5",
     "versionCode" : 2,
     "transformPx" : false,
     "app-plus" : {
+        "console": false,
+        "debug": false,
         "usingComponents" : true,
         "nvueCompiler" : "uni-app",
         "nvueStyleCompiler" : "uni-app",
@@ -182,6 +184,7 @@
         }
     },
     "h5" : {
+        "console": false,
         "template" : "template.h5.html",
         "router" : {
             "mode" : "hash",

pages/analytics/components/List.vue

@@ -1,7 +1,6 @@
 <template>
   <view class="news-list-container">
     <!-- 列表 -->
-    {{ imgUrl }}111{{ queryParams.tag }}
     <view v-if="list.length > 0" class="list">
 
       <view v-for="item in list" :key="item.id" class="news-item" @click="handleItemClick(item)">

pages/customer/components/AccountList.vue

@@ -248,7 +248,12 @@ const accounts = computed(() =>
         labels[1] = acc.platform || 'MT4';
         labels[2] = typeMap.value[acc.type];
         let nickname = typeMap.value[acc.type];
-        let fwq = acc.platform == 'MT4' ? 'MT4 CWGMarketsLtd-Live' : 'MT5 CWGMarketsSVG-Live';
+        let fwq
+        if (cativeIndex.value != 1) {
+            fwq = acc.platform == 'MT4' ? 'CWGMarketsLtd-Live' : 'CWGMarketsSVG-Live';
+        } else {
+            fwq = acc.platform == 'MT4' ? 'CWGMarketsLtd-Demo' : 'CWGMarketsSVG-Demo';
+        }
         const balance = acc.balance
         return {
             ...acc,

pages/customer/components/PaymentMethodsList.vue

@@ -18,11 +18,11 @@
             <text class="info-label" v-t="'Label.Fee'" />
             <text class="info-value" v-if="item.feeType == 1">{{ item.free != null ? item.free + '%' : '-' }}</text>
             <text class="info-value" v-else-if="item.feeType == 2">${{ item.feeAmount != null ? item.feeAmount : '0'
-              }}</text>
+            }}</text>
             <text class="info-value" v-else>{{ item.free != null ? item.free + '%' : '-' }}</text>
           </view>
           <view class="info-item">
-            <text class="info-label" >限制</text>
+            <text class="info-label">限制</text>
             <text class="info-value">{{ item.minAmount }}-{{ item.maxAmount }} {{ item.currency }}</text>
           </view>
         </view>
@@ -34,8 +34,8 @@
 <script setup>
 import { defineProps, defineEmits } from 'vue'
 import Config from '@/config/index'
-const { Code, Host80 } = Config
-const imgUrl = Host80
+const { Code, Host05 } = Config
+const imgUrl = Host05
 // 定义 props，接收支付方式列表
 const props = defineProps({
   list: {

pages/customer/components/TerminalInfoDialog.vue

@@ -6,11 +6,11 @@
             <view v-if="accountNumber" class="account-number-row">
                 <text class="label">{{ accountLabel }}</text>
                 <text class="value">{{ accountNumber }}</text>
+                <text class="value">{{ form.fwq }}</text>
             </view>
 
             <!-- 动态字段列表 -->
             <view v-for="(field, index) in fieldList" :key="index" class="field-row">
-
                 <cwg-label-line-value :label="field.label" :value="getFieldValue(field.key)">
                     <template #operation v-if="field.copyable">
                         <view class="copy-btn" @click="copyValue(getFieldValue(field.key))">

pages/customer/payment-history.vue

@@ -242,7 +242,7 @@ const filterFields = computed(() => [
     {
         key: 'orderStatus', type: 'select', label: t('Custom.PaymentHistory.Status'), placeholder: t('placeholder.choose'), options: orderStatusMap.value, defaultValue: null
     },
-    isLoaded.value && isSuccess.value && { key: 'login', type: 'select', label: t('Custom.PaymentHistory.TradingAccount'), placeholder: t('placeholder.login'), options: loginOptions || [], defaultValue: search.login || undefined },
+    isLoaded.value && isSuccess.value && { key: 'login', type: 'select', label: t('Custom.PaymentHistory.TradingAccount'), placeholder: t('placeholder.login'), options: loginOptions || [], defaultValue: search.login || undefined, clearable: true },
     { key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' }
 ])
 
@@ -251,7 +251,6 @@ const searchParams = ref({})
 const handleSearch = (params) => {
     Object.assign(search, params)
     search.platform = loginOptions.find(item => item.value === params.login)?.platform || ''
-    if (!search.platform) return
     nextTick(() => {
         tableRef.value.refreshTable()
     })
@@ -260,7 +259,6 @@ const handleSearch = (params) => {
 const handleReset = (params) => {
     Object.assign(search, params)
     search.platform = loginOptions.find(item => item.value === params.login)?.platform || ''
-    if (!search.platform) return
     nextTick(() => {
         tableRef.value.refreshTable()
     })

pages/customer/trade-history.vue

@@ -127,7 +127,7 @@ const mobilePrimaryFields = computed(() => [
 
 // 动态传入筛选字段配置
 const filterFields = computed(() => [
-    isLoaded.value && isSuccess.value && { key: 'login', type: 'select', label: t('Custom.PaymentHistory.TradingAccount'), placeholder: t('placeholder.login'), options: loginOptions || [], defaultValue: search?.login || undefined },
+    isLoaded.value && isSuccess.value && { key: 'login', type: 'select', label: t('Custom.PaymentHistory.TradingAccount'), placeholder: t('placeholder.login'), options: loginOptions || [], defaultValue: search?.login || undefined, clearable: true },
     { key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' }
 ])
 const searchParams = ref({})
@@ -136,7 +136,6 @@ const handleSearch = (params) => {
     Object.assign(search, params)
     search.login = Number(params.login)
     search.platform = loginOptions.find(item => item.value == params.login)?.platform || ''
-    if (!search.platform) return
     nextTick(() => {
         tableRef.value.refreshTable()
     })
@@ -145,7 +144,6 @@ const handleSearch = (params) => {
 const handleReset = (params) => {
     Object.assign(search, params)
     search.platform = loginOptions.find(item => item.value == params.login)?.platform || ''
-    if (!search.platform) return
     nextTick(() => {
         tableRef.value.refreshTable()
     })

pages/customer/trade-position.vue

@@ -133,7 +133,7 @@ const mobilePrimaryFields = computed(() => [
 
 // 动态传入筛选字段配置
 const filterFields = computed(() => [
-    isLoaded.value && isSuccess.value && { key: 'login', type: 'select', label: t('Custom.PaymentHistory.TradingAccount'), placeholder: t('placeholder.login'), options: loginOptions || [], defaultValue: search.login || undefined },
+    isLoaded.value && isSuccess.value && { key: 'login', type: 'select', label: t('Custom.PaymentHistory.TradingAccount'), placeholder: t('placeholder.login'), options: loginOptions || [], defaultValue: search.login || undefined, clearable: true },
     { key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' }
 ])
 const searchParams = ref({})
@@ -142,7 +142,6 @@ const handleSearch = (params) => {
     Object.assign(search, params)
     search.login = Number(params.login)
     search.platform = loginOptions.find(item => item.value === params.login)?.platform || ''
-    if (!search.platform) return
     nextTick(() => {
         tableRef.value.refreshTable()
     })
@@ -151,7 +150,6 @@ const handleSearch = (params) => {
 const handleReset = (params) => {
     Object.assign(search, params)
     search.platform = loginOptions.find(item => item.value === params.login)?.platform || ''
-    if (!search.platform) return
     nextTick(() => {
         tableRef.value.refreshTable()
     })

pages/ib/transfer.vue

@@ -11,6 +11,15 @@
                 <view class="box box-step2">
                     <view class="b-card">
                         <view class="card-top">
+                            <view class="tit">
+                                <text v-t="'Label.AgentNumber'"></text>
+                                <text>：{{ ibInfo.ibNo }}</text>
+                                <text class="balance-kg"></text>
+                                <text v-t="'Label.CommissionBalance'"></text>
+                                <text>：$</text>
+                                <text>{{ balanceInt }}</text>
+                                <text>.{{ balanceDecimal }}</text>
+                            </view>
                             <uni-forms ref="formRef" :model="form" :rules="rules" label-width="300" label-position="top"
                                 validate-trigger="submit">
                                 <view class="form-row">
@@ -43,18 +52,18 @@
                                             <label class="checkbox">
                                                 <checkbox value="1" :checked="form.agree5" />
                                                 <text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit1')
-                                                }}</text>
+                                                    }}</text>
 
                                                 <view style="margin-top: 10px;line-height: 1.5; font-size: 14px">
                                                     <text class="crm-cursor" @click.stop="dialogCheckTip = true">{{
                                                         t('Custom.Withdraw.Des') }}</text>
                                                     <text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit2')
-                                                        }}</text>
+                                                    }}</text>
                                                     <text class="clause crm-cursor" style="text-decoration: underline;"
                                                         @click.stop="dialogClauseNZTwo = true">{{
                                                             t('news_add_field1.activitiesNZTwo.itemDeposit3') }}</text>
                                                     <text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit4')
-                                                        }}</text>
+                                                    }}</text>
                                                 </view>
 
                                             </label>
@@ -124,12 +133,12 @@ import { activityApi } from '@/service/activity'
 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 userStore = useUserStore()
 const ibInfo = computed(() => {
     return userStore?.userInfo?.ibInfo || {}
 })
-
 const { Code } = Config
 const { t, locale } = useI18n()
 const activeTab = ref(1)
@@ -266,20 +275,26 @@ const onAgree5Change = (e) => {
 const onAgree6Change = (e) => {
     form.agree6 = e.detail.value.length > 0
 }
-const customAmount = ref(0)
+const balanceInt = computed(() => {
+    return numberFormat(balance.value || 0, true)[0]
+})
+const balanceDecimal = computed(() => {
+    return numberFormat(balance.value || 0, true)[1] || '00'
+})
+const balance = ref(0)
 //获取基础信息
 const getDateList = async () => {
     let res = await ibApi.IbData({});
     if (res.code == Code.StatusOK) {
         if (res.data != null) {
-            customAmount.value = res.data.customAmount
+            balance.value = res.data.balance
         }
     } else {
         uni.showToast({ title: res.msg, icon: 'none' })
     }
 }
 const setAllAmount = () => {
-    form.amount = customAmount
+    form.amount = balance.value
     validateAmount()
 }
 function validateAmount() {
@@ -474,6 +489,7 @@ async function transferConfig() {
         flag.value = false
         resetForm()
         if (dialogCheckWait.value) dialogCheckWait.value = false
+        getDateList()
     }
 }
 
@@ -684,16 +700,38 @@ onLoad((options) => {
 
                     .tit {
                         font-size: px2rpx(16);
-                        margin-bottom: px2rpx(12);
                         font-weight: 600;
+                        margin-bottom: px2rpx(16);
+                        display: flex;
+                        align-items: center;
+                        color: var(--color-navy-900);
+                        position: relative;
+                        padding-left: 20px;
+
+                        &:after {
+                            content: '';
+                            position: absolute;
+                            left: 0;
+                            top: 50%;
+                            transform: translateY(-50%);
+                            width: 0;
+                            height: 0;
+                            border-top: 6px solid transparent;
+                            border-bottom: 6px solid transparent;
+                            border-left: 8px solid currentColor;
+                        }
 
                         .iconfont {
-                            font-size: px2rpx(18);
                             margin-right: px2rpx(8);
-                            color: #409eff;
+                            color: var(--color-primary);
+                            font-size: px2rpx(18);
                         }
                     }
 
+                    .balance-kg {
+                        width: px2rpx(20);
+                    }
+
                     .title-wrapper {
                         display: flex;
                         justify-content: space-between;

pages/ib/withdraw.vue

@@ -460,7 +460,7 @@ const tableData = reactive({
     CHANNEL_TYPE_ALI_WALLET: [],
     UCARD_WALLET: []
 })
-const customAmount = ref(0)
+const balance = ref(0)
 //获取基础信息
 const getDateList = async () => {
     console.log(4242);
@@ -468,7 +468,7 @@ const getDateList = async () => {
     let res = await ibApi.IbData({});
     if (res.code == Code.StatusOK) {
         if (res.data != null) {
-            customAmount.value = res.data.customAmount
+            balance.value = res.data.balance
         }
     } else {
         uni.showToast({ title: res.msg, icon: 'none' })
@@ -476,7 +476,7 @@ const getDateList = async () => {
     loading.value = false
 }
 const setAllAmount = () => {
-    form.amount = customAmount
+    form.amount = balance.value
     validateAmount()
 }
 //通道table-选择前后