1

pages/customer/components/AccountCard.vue

@@ -1,8 +1,8 @@
 <template>
     <view class="col-lg-4 col-md-6">
         <view class="card">
-            <view class="card-header d-flex align-items-center justify-content-between border-0 pb-0 p-3">
-                <text class="badge bg-success-subtle text-success">Active</text>
+            <view class="card-header d-flex align-items-center justify-content-between border-0 pb-2 p-3">
+                <text class="badge bg-success-subtle text-success">正常</text>
                 <view class="clearfix">
                     <view class="btn-group">
                         <cwg-dropdown ref="dropdownRef" @open="onOpen" @close="onClose" :menu-list="customMenuList"
@@ -16,20 +16,22 @@
                     </view>
                 </view>
             </view>
-            <view class="card-body p-2 pt-0">
-                <view class="text-center mb-3">
-                    <h5 class="fw-bold mb-0 text-secondary cursor-pointer" @click="copy(account.accountNumber)"># {{
+            <view class="card-body p-3 pt-0">
+                <view class="text-left mb-3">
+                    <h5 class="fw-bold mb-3  cursor-pointer" @click="copy(account.accountNumber)"># {{
                         account.accountNumber }}</h5>
                     <h4 class="mb-2 cursor-pointer" @click="copy(account.fwq)">{{ account.fwq }}</h4>
                     <template v-for="(label, index) in account.labels" :key="index">
-                        <text v-if="label" class="badge bg-danger-subtle text-danger mx-1">{{ label }}</text>
+                        <text v-if="label" class="badge bg-danger-subtle mx-1">{{ label }}</text>
                     </template>
                     <h1 class="mt-2">${{ balanceInteger }}{{ balanceDecimal }}</h1>
-                    <button type="submit" value="Submit" class="btn btn-secondary btn-sm w-75 waves-effect waves-light"
+                    <!-- <button type="submit" value="Submit" class="btn btn-secondary btn-sm w-75 waves-effect waves-light"
                         @click="handleAction('trade')">
-                        <cwg-icon name="crm-trade" :size="16" color="#fff" />
-                        开始交易
-                    </button>
+                        <view class="d-flex align-items-center justify-content-center gap-1"><cwg-icon name="crm-trade"
+                                :size="16" color="#fff" />
+                            开始交易</view>
+
+                    </button> -->
                     <hr>
                 </view>
                 <view class="text-left">
@@ -37,29 +39,29 @@
                         <view class="row">
                             <view class="col-6">
                                 <view class="mb-3">
-                                    <text class="mb-1">{{ t('Label.Leverage') }}</text>
+                                    <view class="mb-1">{{ t('Label.Leverage') }}</view>
                                     <view class="d-flex fw-semibold mb-0 text-dark">{{ account.actualLeverage }}</view>
                                 </view>
                                 <view class="mb-3">
-                                    <text class="mb-1">{{ t('Label.FloatingPL') }}</text>
+                                    <view class="mb-1">{{ t('Label.FloatingPL') }}</view>
                                     <view class="d-flex fw-semibold mb-0 text-dark">{{ account.floatingPL }}</view>
                                 </view>
                                 <view class="mb-3">
-                                    <text class="mb-1">{{ t('Label.Balance') }}</text>
+                                    <view class="mb-1">{{ t('Label.Balance') }}</view>
                                     <view class="text-dark fw-semibold mb-0">{{ account.balanceWithSymbol }}</view>
                                 </view>
                             </view>
                             <view class="col-6">
                                 <view class="mb-3">
-                                    <text class="mb-1">{{ t('Label.Equity') }}</text>
+                                    <view class="mb-1">{{ t('Label.Equity') }}</view>
                                     <view class="text-dark fw-semibold mb-0">{{ account.equityWithSymbol }}</view>
                                 </view>
                                 <view class="mb-3">
