Merge remote-tracking branch 'origin/admin_dev' into admin_dev

components/cwg-asset-tabs.vue

@@ -65,7 +65,7 @@ const handleClick = (value) => {
   position: relative;
   width: 100%;
   margin-bottom: px2rpx(24);
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
 }
 
 .tab-list {

components/cwg-confirm-popup.vue

@@ -77,7 +77,7 @@ onUnmounted(() => {
 
 :deep(.cwg-dialog) {
   width: px2rpx(500);
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   border-radius: px2rpx(16);
   text-align: center;
   box-shadow: 0 px2rpx(10) px2rpx(20) rgba(0, 0, 0, 0.1);

components/cwg-droplist.vue

@@ -6,29 +6,15 @@
 
     <!-- 使用 teleport 解决层级遮挡问题 (H5) -->
     <teleport to="body" :disabled="!isTeleportSupported">
-      <view
-        :id="portalId"
-        class="cwg-droplist-portal"
-        :class="{ 'is-show': isShow }"
-        :style="{ zIndex }"
-        @click.stop="closeMenu"
-      >
+      <view :id="portalId" class="cwg-droplist-portal" :class="{ 'is-show': isShow }" :style="{ zIndex }"
+        @click.stop="closeMenu">
         <view class="cwg-droplist-mask" @click.stop="closeMenu"></view>
-        <view
-          class="cwg-droplist-menu"
-          :class="[`placement-${placement}`]"
-          :style="menuStyle"
-          @click.stop
-        >
+        <view class="cwg-droplist-menu" :class="[`placement-${placement}`]" :style="menuStyle" @click.stop>
           <slot name="dropdown">
             <template v-if="menuList && menuList.length">
-              <cwg-droplist-item
-                v-for="(item, index) in menuList"
-                :key="index"
+              <cwg-droplist-item v-for="(item, index) in menuList" :key="index"
                 :command="item.command !== undefined ? item.command : (item.value !== undefined ? item.value : item)"
-                :disabled="item.disabled"
-                @click="handleMenuClick(item,index)"
-              >
+                :disabled="item.disabled" @click="handleMenuClick(item, index)">
                 {{ item.label || item.text || item.title || item }}
               </cwg-droplist-item>
             </template>
@@ -119,7 +105,7 @@ const openMenu = async () => {
   // 预设菜单显示，获取菜单尺寸
   isShow.value = true
   emit('visible-change', true)
-  
+
   await nextTick()
 
   let menuRect = null
@@ -135,7 +121,7 @@ const openMenu = async () => {
 
   if (!menuRect) return
 
-// 获取屏幕尺寸
+  // 获取屏幕尺寸
   const sysInfo = uni.getSystemInfoSync()
   // 注意 windowHeight 可能受到键盘、导航栏影响，加上 windowTop 偏移更准确（特别是在 H5 中）
   const windowHeight = sysInfo.windowHeight
@@ -205,9 +191,9 @@ const handleItemClick = (command) => {
   }
 }
 //
-const handleMenuClick = (item,index) => {
+const handleMenuClick = (item, index) => {
   emit('menuClick', { value: item, index })
-  console.log('menuClick', item, index,'关闭',props.hideOnClick)
+  console.log('menuClick', item, index, '关闭', props.hideOnClick)
   if (props.hideOnClick) {
     closeMenu()
   }
@@ -264,7 +250,7 @@ defineExpose({
 
 .cwg-droplist-menu {
   position: absolute;
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   border: 1px solid #ebeef5;
   border-radius: px2rpx(4);
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
@@ -304,9 +290,18 @@ defineExpose({
     border-bottom-color: #ebeef5;
   }
 
-  &.placement-bottom::before { left: 50%; transform: translateX(-50%); }
-  &.placement-bottom-start::before { left: 15px; }
-  &.placement-bottom-end::before { right: 15px; }
+  &.placement-bottom::before {
+    left: 50%;
+    transform: translateX(-50%);
+  }
+
+  &.placement-bottom-start::before {
+    left: 15px;
+  }
+
+  &.placement-bottom-end::before {
+    right: 15px;
+  }
 
   &.placement-top::before,
   &.placement-top-start::before,
@@ -314,9 +309,18 @@ defineExpose({
     bottom: -12px;
     border-top-color: #ebeef5;
   }
-  
-  &.placement-top::before { left: 50%; transform: translateX(-50%); }
-  &.placement-top-start::before { left: 15px; }
-  &.placement-top-end::before { right: 15px; }
+
+  &.placement-top::before {
+    left: 50%;
+    transform: translateX(-50%);
+  }
+
+  &.placement-top-start::before {
+    left: 15px;
+  }
+
+  &.placement-top-end::before {
+    right: 15px;
+  }
 }
 </style>

components/cwg-label-line-value.vue

@@ -41,7 +41,7 @@ const props = defineProps({
     .line {
         flex: 1;
         height: 1px;
-        border-top: 1px dashed rgba(20, 29, 34, .122);
+        border-top: 1px dashed var(--bs-border-color);
         margin-bottom: px2rpx(1);
 
     }

components/cwg-page-wrapper.vue

@@ -406,7 +406,7 @@ onShow(() => {
   left: 0;
   top: 0;
   z-index: 1000;
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   transition: width 81ms cubic-bezier(0.4, 0, 0.2, 1);
 
 }

pages/analytics/detail.vue

@@ -251,7 +251,7 @@ onUnmounted(() => {
         justify-content: space-between;
         align-items: center;
         padding: 10rpx 15rpx;
-        background-color: #fff;
+        background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
         border-bottom: 1px solid #eee;
 
         .tit {
@@ -273,7 +273,7 @@ onUnmounted(() => {
     .content {
         width: 100%;
         height: calc(100% - 50rpx);
-        background-color: #fff;
+        background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
         overflow: hidden;
         text-align: left;
         padding: 10rpx 15rpx;

pages/customer/account-select.vue

@@ -206,7 +206,7 @@ onMounted(() => {
 @import "@/uni.scss";
 
 .account-selector {
-    background-color: #fff;
+    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
     overflow: hidden;
     min-height: 400px;
 }

pages/customer/components/AccountCardDesktop.vue

@@ -43,7 +43,7 @@
                     @menuClick="handleCustomClick">
                     <view class="circle-btn">
                         <view class="circle-icon">
-                            <cwg-icon name="crm-ellipsis-vertical" :size="16" color="#2e3a47" />
+                            <cwg-icon name="crm-ellipsis-vertical" :size="16" color="#fff" />
                         </view>
                         <text class="circle-label" v-t="'Latest.More'" />
                     </view>
@@ -64,7 +64,7 @@
                 <cwg-dropdown @open="onOpen" @close="onClose" :menu-list="customMenuList"
                     @menuClick="handleCustomClick">
                     <view class="action-btn icon-only">
-                        <cwg-icon name="crm-ellipsis-vertical" :size="16" color="#2e3a47" />
+                        <cwg-icon name="crm-ellipsis-vertical" :size="16" color="#fff" />
                     </view>
                 </cwg-dropdown>
             </view>
@@ -142,17 +142,17 @@ const closeFunctionOpen = (code) => {
 // 圆形按钮数据
 const circleButtons = ref([
     { key: 'trade', label: 'Shop.Index.Transaction', icon: 'crm-trade', action: 'trade', needDemo: false, primary: true, disabled: false, color: '#fff' },
-    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1'), color: '#2e3a47' },
-    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2'), color: '#2e3a47' },
-    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#2e3a47' }
+    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1'), color: '#fff' },
+    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2'), color: '#fff' },
+    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#fff' }
 ])
 
 // 普通按钮数据
 const actionButtons = computed(() => [
     { key: 'trade', label: 'Shop.Index.Transaction', icon: 'crm-trade', color: '#fff', primary: true, action: 'trade', needDemo: false, disabled: false },
-    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', color: '#2e3a47', primary: false, action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1') },
-    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', color: '#2e3a47', primary: false, action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2') },
-    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', color: '#2e3a47', primary: false, action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')) }
+    { key: 'deposit', label: 'Home.page_customer.item2', icon: 'crm-deposit', color: '#fff', primary: false, action: 'deposit', needDemo: isDemo.value, disabled: !closeFunctionOpen('1') },
+    { key: 'withdraw', label: 'Home.page_customer.item3', icon: 'crm-withdraw', color: '#fff', primary: false, action: 'withdraw', needDemo: isDemo.value, disabled: !closeFunctionOpen('2') },
+    { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', color: '#fff', primary: false, action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')) }
 ])
 const fieldList = ref([
     { label: t('Custom.PaymentHistory.AccountType'), key: 'nickname', copyable: false },

pages/customer/components/AccountList.vue

@@ -16,11 +16,11 @@
             <view class="btn-class">
                 <view class="btn-primary" :class="{ 'btn-primary2': isGridLayout }"
                     @click="isGridLayout || toggleLayout()">
-                    <cwg-icon icon="crm-card" :size="16" color="#141d2299" />
+                    <cwg-icon icon="crm-card" :size="16" color="#fff" />
                 </view>
                 <view class="btn-primary" :class="{ 'btn-primary2': !isGridLayout }"
                     @click="!isGridLayout || toggleLayout()">
-                    <cwg-icon icon="crm-list" :size="16" color="#141d2299" />
+                    <cwg-icon icon="crm-list" :size="16" color="#fff" />
                 </view>
             </view>
         </view>

pages/customer/components/PaymentMethodsList.vue

@@ -38,7 +38,7 @@
             <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">
@@ -85,7 +85,7 @@ const handleClick = (item) => {
 }
 
 .payment-card {
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   border-radius: px2rpx(12);
   padding: px2rpx(16);
   display: flex;
@@ -98,7 +98,7 @@ const handleClick = (item) => {
 
   &:hover {
     transform: translateY(px2rpx(-2));
-    background-color: #fff;
+    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
     box-shadow: 0 px2rpx(8) px2rpx(20) rgba(0, 0, 0, 0.06);
     border-color: var(--color-primary, #007aff);
   }

pages/customer/deposit-select.vue

@@ -7,7 +7,7 @@
                 <view class="b-card">
                     <view class="card-top">
                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{ t('Custom.Deposit.Title1')
-                            }}</text>
+                        }}</text>
                         <cwg-combox :clearable="false" v-model:value="loginValue" :options="loginComboxOptions"
                             :placeholder="t('placeholder.choose')" />
                     </view>
@@ -18,7 +18,7 @@
                 <view class="b-card">
                     <view class="card-top">
                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{ t('Custom.Deposit.Title2')
-                            }}</text>
+                        }}</text>
                         <uni-loading v-if="currentTableData.length == 0" />
                         <template v-if="currentTableData.length">
                             <cwg-asset-tabs v-if="tabsConfig.length > 0" v-model="activeTab" :tabs="tabsConfig" />
@@ -50,7 +50,7 @@
                             </view>
                             <view class="btn-bottom">
                                 <text class="btn crm-cursor" @click="isStep3Open()">{{ t('Btn.Confirm')
-                                }}</text>
+                                    }}</text>
                             </view>
 
                         </view>
@@ -88,7 +88,7 @@
                                     <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{
                                             t('news_add_field.Label.Title4')
-                                        }}</text>
+                                            }}</text>
                                     </uni-col>
                                     <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                                         <uni-forms-item>
@@ -120,7 +120,7 @@
                                                         WireTransferAccount.bankUname || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankName')
-                                            }}</text><text class="content">{{ WireTransferAccount.bankName ||
+                                                    }}</text><text class="content">{{ WireTransferAccount.bankName ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label SpecialColor">{{
@@ -129,7 +129,7 @@
                                                         WireTransferAccount.bankCardNum || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankAddr')
-                                            }}</text><text class="content">{{ WireTransferAccount.bankAddr ||
+                                                    }}</text><text class="content">{{ WireTransferAccount.bankAddr ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label SpecialColor">{{
@@ -138,7 +138,7 @@
                                                         WireTransferAccount.swiftCode || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankCode')
-                                            }}</text><text class="content">{{ WireTransferAccount.bankCode ||
+                                                    }}</text><text class="content">{{ WireTransferAccount.bankCode ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label SpecialColor">{{
@@ -165,7 +165,7 @@
                                                         + '-' +
                                                         WireTransferAccount.type }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Withdraw.Title6')
-                                            }}</text><text class="content">{{ WireTransferAccount.address ||
+                                                    }}</text><text class="content">{{ WireTransferAccount.address ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">QR Code</text>
@@ -267,7 +267,7 @@
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit2') }}</text>
                                                     <text class="clause crm-cursor" @click="dialogClauseNZ = true">{{
                                                         t('news_add_field1.activitiesNZ.itemDeposit3')
-                                                        }}</text>
+                                                    }}</text>
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit4') }}</text>
                                                 </view>
                                             </uni-forms-item>
@@ -1996,7 +1996,7 @@ watch(() => params.agree6, (newVal) => {
         .tit {
             font-size: px2rpx(20);
             font-weight: 700;
-            color: var(--color-navy-900);
+            color: var(--bs-heading-color);
         }
     }
 
@@ -2016,7 +2016,7 @@ watch(() => params.agree6, (newVal) => {
                     margin-bottom: px2rpx(16);
                     display: flex;
                     align-items: center;
-                    color: var(--color-navy-900);
+                    color: var(--bs-heading-color);
 
                     position: relative;
                     padding-left: 20px;
@@ -2135,7 +2135,7 @@ watch(() => params.agree6, (newVal) => {
 
             .content {
                 flex: 1;
-                color: var(--color-navy-900);
+                color: var(--bs-heading-color);
                 font-weight: 500;
             }
 
@@ -2341,7 +2341,7 @@ watch(() => params.agree6, (newVal) => {
             font-size: px2rpx(18);
             font-weight: 700;
             margin-bottom: px2rpx(20);
-            color: var(--color-navy-900);
+            color: var(--bs-heading-color);
             display: block;
         }
 
@@ -2376,7 +2376,7 @@ watch(() => params.agree6, (newVal) => {
                 }
 
                 text:not(.label) {
-                    color: var(--color-navy-900);
+                    color: var(--bs-heading-color);
                     font-weight: 500;
                 }
 

pages/customer/deposit.vue

@@ -11,7 +11,7 @@
                         <view class="card-top">
                             <text class="tit"><text class="iconfont icon-caret-right"></text>{{
                                 t('Custom.Deposit.Title1')
-                                }}</text>
+                            }}</text>
                             <cwg-combox :clearable="false" v-model:value="loginValue" :options="loginComboxOptions"
                                 :placeholder="t('placeholder.choose')" />
                         </view>
@@ -23,7 +23,7 @@
                         <view class="card-top">
                             <text class="tit"><text class="iconfont icon-caret-right"></text>{{
                                 t('Custom.Deposit.Title2')
-                                }}</text>
+                            }}</text>
                             <cwg-combox :clearable="false" v-model:value="channelId" :options="channelListOptions"
                                 :placeholder="t('placeholder.choose')">
                             </cwg-combox>
@@ -72,7 +72,7 @@
                                     <view>
                                         <text class="tit"><text class="iconfont icon-caret-right"></text>{{
                                             t('news_add_field.Label.Title4')
-                                            }}</text>
+                                        }}</text>
                                     </view>
                                     <view>
                                         <uni-forms-item>
@@ -103,7 +103,7 @@
                                                         WireTransferAccount.bankUname || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankName')
-                                                    }}</text><text class="content">{{ WireTransferAccount.bankName
+                                            }}</text><text class="content">{{ WireTransferAccount.bankName
                                                         ||
                                                         '--'
                                                     }}</text></view>
@@ -113,7 +113,7 @@
                                                         WireTransferAccount.bankCardNum || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankAddr')
-                                                    }}</text><text class="content">{{ WireTransferAccount.bankAddr
+                                            }}</text><text class="content">{{ WireTransferAccount.bankAddr
                                                         ||
                                                         '--'
                                                     }}</text></view>
@@ -123,7 +123,7 @@
                                                         WireTransferAccount.swiftCode || '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Deposit.bankCode')
-                                                    }}</text><text class="content">{{ WireTransferAccount.bankCode
+                                            }}</text><text class="content">{{ WireTransferAccount.bankCode
                                                         ||
                                                         '--'
                                                     }}</text></view>
@@ -151,7 +151,7 @@
                                                         + '-' +
                                                         WireTransferAccount.type }}</text></view>
                                             <view class="row"><text class="label">{{ t('Custom.Withdraw.Title6')
-                                                    }}</text><text class="content">{{ WireTransferAccount.address ||
+                                            }}</text><text class="content">{{ WireTransferAccount.address ||
                                                         '--'
                                                     }}</text></view>
                                             <view class="row"><text class="label">QR Code</text>
@@ -246,16 +246,16 @@
                                                     <checkbox :checked="params.agree4"
                                                         @click="params.agree4 = !params.agree4" />
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit1')
-                                                        }}</text>
+                                                    }}</text>
                                                 </label>
                                                 <view style="line-height: 1.5; font-size: 14px">
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit2')
-                                                        }}</text>
+                                                    }}</text>
                                                     <text class="clause crm-cursor" @click="dialogClauseNZ = true">{{
                                                         t('news_add_field1.activitiesNZ.itemDeposit3')
-                                                        }}</text>
+                                                    }}</text>
                                                     <text>{{ t('news_add_field1.activitiesNZ.itemDeposit4')
-                                                        }}</text>
+                                                    }}</text>
                                                 </view>
                                             </uni-forms-item>
 