-                                    <text class="mb-1">{{ t('Label.Credit') }}</text>
+                                    <view class="mb-1">{{ t('Label.Credit') }}</view>
                                     <view class="text-dark fw-semibold mb-0">{{ account.creditWithSymbol }}</view>
                                 </view>
                                 <view class="mb-3">
-                                    <text class="mb-1">{{ t('Documentary.console.item3') }}</text>
+                                    <view class="mb-1">{{ t('Documentary.console.item3') }}</view>
                                     <view class="text-dark fw-semibold mb-0">{{ account.platform }}</view>
                                 </view>
                             </view>
@@ -68,8 +70,10 @@
                             <button v-for="btn in actionButtons" :key="btn.key" type="submit" value="Submit"
                                 class="btn btn-dark btn-sm waves-effect waves-light"
                                 :class="{ 'disabled': btn.disabled.value }" @click="handleAction(btn.action)">
-                                <cwg-icon :name="btn.icon" :size="14" color="#fff" />
-                                {{ t(btn.label) }}
+                                <view class="d-flex align-items-center justify-content-center gap-1">
+                                    <cwg-icon :name="btn.icon" :size="14" color="#fff" />
+                                    {{ t(btn.label) }}
+                                </view>
                             </button>
                         </view>
                     </view>
@@ -147,9 +151,9 @@ const fieldList = ref([
 const nickName = ref(accountInfo.value.nickName);
 
 const actionButtons = ref([
-    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-upload', action: 'deposit', disabled: computed(() => !closeFunctionOpen('1')) },
-    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-download', action: 'withdraw', disabled: computed(() => !closeFunctionOpen('2')) },
-    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-exchange', action: 'transfer', disabled: computed(() => !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3'))) }
+    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', disabled: computed(() => !closeFunctionOpen('1')) },
+    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', disabled: computed(() => !closeFunctionOpen('2')) },
+    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', disabled: computed(() => !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3'))) }
 ])
 
 const terminalDialogVisible = ref(false)
@@ -202,6 +206,7 @@ const handleAction = (type: string) => {
 };
 
 const customMenuList = computed(() => !isDemo.value ? [
+    { label: '开始交易', type: 'trade' },
     { label: t('Ib.Report.Tit1'), type: 'history' },
     { label: t('Ib.Report.Tit4'), type: 'position' },
     { label: t('Home.page_customer.item4'), type: 'payment-history' },
@@ -209,6 +214,7 @@ const customMenuList = computed(() => !isDemo.value ? [
     { label: t('vu.item3'), type: 'changePassword1' },
     { label: t('vu.item4'), type: 'changePassword2' }
 ] : [
+    { label: '开始交易', type: 'trade' },
     { label: t('Documentary.TundManagement.item29'), type: 'info' }
 ])
 const handleCustomClick = (item, index) => {
@@ -263,9 +269,9 @@ onBeforeUnmount(() => {
 .btn.disabled {
     opacity: 0.5;
     cursor: not-allowed;
-    
 }
-.btn{
+
+.btn {
     margin-left: 0;
     margin-right: 0;
 }

pages/customer/components/AccountList.vue

@@ -6,9 +6,13 @@
                 <view class="border-0 card-header">
                     <view class="d-flex flex-wrap gap-3 align-items-center justify-content-between mb-3">
                         <h3 class="mb-0" v-t="'Custom.Index.AccountList'"></h3>
-                        <button type="button" class="btn  btn-secondary  btn-shadow waves-effect" @click="createAccount"><i
-                                class="fi fi-rr-plus"></i>
-                            <text v-t="'Custom.Index.AddAccount'" /></button>
+                        <button type="button" class="btn  btn-secondary  btn-shadow waves-effect"
+                            @click="createAccount">
+                            <view class="d-flex align-items-center">
+                                <cwg-icon name="crm-plus" :size="14" color="#fff" />
+                                <text v-t="'Custom.Index.AddAccount'" />
+                            </view>
+                        </button>
                     </view>
                 </view>
             </view>
@@ -16,7 +20,7 @@
                 <view class="clearfix">
                     <view class="card">
                         <view class="card-header">
-                            <view class="nav nav-underline card-header-tabs" id="myTab" role="tablist">
+                            <view class="nav nav-underline card-header-tabs">
                                 <view class="nav-item cwg-cursor" v-for="(tab, index) in tabs" :key="index"
                                     @click="cativeIndex = index">
                                     <view class="nav-link" :class="{ 'active': index === cativeIndex }">{{ tab.text }}
@@ -27,22 +31,24 @@
 
                         <view class="card-body">
                             <view class="tab-content">
-                                <view class="tab-pane fade show active" id="home" role="tabpanel"
-                                    aria-labelledby="home-tab" tabindex="0">
-                                    <view class="row">
-                                        <AccountCard v-for="acc in accounts" :zhtype="cativeIndex"
-                                            :key="acc.accountNumber" :account="acc" :is-grid-layout="isGridLayout"
-                                            @action="handleAction" @copy="handleCopy"
-                                            @change-password="handleChangePassword" />
-                                        <view class="table-loading-mask">
-                                            <uni-loading v-if="loading" />
-                                        </view>
-                                        <cwg-empty-state v-if="!loading && accounts.length == 0" />
-                                        <DeleteAccountDialogs ref="deleteAccountDialogRef"
-                                            v-model:visible="deleteAccountDialogVisible" />
-                                        <cwg-improve-popup v-model:visible="dialogCheck" @confirm="confirm" />
+                                <view class="row mb-4">
+                                    <view class="col-lg-4 col-md-6"><cwg-combox v-model:value="platformActive"
+                                            :clearable="false" :options="platformOptions" /></view>
+
+                                </view>
 
+                                <view class="row">
+                                    <AccountCard v-for="acc in accounts" :zhtype="cativeIndex" :key="acc.accountNumber"
+                                        :account="acc" :is-grid-layout="isGridLayout" @action="handleAction"
+                                        @copy="handleCopy" @change-password="handleChangePassword" />
+                                    <view class="table-loading-mask">
+                                        <uni-loading v-if="loading" />
                                     </view>
+                                    <cwg-empty-state v-if="!loading && accounts.length == 0" />
+                                    <DeleteAccountDialogs ref="deleteAccountDialogRef"
+                                        v-model:visible="deleteAccountDialogVisible" />
+                                    <cwg-improve-popup v-model:visible="dialogCheck" @confirm="confirm" />
+
                                 </view>
                             </view>
                         </view>
@@ -77,8 +83,12 @@ const isAfterJuly28 = () => {
     const july28 = new Date(2025, 6, 28, 0, 0, 0); // 月份从0开始，所以7月是6
     return now >= july28;
 }
-
-
+const platformActive = ref('All')
+const platformOptions = computed(() => ([
+    { value: 'All', text: t('State.All') },
+    { value: 'MT4', text: 'MT4' },
+    { value: 'MT5', text: 'MT5' },
+]))
 const handleAction = (type) => { /* 处理交易/入金等 */ };
 const handleCopy = (text: string) => {
     uni.setClipboardData({
@@ -202,10 +212,7 @@ const createAccount = () => {
 }
 const isZh = computed(() => ['cn', 'zh', 'zhHant'].includes(locale.value));
 
-watch(cativeIndex, (newVal) => {
-    // search.value.platform = tabs.value[newVal].id
-    getAccountList()
-})
+
 const loading = ref(false)
 // 获取客户登录信息
 const dialogCheck = ref(false)
@@ -258,8 +265,15 @@ function formatMoney(value) {
 }
 
 // 转换数组
-const accounts = computed(() =>
-    AccountList.value && AccountList.value.length != 0 ? AccountList.value.map((acc, index) => {
+const accounts = computed(() => {
+    if (!AccountList.value || AccountList.value.length == 0) return []
+    let filteredAccounts = AccountList.value
+    if (platformActive.value !== 'All') {
+        filteredAccounts = filteredAccounts.filter(acc =>
+            (acc.platform || 'MT4') === platformActive.value
+        )
+    }
+    return filteredAccounts.map((acc, index) => {
         const currency = acc.currency || 'USD';
         const floating = acc.floating ?? 0;
         let labels = [t('vu.item1'), 'MT4', 'Standard'];
@@ -282,22 +296,31 @@ const accounts = computed(() =>
             accountNumber: acc.login.toString(),
             nickname,
             fwq,
-            balanceWithSymbol: acc.balanceWithSymbol ?? '$0', // 余额
-            creditWithSymbol: acc.creditWithSymbol ?? '$0',//信用
-            equityWithSymbol: acc.equityWithSymbol ?? '$0',//净值
+            balanceWithSymbol: acc.balanceWithSymbol ?? '$0',
+            creditWithSymbol: acc.creditWithSymbol ?? '$0',
+            equityWithSymbol: acc.equityWithSymbol ?? '$0',
             currency,
-            actualLeverage: '1:' + (acc.leverage ?? 0), // 实际杠杆
-            floatingPL: formatMoney(floating), // 盈亏
+            actualLeverage: '1:' + (acc.leverage ?? 0),
+            floatingPL: formatMoney(floating),
             platform: acc.platform || 'MT4',
             server: acc.groupCode || '',
             login: acc.login.toString(),
             listType: cativeIndex.value == 1 ? 'demo' : 'real'
         };
-    }) : []
-)
+    })
+})
 onMounted(async () => {
     await getAccountList()
 })
+
+watch(cativeIndex, (newVal) => {
+    // search.value.platform = tabs.value[newVal].id
+    getAccountList()
+    platformActive.value = 'All'
+})
+// watch(platformActive, (newVal) => {
+//     setAccountList()
+// })
 </script>
 
 <style scoped lang="scss">

pages/customer/recording-history.vue

@@ -43,8 +43,8 @@ const search = ref({
 })
 const getInfoAgentTransfer = computed(() => userInfo.value.customInfo?.agentTransfer)
 const typeMap = computed(() => ([
-    // { value: 1, text: t('Custom.Recording.NewAccount') },
-    { value: 2, text: t('Custom.Recording.LeverageApply') },
+    { value: 1, text: t('Custom.Recording.NewAccount') },
+    // { value: 2, text: t('Custom.Recording.LeverageApply') },
     { value: 3, text: t('Custom.Recording.InternalTransfer') },
     // { value: 4, text: t('Custom.Recording.ActivitiesApply') },
     ...(getInfoAgentTransfer.value == 1 ? [{ value: 5, text: t('Home.page_ib.item9') }] : [])

static/scss/global/global.scss

@@ -166,8 +166,7 @@
     --bs-gray-700: #495057;
     --bs-gray-800: #343a40;
     --bs-gray-900: #212529;
-    --bs-secondary: #316AFF;
-    --bs-secondary: #FF8110;
+    --bs-secondary: #e61f1e;
     --bs-success: #22B07E;
     --bs-info: #02B4FA;
     --bs-warning: #FDBB1F;
@@ -199,7 +198,7 @@
     --bs-success-bg-subtle: #e9f7f2;
     --bs-info-bg-subtle: #e6f8ff;
     --bs-warning-bg-subtle: #fff8e9;
-    --bs-danger-bg-subtle: #ffece8;
+    --bs-danger-bg-subtle: rgba(108, 133, 149, 0.12);
     --bs-light-bg-subtle: #fcfcfd;
     --bs-dark-bg-subtle: #ced4da;
     --bs-secondary-border-subtle: #ccdaff;
@@ -268,7 +267,7 @@
     --bs-link-color-rgb: 49, 106, 255;
     --bs-link-hover-color: #2a5ad9;
     --bs-link-hover-color-rgb: 42, 90, 217;
-    --bs-secondary: #ef4223;
+    --bs-secondary: #e61f1e;
     --bs-light: #ECF2FD;
     --bs-primary-rgb: 253, 106, 3;
     --bs-secondary-rgb: #ef4223;
@@ -285,9 +284,9 @@
     --bs-btn-primary-hover: #2c5fe6;
     --bs-btn-primary-border-hover: #2b5de0;
     --bs-btn-primary-active: #2b5de0;
-    --bs-btn-secondary-hover: #e6740e;
-    --bs-btn-secondary-border-hover: #e0720e;
-    --bs-btn-secondary-active: #e0720e;
+    --bs-btn-secondary-hover: #d93618;
+    --bs-btn-secondary-border-hover: #d93618;
+    --bs-btn-secondary-active: #d93618;
 }
 
 .dark {
@@ -403,7 +402,7 @@
     --text-sm-plus: .9375rem;
     --text-sm-plus--line-height: 1.375rem;
     --animate-shimmer: shimmer 2s linear infinite;
-    --bs-secondary: #ef4223;
+    --bs-secondary: #e61f1e;
 }
 
 
@@ -431,7 +430,7 @@
     --bs-gray-700: #495057;
     --bs-gray-800: #343a40;
     --bs-gray-900: #212529;
-    --bs-secondary: #ef4223;
+    --bs-secondary: #e61f1e;
 
     --bs-success: #22B07E;
     --bs-info: #02B4FA;
@@ -464,7 +463,7 @@
     --bs-success-bg-subtle: #e9f7f2;
     --bs-info-bg-subtle: #e6f8ff;
     --bs-warning-bg-subtle: #fff8e9;
-    --bs-danger-bg-subtle: #ffece8;
+    --bs-danger-bg-subtle: rgba(108, 133, 149, 0.12);
     --bs-light-bg-subtle: #fcfcfd;
     --bs-dark-bg-subtle: #ced4da;
     --bs-secondary-border-subtle: #ccdaff;
@@ -561,7 +560,7 @@
     --bs-success-bg-subtle: #072319;
     --bs-info-bg-subtle: #002432;
     --bs-warning-bg-subtle: #332506;
-    --bs-danger-bg-subtle: #330d06;
+    --bs-danger-bg-subtle: rgba(108, 133, 149, 0.12);
     --bs-light-bg-subtle: #1a1c31;
     --bs-dark-bg-subtle: #10101d;
     --bs-secondary-border-subtle: #1d4099;
@@ -1286,7 +1285,7 @@ uni-content.collapsed {
 
 .uni-date-x,
 .uni-select__input-text {
-    color: var(--bs-body-color) !important;
+    color: var(--bs-emphasis-color) !important;
 }
 
 // 公共title样式

static/scss/global/vu.css

@@ -46,7 +46,7 @@
   --bs-gray-700: #495057;
   --bs-gray-800: #343a40;
   --bs-gray-900: #212529;
-  --bs-secondary: #ef4223;
+  --bs-secondary: #e61f1e;
 
   --bs-success: #22B07E;
   --bs-info: #02B4FA;
@@ -79,7 +79,7 @@
   --bs-success-bg-subtle: #e9f7f2;
   --bs-info-bg-subtle: #e6f8ff;
   --bs-warning-bg-subtle: #fff8e9;
-  --bs-danger-bg-subtle: #ffece8;
+  --bs-danger-bg-subtle: rgba(108, 133, 149, 0.12);
   --bs-light-bg-subtle: #fcfcfd;
   --bs-dark-bg-subtle: #ced4da;
   --bs-secondary-border-subtle: #ccdaff;
@@ -176,7 +176,7 @@
   --bs-success-bg-subtle: #072319;
   --bs-info-bg-subtle: #002432;
   --bs-warning-bg-subtle: #332506;
-  --bs-danger-bg-subtle: #330d06;
+  --bs-danger-bg-subtle: rgba(108, 133, 149, 0.12);
   --bs-light-bg-subtle: #1a1c31;
   --bs-dark-bg-subtle: #10101d;
   --bs-secondary-border-subtle: #1d4099;
@@ -3170,19 +3170,20 @@ textarea.form-control-lg {
 
 .btn-danger {
   --bs-btn-color: #ffffff;
-  --bs-btn-bg: #FF401C;
-  --bs-btn-border-color: #FF401C;
+  --bs-btn-bg: #e61f1e;
+  --bs-btn-border-color: #e61f1e;
+  /* FF401C */
   --bs-btn-hover-color: #ffffff;
-  --bs-btn-hover-bg: #d93618;
-  --bs-btn-hover-border-color: #cc3316;
+  --bs-btn-hover-bg: #FF401C;
+  --bs-btn-hover-border-color: #FF401C;
   --bs-btn-focus-shadow-rgb: 255, 93, 62;
   --bs-btn-active-color: #ffffff;
-  --bs-btn-active-bg: #cc3316;
-  --bs-btn-active-border-color: #bf3015;
+  --bs-btn-active-bg: #FF401C;
+  --bs-btn-active-border-color: #FF401C;
   --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
   --bs-btn-disabled-color: #ffffff;
-  --bs-btn-disabled-bg: #FF401C;
-  --bs-btn-disabled-border-color: #FF401C;
+  --bs-btn-disabled-bg: #bf3015;
+  --bs-btn-disabled-border-color: #bf3015;
 }
 
 .btn-light {
@@ -3204,19 +3205,20 @@ textarea.form-control-lg {
 
 .btn-dark {
   --bs-btn-color: #ffffff;
-  --bs-btn-bg: #FF401C;
-  --bs-btn-border-color: #FF401C;
+  --bs-btn-bg: #e61f1e;
+  --bs-btn-border-color: #e61f1e;
+  /* FF401C */
   --bs-btn-hover-color: #ffffff;
-  --bs-btn-hover-bg: #d93618;
-  --bs-btn-hover-border-color: #cc3316;
+  --bs-btn-hover-bg: #FF401C;
+  --bs-btn-hover-border-color: #FF401C;
   --bs-btn-focus-shadow-rgb: 255, 93, 62;
   --bs-btn-active-color: #ffffff;
-  --bs-btn-active-bg: #cc3316;
-  --bs-btn-active-border-color: #bf3015;
+  --bs-btn-active-bg: #FF401C;
+  --bs-btn-active-border-color: #FF401C;
   --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
   --bs-btn-disabled-color: #ffffff;
-  --bs-btn-disabled-bg: #FF401C;
-  --bs-btn-disabled-border-color: #FF401C;
+  --bs-btn-disabled-bg: #bf3015;
+  --bs-btn-disabled-border-color: #bf3015;
 }
 
 .btn-white {
@@ -4921,14 +4923,13 @@ textarea.form-control-lg {
   --bs-badge-padding-y: 4px;
   --bs-badge-font-size: 0.75rem;
   --bs-badge-font-weight: 500;
-  --bs-badge-color: #ffffff;
+  --bs-badge-color: #000;
   --bs-badge-border-radius: var(--bs-border-radius);
   display: inline-block;
   padding: var(--bs-badge-padding-y) var(--bs-badge-padding-x);
   font-size: var(--bs-badge-font-size);
-  font-weight: var(--bs-badge-font-weight);
   line-height: 1;
-  color: var(--bs-badge-color);
+  color: var(--bs-emphasis-color);
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -739,7 +739,7 @@ $uni-info: #909399 !default;
 
 .uni-select__selector-item--actived {
 	--bs-bg-opacity: 1;
-	background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
+	background-color: rgba(var(--bs-secondary-bg-rgb), var(--bs-bg-opacity)) !important;
 	color: var(--bs-heading-color);
 }