@@ -268,15 +268,15 @@
                                                     <checkbox :checked="params.agree5"
                                                         @click="params.agree5 = !params.agree5" />
                                                     <text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit1')
-                                                        }}</text>
+                                                    }}</text>
                                                 </label>
                                                 <view style="line-height: 1.5; font-size: 14px">
                                                     <text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit2')
-                                                        }}</text>
+                                                    }}</text>
                                                     <text class="clause crm-cursor" @click="dialogClauseNZTwo = true">{{
                                                         t('news_add_field1.activitiesNZTwo.itemDeposit3') }}</text>
                                                     <text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit4')
-                                                        }}</text>
+                                                    }}</text>
                                                 </view>
                                             </uni-forms-item>
 
@@ -360,7 +360,7 @@
                                     </view>
                                 </template>
                                 <button class="s-btn" type="primary" @click="submitConfirm">{{ t('Btn.Submit')
-                                    }}</button>
+                                }}</button>
                             </uni-forms>
                         </view>
                     </view>
@@ -371,8 +371,7 @@
             <view class="step3-attention">
                 <view class="tips" v-if="(introduce.introduce || introduce.enIntroduce)">
                     <view>
-                        <cwg-rich-text class="attention"
-                            :nodes="isZh ? introduce.introduce : introduce.enIntroduce" />
+                        <cwg-rich-text class="attention" :nodes="isZh ? introduce.introduce : introduce.enIntroduce" />
                     </view>
                 </view>
             </view>
@@ -2046,7 +2045,7 @@ watch(() => params.agree6, (newVal) => {
         .tit {
             font-size: px2rpx(20);
             font-weight: 700;
-            color: var(--color-navy-900);
+            color: var(--bs-heading-color);
         }
     }
 
@@ -2066,7 +2065,7 @@ watch(() => params.agree6, (newVal) => {
                     margin-bottom: px2rpx(16);
                     display: flex;
                     align-items: center;
-                    color: var(--color-navy-900);
+                    color: var(--bs-heading-color);
 
                     position: relative;
                     padding-left: 20px;
@@ -2185,7 +2184,7 @@ watch(() => params.agree6, (newVal) => {
 
             .content {
                 flex: 1;
-                color: var(--color-navy-900);
+                color: var(--bs-heading-color);
                 font-weight: 500;
             }
 
@@ -2382,7 +2381,7 @@ watch(() => params.agree6, (newVal) => {
             font-size: px2rpx(18);
             font-weight: 700;
             margin-bottom: px2rpx(20);
-            color: var(--color-navy-900);
+            color: var(--bs-heading-color);
             display: block;
         }
 
@@ -2417,7 +2416,7 @@ watch(() => params.agree6, (newVal) => {
                 }
 
                 text:not(.label) {
-                    color: var(--color-navy-900);
+                    color: var(--bs-heading-color);
                     font-weight: 500;
                 }
 

pages/customer/style.scss

@@ -20,7 +20,7 @@
           margin-bottom: px2rpx(16);
           display: flex;
           align-items: center;
-          color: var(--color-navy-900);
+          color: var(--bs-heading-color);
 
           .iconfont {
             margin-right: px2rpx(8);
@@ -235,7 +235,7 @@
   /* 弹窗样式美化 */
   :deep(.uni-popup__wrapper) {
     .popup-content {
-      background-color: #fff;
+      background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
       border-radius: px2rpx(20);
       padding: px2rpx(24);
       width: px2rpx(320);
@@ -245,7 +245,7 @@
         font-weight: 700;
         text-align: center;
         margin-bottom: px2rpx(20);
-        color: var(--color-navy-900);
+        color: var(--bs-heading-color);
         display: block;
       }
 
@@ -278,7 +278,7 @@
           }
 
           text:not(.label) {
-            color: var(--color-navy-900);
+            color: var(--bs-heading-color);
             font-weight: 500;
           }
         }

pages/customer/transfer.vue

@@ -571,7 +571,7 @@ watch(transferType, (newVal) => {
             color: #303133;
 
             .b-card {
-                background-color: #fff;
+                background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                 margin-bottom: px2rpx(10);
                 border-radius: px2rpx(6);
                 box-shadow: 0 px2rpx(1) px2rpx(6) 0 rgba(0, 0, 0, 0.05);
@@ -631,7 +631,7 @@ watch(transferType, (newVal) => {
                         margin-bottom: px2rpx(16);
                         display: flex;
                         align-items: center;
-                        color: var(--color-navy-900);
+                        color: var(--bs-heading-color);
                         position: relative;
                         padding-left: 20px;
 
@@ -841,7 +841,7 @@ watch(transferType, (newVal) => {
                 }
 
                 &:not([type="primary"]) {
-                    background-color: #fff;
+                    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                     border: 1px solid #dcdfe6;
                     color: #606266;
 

pages/customer/wallet-transfer.vue

@@ -267,7 +267,7 @@ onMounted(() => {
             color: #303133;
 
             .b-card {
-                background-color: #fff;
+                background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                 margin-bottom: px2rpx(10);
                 border-radius: px2rpx(6);
                 box-shadow: 0 px2rpx(1) px2rpx(6) 0 rgba(0, 0, 0, 0.05);
@@ -327,7 +327,7 @@ onMounted(() => {
                         margin-bottom: px2rpx(16);
                         display: flex;
                         align-items: center;
-                        color: var(--color-navy-900);
+                        color: var(--bs-heading-color);
                         position: relative;
                         padding-left: 20px;
 
@@ -537,7 +537,7 @@ onMounted(() => {
                 }
 
                 &:not([type="primary"]) {
-                    background-color: #fff;
+                    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                     border: 1px solid #dcdfe6;
                     color: #606266;
 

pages/customer/withdrawal-select.vue

@@ -29,7 +29,7 @@
             </view>
             <view v-if="step3" class="reselect-btn">
               <button class="s-btn reselect" type="primary" @click="showTable">{{ t('Custom.Deposit.Reselect')
-              }}</button>
+                }}</button>
             </view>
           </view>
         </view>
@@ -149,7 +149,7 @@
                       </text>
                       <text v-if="channelData.type == 'BANK'">{{
                         t('Custom.Withdraw.addBank')
-                      }}</text>
+                        }}</text>
                       <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                         @click="openAddBankCard('add_bankCard')">
                         {{ t('Custom.Withdraw.addBank1') }}
@@ -274,7 +274,7 @@
                 <uni-col :span="24" v-if="channelData.type != 'BANK_TELEGRAPHIC' && isStep3">
                   <view class="tit">
                     <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                    }}</text>
+                      }}</text>
                   </view>
                 </uni-col>
                 <uni-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" v-if="channelData.type !== 'BANK_TELEGRAPHIC'">
@@ -1804,7 +1804,7 @@ onMounted(() => {
           margin-bottom: px2rpx(16);
           display: flex;
           align-items: center;
-          color: var(--color-navy-900);
+          color: var(--bs-heading-color);
           position: relative;
           padding-left: 20px;
 

pages/customer/withdrawal.vue

@@ -133,7 +133,7 @@
                         </text>
                         <text v-if="channelData.type == 'BANK'">{{
                           t('Custom.Withdraw.addBank')
-                          }}</text>
+                        }}</text>
                         <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                           @click="openAddBankCard('add_bankCard')">
                           {{ t('Custom.Withdraw.addBank1') }}
@@ -257,7 +257,7 @@
                   <view v-if="channelData.type != 'BANK_TELEGRAPHIC' && isStep3">
                     <view class="tit">
                       <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                        }}</text>
+                      }}</text>
                     </view>
                   </view>
                   <view v-if="channelData.type !== 'BANK_TELEGRAPHIC'" class="amount-box amount-box1">
@@ -1865,7 +1865,7 @@ watch(() => form.amount, (newVal) => {
           margin-bottom: px2rpx(16);
           display: flex;
           align-items: center;
-          color: var(--color-navy-900);
+          color: var(--bs-heading-color);
           position: relative;
           padding-left: 20px;
 

pages/follow/follow-list.vue

@@ -623,7 +623,7 @@ onMounted(() => {
         transition: all 0.2s ease;
 
         &:first-child {
-            background-color: #fff;
+            background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
             color: #495057;
             border: 1px solid #ced4da;
 

pages/follow/subscribe-list.vue

@@ -60,7 +60,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item29') }}</text>
                                 <text class="delete-value">{{ numberDesensitization(dialogSubscribeDataCancel.dealLogin)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item3') }}</text>
@@ -71,7 +71,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item7') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeDataCancel.dealBalance || 0)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.AccountType') }}</text>
@@ -83,7 +83,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item6') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeDataCancel.dealEquity || 0)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item30') }}</text>
@@ -98,12 +98,12 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Credit') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeDataCancel.dealCredit || 0)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item31') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.distributionRatio || '0'
-                                }}%</text>
+                                    }}%</text>
                             </view>
                         </view>
                         <view class="delete-row">
@@ -114,7 +114,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item32') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.settlementCycle || '--'
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                     </view>
@@ -132,7 +132,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Leverage') }}</text>
                                 <text class="delete-value">1:{{ dialogSubscribeDataCancel.followLeverage || '--'
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                         <view class="delete-row">
@@ -171,12 +171,12 @@
                             <view class="delete-item" v-if="dialogSubscribeDataCancel.protectType == 1">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item39') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.protectAmount || '--'
-                                }}($)</text>
+                                    }}($)</text>
                             </view>
                             <view class="delete-item" v-if="dialogSubscribeDataCancel.protectType == 2">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item122') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeDataCancel.protectRatio || '--'
-                                }}(%)</text>
+                                    }}(%)</text>
                             </view>
                         </view>
                     </view>
@@ -207,7 +207,7 @@
             <template #footer>
                 <button @click="ToUnSubscribeCancel">{{ t('Btn.Cancel') }}</button>
                 <button type="primary" @click="dialogSubscribeCancelTipOpen" :disabled="flag">{{ t('Btn.Confirm')
-                }}</button>
+                    }}</button>
             </template>
         </cwg-popup>
 
@@ -226,7 +226,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item29') }}</text>
                                 <text class="delete-value">{{ numberDesensitization(dialogSubscribeFllowData.dealLogin)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item3') }}</text>
@@ -237,19 +237,19 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item7') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeFllowData.dealBalance)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.AccountType') }}</text>
                                 <text class="delete-value">{{ accountTypeName(dialogSubscribeFllowData.dealLoginType)
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                         <view class="delete-row">
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.console.item6') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeFllowData.dealEquity)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item30') }}</text>
@@ -264,12 +264,12 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Credit') }}</text>
                                 <text class="delete-value">{{ numberFormat(dialogSubscribeFllowData.dealCredit)
-                                }}</text>
+                                    }}</text>
                             </view>
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Documentary.tradingCenter.item31') }}</text>
                                 <text class="delete-value">{{ dialogSubscribeFllowData.distributionRatio || '0'
-                                }}%</text>
+                                    }}%</text>
                             </view>
                         </view>
                         <view class="delete-row">
@@ -297,7 +297,7 @@
                             <view class="delete-item">
                                 <text class="delete-label">{{ t('Label.Leverage') }}</text>
                                 <text class="delete-value">1:{{ dialogSubscribeFllowData.followLeverage || '--'
-                                }}</text>
+                                    }}</text>
                             </view>
                         </view>
                     </view>
@@ -1216,7 +1216,7 @@ onMounted(() => {
         transition: all 0.2s ease;
 
         &:first-child {
-            background-color: #fff;
+            background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
             color: #495057;
             border: 1px solid #ced4da;
 

pages/follow/trading-management.vue

@@ -1492,7 +1492,7 @@ onMounted(() => {
         transition: all 0.2s ease;
 
         &:first-child {
-            background-color: #fff;
+            background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
             color: #495057;
             border: 1px solid #ced4da;
 

pages/follow/transfer.vue

@@ -273,7 +273,7 @@ onMounted(() => {
             color: #303133;
 
             .b-card {
-                background-color: #fff;
+                background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                 margin-bottom: px2rpx(10);
                 border-radius: px2rpx(6);
                 box-shadow: 0 px2rpx(1) px2rpx(6) 0 rgba(0, 0, 0, 0.05);
@@ -333,7 +333,7 @@ onMounted(() => {
                         margin-bottom: px2rpx(16);
                         display: flex;
                         align-items: center;
-                        color: var(--color-navy-900);
+                        color: var(--bs-heading-color);
                         position: relative;
                         padding-left: 20px;
 
@@ -543,7 +543,7 @@ onMounted(() => {
                 }
 
                 &:not([type="primary"]) {
-                    background-color: #fff;
+                    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                     border: 1px solid #dcdfe6;
                     color: #606266;
 

pages/ib/agent-transfer.vue

@@ -696,7 +696,7 @@ onLoad((options) => {
             color: #303133;
 
             .b-card {
-                background-color: #fff;
+                background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                 margin-bottom: px2rpx(10);
                 border-radius: px2rpx(6);
                 box-shadow: 0 px2rpx(1) px2rpx(6) 0 rgba(0, 0, 0, 0.05);
@@ -723,7 +723,7 @@ onLoad((options) => {
                         margin-bottom: px2rpx(16);
                         display: flex;
                         align-items: center;
-                        color: var(--color-navy-900);
+                        color: var(--bs-heading-color);
                         position: relative;
                         padding-left: 20px;
 
@@ -963,7 +963,7 @@ onLoad((options) => {
                 }
 
                 &:not([type="primary"]) {
-                    background-color: #fff;
+                    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                     border: 1px solid #dcdfe6;
                     color: #606266;
 

pages/ib/openAccount.vue

@@ -81,7 +81,7 @@
           <view>
             <text>{{ t('Ib.NewAccount.Dec5') }}</text>
             <text class="crm-cursor" style="color: #368FEC;" @click="openLeverageMargin">{{ t('Ib.NewAccount.Dec6')
-            }}</text>
+              }}</text>
             <text>{{ t('Ib.NewAccount.Dec7') }}</text>
           </view>
         </view>
@@ -303,7 +303,7 @@ onLoad((options: any) => {
 
 .box {
   padding: px2rpx(15) px2rpx(20);
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   border-radius: px2rpx(4);
   margin-bottom: px2rpx(20);
 

pages/ib/openPammManager.vue

@@ -245,7 +245,7 @@ onLoad((options: any) => {
 
 .box {
   padding: px2rpx(15) px2rpx(20);
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   border-radius: px2rpx(4);
   margin-bottom: px2rpx(20);
 

pages/ib/promotion.vue

@@ -213,7 +213,7 @@ const logoList = ref([
     border: 1px solid #e4e7ed;
     border-radius: px2rpx(4);
     overflow: hidden;
-    background-color: #fff;
+    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
 
     .sort-item {
       padding: px2rpx(8) px2rpx(16);
@@ -266,7 +266,7 @@ const logoList = ref([
         linear-gradient(45deg, #eee 25%, transparent 25%, transparent 75%, #eee 75%, #eee);
       background-size: 20px 20px;
       background-position: 0 0, 10px 10px;
-      background-color: #fff;
+      background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
     }
 
     .cover-img {
@@ -409,7 +409,7 @@ const logoList = ref([
     padding: px2rpx(40);
 
     &.light {
-      background-color: #fff;
+      background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
     }
 
     &.dark {

pages/ib/report.vue

@@ -1,563 +1,554 @@
 <template>
   <cwg-page-wrapper class="create-page" :isHeaderFixed="true">
     <cwg-header :title="t('Home.page_ib.item3')" />
-    <uni-loading v-if="loading"/>
+    <uni-loading v-if="loading" />
     <view v-else class="account-content">
       <view class="search-content">
         <view class="search-bar">
           <cwg-complex-search :fields="filterFields" v-model="searchParams" @search="handleSearch"
-                              @reset="handleReset" />
+            @reset="handleReset" />
         </view>
       </view>
 
-      <cwg-tabel
-        ref="tableRef"
-        :columns="columns"
-        :mobilePrimaryFields="mobilePrimaryFields"
-        :queryParams="search"
-        :api="listApi"
-        :show-operation="false"
-        :showPagination="true"
-        :showSummary="true"
-        :immediate="false"
-        :summaryMethod="getSummaries"
-      >
+      <cwg-tabel ref="tableRef" :columns="columns" :mobilePrimaryFields="mobilePrimaryFields" :queryParams="search"
+        :api="listApi" :show-operation="false" :showPagination="true" :showSummary="true" :immediate="false"
+        :summaryMethod="getSummaries">
       </cwg-tabel>
     </view>
   </cwg-page-wrapper>
 </template>
 
 <script setup lang="ts">
-  // 报告
-  import { ref, computed, onMounted, watch, nextTick } from 'vue'
-  import { useI18n } from 'vue-i18n'
-  import Config from '@/config/index'
-  import { ibApi } from '@/service/ib'
-  import { useReportConst } from '@/pages/ib/const/report'
-  import { useFilters } from '@/composables/useFilters'
-  import { isAfterJuly28 } from '@/utils/dateUtils'
-  import useUserStore from '@/stores/use-user-store'
-
-  const { numberFormat } = useFilters()
-  const { t } = useI18n()
-  const { columnList, mobileList, platformOptions, customTypeList, groupCurrency1, groupTypeName } = useReportConst()
-  let { Code } = Config
-  const { userInfo } = useUserStore()
-  const tableRef = ref(null)
-  const loading = ref(false)
-
-  const typeList = computed(() => [
-    { text: t('Ib.Report.Title1'), value: 1 },
-    { text: t('Ib.Report.Title2'), value: 2 },
-    { text: t('Ib.Report.Title3'), value: 3 },
-    { text: t('Ib.Report.Title6'), value: 4 },
-    // 新增代理
-    // { text: t('Ib.Report.Title5'), value: 5 },
-    { text: t('news_add_field.IbReport.Title6'), value: 6 },
-    { text: t('Ib.Report.Title7'), value: 7 },
-    //  加点报告
-    // { text: t('Ib.Report.Title8'), value: 24 },
-  ])
-
-  const detailTypeList = computed(() => [
-    { text: t('Ib.Report.Tit1'), value: 1 },
-    { text: t('Ib.Report.Tit2'), value: 2 },
-    { text: t('Ib.Report.Tit3'), value: 3 },
-    { text: t('Ib.Report.Tit4'), value: 4 },
-  ])
-
-  const isShortList = computed(() => [
-    { text: t('State.All'), value: 0 },
-    { text: t('Ib.Report.item1'), value: 1 },
-    { text: t('Ib.Report.item2'), value: 2 },
-  ])
-
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = String(now.getMonth() + 1).padStart(2, '0')
-  const day = String(now.getDate()).padStart(2, '0')
-  const defaultDateRange = [`${year}-${month}-01`, `${year}-${month}-${day}`]
-
-  const searchParams = ref<any>({
-    reportType: 1,
-    detail_type: null,
-    customType: 0,
-    platform: 'MT4',
-    agentId: '',
-    login: '',
-    cId: '',
-    isShort: 0,
-    date: defaultDateRange,
-  })
-
-  const filterFields = ref([])
-
-  const search = ref({
-    reportType: 1,
-    detail_type: null as number | null,
-    customType: 0,
-    platform: 'MT4',
-    startDate: defaultDateRange[0],
-    endDate: defaultDateRange[1],
-    date: defaultDateRange,
-    agentId: '',
-    login: '',
-    cId: '',
-    isShort: 0,
-  })
-
-  const country = computed(() => {
-    return userInfo.customInfo.country
-  })
-
-  const agentLevels = ref<Array<{ key: string, options: any[] }>>([
-    {
-      key: 'agentId_0',
-      options: [
-        { value: 0, text: t('news_add_field.IbReport.ALL') },
-        { value: -1, text: t('news_add_field.IbReport.DirectlyUnder') },
-      ],
-    },
-  ])
-
-  const handleAgentChange = async (val: any, levelIndex: number) => {
-    console.log(val,'change1`')
-    // 截断当前层级之后的所有层级
-    agentLevels.value.splice(levelIndex + 1)
-
-    // 清理 searchParams 中被移除层级的值
-    for (let key in searchParams.value) {
-      if (key.startsWith('agentId_')) {
-        const idx = parseInt(key.split('_')[1])
-        if (idx > levelIndex) {
-          delete searchParams.value[key]
-        }
+// 报告
+import { ref, computed, onMounted, watch, nextTick } from 'vue'
+import { useI18n } from 'vue-i18n'
+import Config from '@/config/index'
+import { ibApi } from '@/service/ib'
+import { useReportConst } from '@/pages/ib/const/report'
+import { useFilters } from '@/composables/useFilters'
+import { isAfterJuly28 } from '@/utils/dateUtils'
+import useUserStore from '@/stores/use-user-store'
+
+const { numberFormat } = useFilters()
+const { t } = useI18n()
+const { columnList, mobileList, platformOptions, customTypeList, groupCurrency1, groupTypeName } = useReportConst()
+let { Code } = Config
+const { userInfo } = useUserStore()
+const tableRef = ref(null)
+const loading = ref(false)
+
+const typeList = computed(() => [
+  { text: t('Ib.Report.Title1'), value: 1 },
+  { text: t('Ib.Report.Title2'), value: 2 },
+  { text: t('Ib.Report.Title3'), value: 3 },
+  { text: t('Ib.Report.Title6'), value: 4 },
+  // 新增代理
+  // { text: t('Ib.Report.Title5'), value: 5 },
+  { text: t('news_add_field.IbReport.Title6'), value: 6 },
+  { text: t('Ib.Report.Title7'), value: 7 },
+  //  加点报告
+  // { text: t('Ib.Report.Title8'), value: 24 },
+])
+
+const detailTypeList = computed(() => [
+  { text: t('Ib.Report.Tit1'), value: 1 },
+  { text: t('Ib.Report.Tit2'), value: 2 },
+  { text: t('Ib.Report.Tit3'), value: 3 },
+  { text: t('Ib.Report.Tit4'), value: 4 },
+])
+
+const isShortList = computed(() => [
+  { text: t('State.All'), value: 0 },
+  { text: t('Ib.Report.item1'), value: 1 },
+  { text: t('Ib.Report.item2'), value: 2 },
+])
+
+const now = new Date()
+const year = now.getFullYear()
+const month = String(now.getMonth() + 1).padStart(2, '0')
+const day = String(now.getDate()).padStart(2, '0')
+const defaultDateRange = [`${year}-${month}-01`, `${year}-${month}-${day}`]
+
+const searchParams = ref<any>({
+  reportType: 1,
+  detail_type: null,
+  customType: 0,
+  platform: 'MT4',
+  agentId: '',
+  login: '',
+  cId: '',
+  isShort: 0,
+  date: defaultDateRange,
+})
+
+const filterFields = ref([])
+
+const search = ref({
+  reportType: 1,
+  detail_type: null as number | null,
+  customType: 0,
+  platform: 'MT4',
+  startDate: defaultDateRange[0],
+  endDate: defaultDateRange[1],
+  date: defaultDateRange,
+  agentId: '',
+  login: '',
+  cId: '',
+  isShort: 0,
+})
+
+const country = computed(() => {
+  return userInfo.customInfo.country
+})
+
+const agentLevels = ref<Array<{ key: string, options: any[] }>>([
+  {
+    key: 'agentId_0',
+    options: [
+      { value: 0, text: t('news_add_field.IbReport.ALL') },
+      { value: -1, text: t('news_add_field.IbReport.DirectlyUnder') },
+    ],
+  },
+])
+
+const handleAgentChange = async (val: any, levelIndex: number) => {
+  console.log(val, 'change1`')
+  // 截断当前层级之后的所有层级
+  agentLevels.value.splice(levelIndex + 1)
+
+  // 清理 searchParams 中被移除层级的值
+  for (let key in searchParams.value) {
+    if (key.startsWith('agentId_')) {
+      const idx = parseInt(key.split('_')[1])
+      if (idx > levelIndex) {
+        delete searchParams.value[key]
       }
     }
-    handleSearch(searchParams.value)
-    if (val === 0 || val === -1 || val === '') {
-      return
-    }
+  }
+  handleSearch(searchParams.value)
+  if (val === 0 || val === -1 || val === '') {
+    return
+  }
 
-    try {
-      const res = await ibApi.ibTree({ pid: val })
-      if (res.code === Code.StatusOK && res.data && res.data.length > 0) {
-        const nextOptions = []
-        res.data.forEach((item: any) => {
-          if (item.ibNo) {
-            nextOptions.push({
-              value: item.id,
-              text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
-            })
-          }
-        })
-        if (nextOptions.length > 0) {
-          agentLevels.value.push({
-            key: `agentId_${levelIndex + 1}`,
-            options: nextOptions,
+  try {
+    const res = await ibApi.ibTree({ pid: val })
+    if (res.code === Code.StatusOK && res.data && res.data.length > 0) {
+      const nextOptions = []
+      res.data.forEach((item: any) => {
+        if (item.ibNo) {
+          nextOptions.push({
+            value: item.id,
+            text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
           })
         }
+      })
+      if (nextOptions.length > 0) {
+        agentLevels.value.push({
+          key: `agentId_${levelIndex + 1}`,
+          options: nextOptions,
+        })
       }
-      setFields()
-
-    } catch (error) {
-      uni.showToast({ title: 'Error', icon: 'none' })
     }
+    setFields()
+
+  } catch (error) {
+    uni.showToast({ title: 'Error', icon: 'none' })
   }
+}
 
-  const getSummaries = (param: any) => {
-    const { columns, summaryData } = param
-    const sums: string[] = []
-    if (!summaryData || Object.keys(summaryData).length === 0) return sums
+const getSummaries = (param: any) => {
+  const { columns, summaryData } = param
+  const sums: string[] = []
+  if (!summaryData || Object.keys(summaryData).length === 0) return sums
 
-    columns.forEach((column: any, index: number) => {
-      if (index === 0) {
-        sums[index] = t('Label.Total')
-        return
-      }
+  columns.forEach((column: any, index: number) => {
+    if (index === 0) {
+      sums[index] = t('Label.Total')
+      return
+    }
 
-      const type = search.value.reportType
-      const detailType = search.value.detail_type
+    const type = search.value.reportType
+    const detailType = search.value.detail_type
 
-      // 根据不同的列 prop 进行合计数据显示和格式化
-      const prop = column.prop
-      if (!prop) {
+    // 根据不同的列 prop 进行合计数据显示和格式化
+    const prop = column.prop
+    if (!prop) {
+      sums[index] = ''
+      return
+    }
+
+    if (type == 1) {
+      if (['deposit', 'withdrawal', 'credit'].includes(prop)) {
+        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+      } else {
         sums[index] = ''
-        return
       }
-
-      if (type == 1) {
-        if (['deposit', 'withdrawal', 'credit'].includes(prop)) {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else if (type == 2) {
-        if (['volume', 'rebateAmount', 'commissionAmount'].includes(prop)) {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else if (type == 3) {
-        if (detailType == 4) {
-          if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
-            sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-          } else {
-            sums[index] = ''
-          }
-        } else {
-          if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
-            sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-          } else {
-            sums[index] = ''
-          }
-        }
-      } else if (type == 4) {
-        if (['credit', 'balance', 'equity', 'floating'].includes(prop)) {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
-      } else if (type == 6) {
-        if (prop === 'amount') {
+    } else if (type == 2) {
+      if (['volume', 'rebateAmount', 'commissionAmount'].includes(prop)) {
+        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+      } else {
+        sums[index] = ''
+      }
+    } else if (type == 3) {
+      if (detailType == 4) {
+        if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
           sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
         } else {
           sums[index] = ''
         }
-      } else if (type == 7) {
-        if (['fxVolume', 'cfdVolume', 'indexVolume', 'metalVolume'].includes(prop)) {
+      } else {
+        if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
           sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
         } else {
           sums[index] = ''
         }
-      } else if (type == 24) {
-        if (prop === 'volume') {
-          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) + ' /手' : '0'
-        } else if (prop === 'rebate') {
-          sums[index] = summaryData[prop] ? '$' + numberFormat(summaryData[prop]) : '0'
-        } else {
-          sums[index] = ''
-        }
+      }
+    } else if (type == 4) {
+      if (['credit', 'balance', 'equity', 'floating'].includes(prop)) {
+        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
       } else {
         sums[index] = ''
       }
-    })
-
-    return sums
-  }
-
-  const handleSearch = (params: any) => {
-    const payload: any = { ...params }
-
-    let finalAgentId = payload.agentId_0
-    for (let i = agentLevels.value.length - 1; i >= 0; i--) {
-      const val = payload[`agentId_${i}`]
-      if (val !== undefined && val !== '') {
-        finalAgentId = val
-        break
+    } else if (type == 6) {
+      if (prop === 'amount') {
+        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+      } else {
+        sums[index] = ''
       }
-    }
-    payload.agentId = finalAgentId
-    if (payload.date?.length){
-      payload.startDate = payload.date[0]
-      payload.endDate = payload.date[1]
-    }
-
-    const type = Number(payload.reportType)
-    if (![1, 3, 4, 7, 24].includes(type)) payload.platform = ''
-    if (![1, 2, 3, 4, 7].includes(type)) payload.login = ''
-    if (type !== 7) payload.cId = ''
-    if (![3, 7].includes(type)) payload.isShort = 0
-    if (type !== 3) payload.detail_type = null
-    if (type !== 24) payload.customType = 0
-
-    search.value = {
-      reportType: payload.reportType,
-      detail_type: payload.detail_type,
-      customType: payload.customType,
-      platform: payload.platform,
-      startDate: payload.startDate,
-      endDate: payload.endDate,
-      date: payload.date,
-      agentId: payload.agentId,
-      login: payload.login,
-      cId: payload.cId,
-      isShort: payload.isShort,
-    }
-    nextTick(() => {
-      tableRef.value?.refreshTable?.()
-    })
-  }
-
-  const handleReset = (emptyParams: any) => {
-    // 重置时清理级联菜单到只有第一层
-    agentLevels.value.splice(1)
-    handleSearch(emptyParams)
-  }
-
-  const initIbTree = async () => {
-    const res = await ibApi.ibTree({ pid: 0 })
-
-    if (res.code === Code.StatusOK) {
-      if (res.data && res.data.length > 0) {
-        res.data.forEach((item: any) => {
-          if (item.ibNo) {
-            let option = {
-              value: item.id,
-              text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
-            }
-            agentLevels.value[0].options.push(option)
-          }
-        })
+    } else if (type == 7) {
+      if (['fxVolume', 'cfdVolume', 'indexVolume', 'metalVolume'].includes(prop)) {
+        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
       } else {
-        uni.showToast({
-          title: res.msg, icon: 'none',
-        })
+        sums[index] = ''
       }
-    }
-  }
-
-  // 表格列配置 根据types 切换
-  const columns = computed(() => {
-    if (search.value.reportType === 3) {
-      return columnList.value[`3_${search.value.detail_type}`] || []
-    }
-    return columnList.value[search.value.reportType] || []
-  })
-
-  const mobilePrimaryFields = computed(() => {
-    let list: any[] = []
-    if (search.value.reportType === 3) {
-      list = mobileList.value[`3_${search.value.detail_type}`] || []
-    } else {
-      list = mobileList.value[search.value.reportType] || []
-    }
-    return [
-      ...list,
-      {
-        prop: 'more',
-        type: 'more',
-        width: 20,
-        align: 'right',
-      },
-    ]
-  })
-
-  // 接口 根据types 切换（动态代理不同类型报表API）
-  const listApi = computed(() => {
-    return async (params: any) => {
-      let apiFn = ibApi.tradeDw
-      const type = search.value.reportType
-      const detailType = search.value.detail_type
-
-      if (type == 1) apiFn = ibApi.tradeDw
-      else if (type == 2) apiFn = ibApi.tradeAgentCommission
-      else if (type == 3) {
-        if (detailType == 1) apiFn = ibApi.tradeHistory
-        else if (detailType == 2) apiFn = ibApi.tradePendingHistory
-        else if (detailType == 3) apiFn = ibApi.tradePending
-        else if (detailType == 4) apiFn = ibApi.tradePosition
-      } else if (type == 4) apiFn = ibApi.tradeAccount
-      else if (type == 5) apiFn = ibApi.tradeIb
-      else if (type == 6) apiFn = ibApi.ibReportBalance
-      else if (type == 7) apiFn = ibApi.tradeSymbolCategory
-      else if (type == 24) apiFn = ibApi.tradeSalesHidden
-      if (apiFn) {
-        if (type == 2) {
-          const isVietnam = country.value === 'VN' // 这里需要你实际的取国家逻辑
-          return await apiFn(params, isVietnam)
-        }
-        return await apiFn(params)
+    } else if (type == 24) {
+      if (prop === 'volume') {
+        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) + ' /手' : '0'
+      } else if (prop === 'rebate') {
+        sums[index] = summaryData[prop] ? '$' + numberFormat(summaryData[prop]) : '0'
+      } else {
+        sums[index] = ''
       }
-    }
-  })
-
-  watch(() => searchParams.value.reportType, (val) => {
-    const type = Number(val)
-    search.value.reportType = type
-    if (type === 24) {
-      searchParams.value.customType = 0
-      searchParams.value.detail_type = null
-      search.value.customType = 0
-      search.value.detail_type = null
-    } else if (type === 3) {
-      if (searchParams.value.detail_type == null) searchParams.value.detail_type = 1
-      if (search.value.detail_type == null) search.value.detail_type = 1
     } else {
-      searchParams.value.detail_type = null
-      search.value.detail_type = null
-      searchParams.value.customType = 0
-      search.value.customType = 0
+      sums[index] = ''
     }
-  }, { immediate: true })
-
-  watch(() => searchParams.value.detail_type, (val) => {
-    search.value.detail_type = val == null ? null : Number(val)
   })
 
-  watch(() => searchParams.value.platform, (val) => {
-    search.value.platform = val
-  })
+  return sums
+}
 
-  watch(() => searchParams.value.customType, (val) => {
-    search.value.customType = val
-  })
+const handleSearch = (params: any) => {
+  const payload: any = { ...params }
 
-  watch(() => searchParams.value.isShort, (val) => {
-    search.value.isShort = val
-  })
+  let finalAgentId = payload.agentId_0
+  for (let i = agentLevels.value.length - 1; i >= 0; i--) {
+    const val = payload[`agentId_${i}`]
+    if (val !== undefined && val !== '') {
+      finalAgentId = val
+      break
+    }
+  }
+  payload.agentId = finalAgentId
+  if (payload.date?.length) {
+    payload.startDate = payload.date[0]
+    payload.endDate = payload.date[1]
+  }
 
-  onMounted(async () => {
-    loading.value = true
-    await initIbTree()
-    setFields()
-    loading.value = false
+  const type = Number(payload.reportType)
+  if (![1, 3, 4, 7, 24].includes(type)) payload.platform = ''
+  if (![1, 2, 3, 4, 7].includes(type)) payload.login = ''
+  if (type !== 7) payload.cId = ''
+  if (![3, 7].includes(type)) payload.isShort = 0
+  if (type !== 3) payload.detail_type = null
+  if (type !== 24) payload.customType = 0
+
+  search.value = {
+    reportType: payload.reportType,
+    detail_type: payload.detail_type,
+    customType: payload.customType,
+    platform: payload.platform,
+    startDate: payload.startDate,
+    endDate: payload.endDate,
+    date: payload.date,
+    agentId: payload.agentId,
+    login: payload.login,
+    cId: payload.cId,
+    isShort: payload.isShort,
+  }
+  nextTick(() => {
+    tableRef.value?.refreshTable?.()
   })
-  const setFields = () => {
-    const type = Number(searchParams.value.reportType ?? 1)
-    const fields: any[] = [
-      {
-        key: 'reportType',
-        type: 'select',
-        label: t('Home.page_ib.item3'),
-        placeholder: t('placeholder.choose'),
-        options: typeList.value,
-        defaultValue: 1,
-        isSelect: true,
-      },
-    ]
-
-    if (type === 3) {
-      fields.push({
-        key: 'detail_type',
-        type: 'select',
-        label: t('placeholder.choose'),
-        placeholder: t('placeholder.choose'),
-        options: detailTypeList.value,
-        defaultValue: 1,
-        isSelect: true,
+}
+
+const handleReset = (emptyParams: any) => {
+  // 重置时清理级联菜单到只有第一层
+  agentLevels.value.splice(1)
+  handleSearch(emptyParams)
+}
+
+const initIbTree = async () => {
+  const res = await ibApi.ibTree({ pid: 0 })
+
+  if (res.code === Code.StatusOK) {
+    if (res.data && res.data.length > 0) {
+      res.data.forEach((item: any) => {
+        if (item.ibNo) {
+          let option = {
+            value: item.id,
+            text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
+          }
+          agentLevels.value[0].options.push(option)
+        }
       })
-    }
-
-    if ([1, 3, 4, 7, 24].includes(type)) {
-      fields.push({
-        key: 'platform',
-        type: 'select',
-        label: t('Label.Platform'),
-        placeholder: t('placeholder.choose'),
-        options: platformOptions,
-        defaultValue: 'MT4',
+    } else {
+      uni.showToast({
+        title: res.msg, icon: 'none',
       })
     }
+  }
+}
 
-    if (type === 24) {
-      fields.push({
-        key: 'customType',
-        type: 'select',
-        label: t('placeholder.choose'),
-        placeholder: t('placeholder.choose'),
-        options: customTypeList.value,
-        defaultValue: 0,
-        isSelect: true,
-      })
+// 表格列配置 根据types 切换
+const columns = computed(() => {
+  if (search.value.reportType === 3) {
+    return columnList.value[`3_${search.value.detail_type}`] || []
+  }
+  return columnList.value[search.value.reportType] || []
+})
+
+const mobilePrimaryFields = computed(() => {
+  let list: any[] = []
+  if (search.value.reportType === 3) {
+    list = mobileList.value[`3_${search.value.detail_type}`] || []
+  } else {
+    list = mobileList.value[search.value.reportType] || []
+  }
+  return [
+    ...list,
+    {
+      prop: 'more',
+      type: 'more',
+      width: 20,
+      align: 'right',
+    },
+  ]
+})
+
+// 接口 根据types 切换（动态代理不同类型报表API）
+const listApi = computed(() => {
+  return async (params: any) => {
+    let apiFn = ibApi.tradeDw
+    const type = search.value.reportType
+    const detailType = search.value.detail_type
+
+    if (type == 1) apiFn = ibApi.tradeDw
+    else if (type == 2) apiFn = ibApi.tradeAgentCommission
+    else if (type == 3) {
+      if (detailType == 1) apiFn = ibApi.tradeHistory
+      else if (detailType == 2) apiFn = ibApi.tradePendingHistory
+      else if (detailType == 3) apiFn = ibApi.tradePending
+      else if (detailType == 4) apiFn = ibApi.tradePosition
+    } else if (type == 4) apiFn = ibApi.tradeAccount
+    else if (type == 5) apiFn = ibApi.tradeIb
+    else if (type == 6) apiFn = ibApi.ibReportBalance
+    else if (type == 7) apiFn = ibApi.tradeSymbolCategory
+    else if (type == 24) apiFn = ibApi.tradeSalesHidden
+    if (apiFn) {
+      if (type == 2) {
+        const isVietnam = country.value === 'VN' // 这里需要你实际的取国家逻辑
+        return await apiFn(params, isVietnam)
+      }
+      return await apiFn(params)
     }
-
-    console.log(agentLevels.value)
-    agentLevels.value.forEach((level, index) => {
-      fields.push({
-        key: level.key,
-        type: 'select',
-        label: t('State.All'),
-        options: level.options,
-        placeholder: t('State.All'),
-        onChange: (val: any) => handleAgentChange(val, index),
-        defaultValue: index === 0 ? 0 : '',
-      })
+  }
+})
+
+watch(() => searchParams.value.reportType, (val) => {
+  const type = Number(val)
+  search.value.reportType = type
+  if (type === 24) {
+    searchParams.value.customType = 0
+    searchParams.value.detail_type = null
+    search.value.customType = 0
+    search.value.detail_type = null
+  } else if (type === 3) {
+    if (searchParams.value.detail_type == null) searchParams.value.detail_type = 1
+    if (search.value.detail_type == null) search.value.detail_type = 1
+  } else {
+    searchParams.value.detail_type = null
+    search.value.detail_type = null
+    searchParams.value.customType = 0
+    search.value.customType = 0
+  }
+}, { immediate: true })
+
+watch(() => searchParams.value.detail_type, (val) => {
+  search.value.detail_type = val == null ? null : Number(val)
+})
+
+watch(() => searchParams.value.platform, (val) => {
+  search.value.platform = val
+})
+
+watch(() => searchParams.value.customType, (val) => {
+  search.value.customType = val
+})
+
+watch(() => searchParams.value.isShort, (val) => {
+  search.value.isShort = val
+})
+
+onMounted(async () => {
+  loading.value = true
+  await initIbTree()
+  setFields()
+  loading.value = false
+})
+const setFields = () => {
+  const type = Number(searchParams.value.reportType ?? 1)
+  const fields: any[] = [
+    {
+      key: 'reportType',
+      type: 'select',
+      label: t('Home.page_ib.item3'),
+      placeholder: t('placeholder.choose'),
+      options: typeList.value,
+      defaultValue: 1,
+      isSelect: true,
+    },
+  ]
+
+  if (type === 3) {
+    fields.push({
+      key: 'detail_type',
+      type: 'select',
+      label: t('placeholder.choose'),
+      placeholder: t('placeholder.choose'),
+      options: detailTypeList.value,
+      defaultValue: 1,
+      isSelect: true,
     })
+  }
 
-    if ([1, 2, 3, 4, 7].includes(type)) {
-      fields.push({
-        key: 'login',
-        type: 'input',
-        label: t('Label.TradingAccount'),
-        placeholder: t('Label.TradingAccount'),
-        defaultValue: '',
-      })
-    }
+  if ([1, 3, 4, 7, 24].includes(type)) {
+    fields.push({
+      key: 'platform',
+      type: 'select',
+      label: t('Label.Platform'),
+      placeholder: t('placeholder.choose'),
+      options: platformOptions,
+      defaultValue: 'MT4',
+    })
+  }
 
-    if (type === 7) {
-      fields.push({ key: 'cId', type: 'input', label: 'CID', placeholder: 'CID', defaultValue: '' })
-    }
+  if (type === 24) {
+    fields.push({
+      key: 'customType',
+      type: 'select',
+      label: t('placeholder.choose'),
+      placeholder: t('placeholder.choose'),
+      options: customTypeList.value,
+      defaultValue: 0,
+      isSelect: true,
+    })
+  }
 
-    if ([3, 7].includes(type)) {
-      fields.push({
-        key: 'isShort',
-        type: 'select',
-        label: t('placeholder.choose'),
-        placeholder: t('placeholder.choose'),
-        options: isShortList.value,
-        defaultValue: 0,
-        isSelect: true,
-      })
-    }
+  console.log(agentLevels.value)
+  agentLevels.value.forEach((level, index) => {
+    fields.push({
+      key: level.key,
+      type: 'select',
+      label: t('State.All'),
+      options: level.options,
+      placeholder: t('State.All'),
+      onChange: (val: any) => handleAgentChange(val, index),
+      defaultValue: index === 0 ? 0 : '',
+    })
+  })
 
-    fields.push({ key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' })
-    filterFields.value = fields
+  if ([1, 2, 3, 4, 7].includes(type)) {
+    fields.push({
+      key: 'login',
+      type: 'input',
+      label: t('Label.TradingAccount'),
+      placeholder: t('Label.TradingAccount'),
+      defaultValue: '',
+    })
   }
 
-</script>
-
-<style lang="scss" scoped>
-  @import "@/uni.scss";
+  if (type === 7) {
+    fields.push({ key: 'cId', type: 'input', label: 'CID', placeholder: 'CID', defaultValue: '' })
+  }
 
-  .search-content {
-    display: flex;
-    justify-content: space-between;
+  if ([3, 7].includes(type)) {
+    fields.push({
+      key: 'isShort',
+      type: 'select',
+      label: t('placeholder.choose'),
+      placeholder: t('placeholder.choose'),
+      options: isShortList.value,
+      defaultValue: 0,
+      isSelect: true,
+    })
   }
 
-  .report-platform {
-    display: flex;
-    align-items: center;
-
-    .checklist-box {
-      cursor: pointer;
-      box-sizing: border-box;
-      padding: 0 px2rpx(20);
-      border: 1px solid #DCDFE6;
-      background-color: #f5f5f5;
-      height: px2rpx(35);
-      line-height: px2rpx(35);
-      border-radius: px2rpx(4) 0 0 px2rpx(4);
-
-      &:last-child {
-        border-radius: 0 px2rpx(4) px2rpx(4) 0;
-      }
+  fields.push({ key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' })
+  filterFields.value = fields
+}
 
-      &.active {
-        color: var(--color-white);
-        background-color: var(--color-error);
-        border-color: var(--color-error);
-      }
+</script>
+
+<style lang="scss" scoped>
+@import "@/uni.scss";
+
+.search-content {
+  display: flex;
+  justify-content: space-between;
+}
+
+.report-platform {
+  display: flex;
+  align-items: center;
+
+  .checklist-box {
+    cursor: pointer;
+    box-sizing: border-box;
+    padding: 0 px2rpx(20);
+    border: 1px solid #DCDFE6;
+    background-color: #f5f5f5;
+    height: px2rpx(35);
+    line-height: px2rpx(35);
+    border-radius: px2rpx(4) 0 0 px2rpx(4);
+
+    &:last-child {
+      border-radius: 0 px2rpx(4) px2rpx(4) 0;
     }
-  }
 
-  .search-input-box {
-    .uni-input {
-      height: px2rpx(35);
-      border: 1px solid #DCDFE6;
-      padding: 0 px2rpx(20);
-      border-radius: px2rpx(4);
-      background-color: #fff;
+    &.active {
+      color: var(--color-white);
+      background-color: var(--color-error);
+      border-color: var(--color-error);
     }
   }
-
-  .agent-select {
-    width: px2rpx(240);
+}
+
+.search-input-box {
+  .uni-input {
+    height: px2rpx(35);
+    border: 1px solid #DCDFE6;
+    padding: 0 px2rpx(20);
+    border-radius: px2rpx(4);
+    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   }
+}
 
-  .search-btn {
-    height: px2rpx(36);
-    line-height: px2rpx(36);
-    margin: 0;
-  }
+.agent-select {
+  width: px2rpx(240);
+}
+
+.search-btn {
+  height: px2rpx(36);
+  line-height: px2rpx(36);
+  margin: 0;
+}
 </style>

pages/ib/settingPammManager.vue

@@ -288,7 +288,7 @@ onLoad((options: any) => {
 
 .main-content {
   padding: px2rpx(20);
-  background-color: #fff;
+  background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
   border-radius: px2rpx(8);
   margin-top: px2rpx(15);
   min-height: calc(100vh - 100px);
@@ -311,7 +311,7 @@ onLoad((options: any) => {
     padding: 0 px2rpx(20);
     text-align: center;
     border: 1px solid #dcdfe6;
-    background-color: #fff;
+    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
     font-size: px2rpx(14);
     cursor: pointer;
 

pages/ib/transfer.vue

@@ -746,7 +746,7 @@ onLoad((options) => {
             color: #303133;
 
             .b-card {
-                background-color: #fff;
+                background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
                 margin-bottom: px2rpx(10);
                 border-radius: px2rpx(6);
                 box-shadow: 0 px2rpx(1) px2rpx(6) 0 rgba(0, 0, 0, 0.05);
@@ -773,7 +773,7 @@ onLoad((options) => {
                         margin-bottom: px2rpx(16);
                         display: flex;
                         align-items: center;
-                        color: var(--color-navy-900);
+                        color: var(--bs-heading-color);
                         position: relative;
                         padding-left: 20px;
 

pages/ib/withdraw-select.vue

@@ -7,7 +7,7 @@
                 <view class="b-card">
                     <view class="card-top">
                         <text class="tit">{{ t('Custom.Deposit.Title22')
-                        }}</text>
+                            }}</text>
                         <cwg-asset-tabs v-if="tabsConfig.length > 0" v-model="activeTab" :tabs="tabsConfig" />
                         <uni-loading v-if="currentTableData.length == 0" />
                         <view v-if="currentTableData.length">
@@ -16,7 +16,7 @@
                         <view v-if="step3" class="reselect-btn">
                             <button class="s-btn reselect" type="primary" @click="showTable">{{
                                 t('Custom.Deposit.Reselect')
-                            }}</button>
+                                }}</button>
                         </view>
                     </view>
                 </view>
@@ -151,7 +151,7 @@
                                             </text>
                                             <text v-if="channelData.type == 'BANK'">{{
                                                 t('Custom.Withdraw.addBank')
-                                            }}</text>
+                                                }}</text>
                                             <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                                                 @click="openAddBankCard('add_bankCard')">
                                                 {{ t('Custom.Withdraw.addBank1') }}
@@ -313,7 +313,7 @@
                                 <uni-col :span="24" v-if="channelData.type != 'BANK_TELEGRAPHIC' && isStep3">
                                     <view class="tit">
                                         <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                                        }}</text>
+                                            }}</text>
                                     </view>
                                 </uni-col>
                                 <uni-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12"
@@ -1497,7 +1497,7 @@ watch(() => form.amount, (newVal) => {
                     margin-bottom: px2rpx(16);
                     display: flex;
                     align-items: center;
-                    color: var(--color-navy-900);
+                    color: var(--bs-heading-color);
                     position: relative;
                     padding-left: 20px;
 

pages/ib/withdraw.vue

@@ -10,7 +10,7 @@
                     <view class="b-card">
                         <view class="card-top">
                             <text class="tit">{{ t('Custom.Deposit.Title22')
-                            }}</text>
+                                }}</text>
                             <cwg-combox :clearable="false" v-model:value="channelId" :options="channelListOptions"
                                 :placeholder="t('placeholder.choose')">
                             </cwg-combox>
@@ -133,7 +133,7 @@
                                                 </text>
                                                 <text v-if="channelData.type == 'BANK'">{{
                                                     t('Custom.Withdraw.addBank')
-                                                }}</text>
+                                                    }}</text>
                                                 <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                                                     @click="openAddBankCard('add_bankCard')">
                                                     {{ t('Custom.Withdraw.addBank1') }}
@@ -280,7 +280,7 @@
                                     <view v-if="channelData.type != 'BANK_TELEGRAPHIC'">
                                         <view class="tit">
                                             <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                                            }}</text>
+                                                }}</text>
                                         </view>
                                     </view>
                                     <view v-if="channelData.type != 'BANK_TELEGRAPHIC'" class="amount-box amount-box1">
@@ -1560,7 +1560,7 @@ watch(() => form.amount, (newVal) => {
                     margin-bottom: px2rpx(16);
                     display: flex;
                     align-items: center;
-                    color: var(--color-navy-900);
+                    color: var(--bs-heading-color);
                     position: relative;
                     padding-left: 20px;
 

pages/mine/components/PersonalInfoTab.vue

@@ -497,12 +497,12 @@ onMounted(async () => {
         .text {
           font-size: px2rpx(20);
           font-weight: 700;
-          color: var(--color-navy-900);
+          color: var(--bs-heading-color);
         }
 
         .btn-primary {
           min-width: px2rpx(120);
-          background-color: var(--color-navy-900);
+          background-color: var(--bs-heading-color);
           color: white;
           padding: px2rpx(12);
           border: none;
@@ -537,7 +537,7 @@ onMounted(async () => {
 
     .btn-primary {
       min-width: px2rpx(120);
-      background-color: var(--color-navy-900);
+      background-color: var(--bs-heading-color);
       color: white;
       padding: 12px;
       border-radius: 8px;

pages/mine/info.vue

@@ -321,7 +321,7 @@ onMounted(async () => {
 
         .btn-primary {
             min-width: px2rpx(120);
-            background-color: var(--color-navy-900);
+            background-color: var(--bs-heading-color);
             color: white;
             padding: 0 px2rpx(12);
             border-radius: px2rpx(8);

static/scss/global/global.scss

@@ -513,7 +513,7 @@ body {
     margin: 0 auto !important;
     font-size: px2rpx(12);
     line-height: 1;
-    color: #fff;
+    color: var(--bs-emphasis-color);
 }
 
 .bg-body {
@@ -521,6 +521,21 @@ body {
     background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
 }
 
+.u-input__content__field-wrapper__field {
+    color: var(--bs-body-color) !important;
+}
+
+.u-input {
+    border: 1px solid var(--bs-border-color);
+}
+
+.u-input,
+.uni-input-input {
+    --bs-bg-opacity: 1;
+    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
+    color: var(--bs-body-color) !important;
+}
+
 .uni-top-window {
     overflow: visible;
 }
@@ -1191,9 +1206,9 @@ uni-content.collapsed {
     min-height: px2rpx(40);
     line-height: px2rpx(40);
     box-sizing: border-box;
-    color: var(--color-navy-900);
+    color: var(--bs-heading-color);
     // color: var(--color-white);
-    // background-color: var(--color-navy-900);
+    // background-color: var(--bs-heading-color);
     font-size: px2rpx(20);
     font-weight: bold;
 }
@@ -1813,5 +1828,5 @@ uni-content.collapsed {
 
 ::selection {
     background-color: var(--bs-secondary);
-    color: #fff;
+    // color: #fff;
 }

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

@@ -309,14 +309,14 @@ export default {
 		},
 		inputContentStyle() {
 			const focusColor = this.focusShow ?
-				this.primaryColor :
+				'var(--bs-heading-color)' :
 				this.styles.borderColor;
 			const borderColor =
 				this.inputBorder && this.msg ? '#dd524d' : focusColor;
 			return obj2strStyle({
 				'border-color': borderColor || '#e5e5e5',
 				'background-color': this.disabled ?
-					this.styles.disableColor : this.styles.backgroundColor
+					this.styles.disableColor : 'transparent'
 			});
 		},
 		// input右侧样式
@@ -680,7 +680,7 @@ $uni-border-1: #dcdfe6 !default;
 }
 
 .is-disabled {
-	background-color: #f7f6f6;
+	background-color: transparent !important;
 	color: #d5d5d5;
 
 	.uni-easyinput__placeholder-class {