zhb hace 1 semana
padre
commit
36e443e4af

+ 7 - 6
components/cwg-payment.vue

@@ -28,8 +28,8 @@
 
           </view>
           <view class="drawer-actions">
-            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer" @click.stop="goPages(1)" v-t="'wallet.item6'" :data-tooltip="t('wallet.item6')" data-placement="top"></button>
-            <button class="action-btn btn btn-outline-danger waves-effect waves-light" @click.stop="goPages(2)" v-t="'wallet.item7'"></button>
+            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer cursor-pointer1" :data-tooltip="t('wallet.item6')" data-placement="top" @click.stop="goPages(1)" v-t="'wallet.item6'"></button>
+            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer cursor-pointer1" :data-tooltip="t('wallet.item7')" data-placement="top" @click.stop="goPages(2)" v-t="'wallet.item7'"></button>
           </view>
         </view>
         <view class="right-drawer custom-payment-drawer" v-if="mode === 'ib'">
@@ -46,9 +46,9 @@
 
           </view>
           <view class="drawer-actions">
-            <button class="action-btn btn btn-outline-danger waves-effect waves-light" @click.stop="goIbPages(1)" v-t="'Custom.Index.Withdrawals'"></button>
-            <button class="action-btn btn btn-outline-danger waves-effect waves-light" @click.stop="goIbPages(2)" v-t="'Home.page_ib.item4'"></button>
-            <button class="action-btn btn btn-outline-danger waves-effect waves-light" @click.stop="goIbPages(3)" v-t="'Ib.Transfer.CommissionIssue'"></button>
+            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer cursor-pointer1" :data-tooltip="t('Custom.Index.Withdrawals')" data-placement="top" @click.stop="goIbPages(1)" v-t="'Custom.Index.Withdrawals'"></button>
+            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer cursor-pointer1" :data-tooltip="t('Home.page_ib.item4')" data-placement="top" @click.stop="goIbPages(2)" v-t="'Home.page_ib.item4'"></button>
+            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer cursor-pointer1" data-placement="top" :data-tooltip="t('Ib.Transfer.CommissionIssue')" @click.stop="goIbPages(3)" v-t="'Ib.Transfer.CommissionIssue'"></button>
           </view>
         </view>
         <view class="right-drawer custom-payment-drawer" v-if="mode === 'follow'">
@@ -61,7 +61,7 @@
 
           </view>
           <view class="drawer-actions">
-            <button class="action-btn btn btn-outline-danger waves-effect waves-light" @click.stop="goFollowPages(1)" v-t="'Documentary.console.item17'"></button>
+            <button class="action-btn btn btn-outline-danger waves-effect waves-light cursor-pointer cursor-pointer1" :data-tooltip="t('Documentary.console.item17')" @click.stop="goFollowPages(1)" v-t="'Documentary.console.item17'"></button>
           </view>
         </view>
       </template>
@@ -349,6 +349,7 @@ onUnmounted(() => {
     }
 
     .drawer-actions {
+      position: relative;
       display: flex;
       gap: px2rpx(10);
       padding: 0 px2rpx(16) px2rpx(20);

+ 5 - 4
components/cwg-right-drawer.vue

@@ -13,7 +13,7 @@
                         <view class="ms-2">
                             <view class="fw-bold text-dark text-ellipsis mb-2">{{ _displayName }}</view>
                             <view class="text-body d-block lh-sm text-ellipsis mb-2">{{ _email }}</view>
-                            <text class="cid">CID: <text class="cwg-cursor" @click="copy(_displayCid)">{{ _displayCid
+                            <text class="cid">CID: <text class="cwg-cursor cursor-pointer cursor-pointer1" :data-tooltip="t('vu.tooltip.t102')" @click="copy(_displayCid)">{{ _displayCid
                                     }}</text></text>
                         </view>
                     </view>
@@ -21,8 +21,9 @@
                         <view class="dropdown-divider my-1"></view>
                     </view>
                     <view v-for="item in menuList" :key="item.id">
-                        <view class="dropdown-item user-menu-item d-flex align-items-center gap-2 cursor-pointer"
-                            @click="handleNavigate(item.path)">
+                        <view class="dropdown-item user-menu-item d-flex align-items-center gap-2 cursor-pointer cursor-pointer1"
+                            :data-tooltip="t(item.name)"
+                                                       @click="handleNavigate(item.path)">
                             <cwg-icon :name="item.icon" :size="16" color="#000" />
                             <text v-t="item.name"></text>
                         </view>
@@ -31,7 +32,7 @@
                         <view class="dropdown-divider my-1"></view>
                     </view>
                     <view>
-                        <view class="dropdown-item d-flex align-items-center gap-2 text-danger cursor-pointer"
+                        <view class="dropdown-item d-flex align-items-center gap-2 text-danger cursor-pointer cursor-pointer1" :data-tooltip="t('language.i6')"
                             @click="handleLogout">
                             <cwg-icon name="logout" :size="16" color="#FF401C" />
                             <text v-t="'language.i6'"></text>

+ 1 - 0
locale/cn.json

@@ -68,6 +68,7 @@
     "tooltip": {
       "t100": "用户信息",
       "t101": "语言设置",
+      "t102": "复制CID",
       "t1": "选择时间",
       "t2": "复制",
       "t3": "文件",

+ 21 - 18
pages/customer/components/AccountCard.vue

@@ -8,7 +8,7 @@
                     </view>
                     <template #content>
                         <text>{{ t("Tips.item1")
-                        }}<text style="color: red">{{ account.markDelTime }}</text>{{ t("Tips.item2") }}</text>
+                            }}<text style="color: red">{{ account.markDelTime }}</text>{{ t("Tips.item2") }}</text>
                     </template>
                 </uni-tooltip>
                 <template v-if="account.del != 1">
@@ -26,8 +26,9 @@
                     <view class="btn-group">
                         <cwg-dropdown ref="dropdownRef" @open="onOpen" @close="onClose" :menu-list="customMenuList"
                             @menuClick="handleCustomClick">
-                            <button class="btn btn-white btn-sm btn-shadow btn-icon waves-effect dropdown-toggle"
-                                type="button">
+                            <button
+                                class="btn btn-white btn-sm btn-shadow btn-icon waves-effect dropdown-toggle  cursor-pointer"
+                                :data-tooltip="t('Btn.More')" type="button">
                                 <cwg-icon name="crm-ellipsis-vertical" :size="18"
                                     :color="!isDark ? '#6c8595' : '#fff'" />
                             </button>
@@ -37,9 +38,11 @@
             </view>
             <view class="card-body p-3 pt-0">
                 <view class="text-left mb-3">
-                    <h5 class="fw-bold mb-3  cursor-pointer" :data-tooltip="t('vu.tooltip.t2')" data-placement="top" @click="copy(account.accountNumber)"># {{
-                        account.accountNumber }}</h5>
-                    <h4 class="mb-2 cursor-pointer" :data-tooltip="t('vu.tooltip.t2')" :data-placement="top" @click="copy(account.fwq)">{{ account.fwq }}</h4>
+                    <h5 class="fw-bold mb-3  cursor-pointer" :data-tooltip="t('vu.tooltip.t2')" data-placement="top"
+                        @click="copy(account.accountNumber)"># {{
+                            account.accountNumber }}</h5>
+                    <h4 class="mb-2 cursor-pointer" :data-tooltip="t('vu.tooltip.t2')" :data-placement="top"
+                        @click="copy(account.fwq)">{{ account.fwq }}</h4>
                     <template v-for="(label, index) in account.labels" :key="index">
                         <text v-if="label" class="badge text-danger1 bg-danger-subtle mx-1 mb-1">{{ label }}</text>
                     </template>
@@ -165,7 +168,7 @@ const closeFunctionOpen = (code) => {
     if (closeFunctions == null || closeFunctions === "") {
         return true;
     }
-    console.log(closeFunctions, 12121,String(closeFunctions).indexOf(String(code)) === -1);
+    console.log(closeFunctions, 12121, String(closeFunctions).indexOf(String(code)) === -1);
 
     return String(closeFunctions).indexOf(String(code)) === -1;
 }
@@ -175,21 +178,21 @@ const circleButtons = ref([
     { key: 'transfer', label: 'Custom.Index.Transfer', icon: 'crm-transfer', action: 'transfer', needDemo: isDemo.value, disabled: !(closeFunctionOpen('5') && closeFunctionOpen('6') && closeFunctionOpen('3')), color: '#6c8595' }
 ])
 const isAfterJuly28 = () => {
-  const now = new Date();
-  const july28 = new Date(2025, 6, 28, 0, 0, 0); // 月份从0开始,所以7月是6
-  return now >= july28;
+    const now = new Date();
+    const july28 = new Date(2025, 6, 28, 0, 0, 0); // 月份从0开始,所以7月是6
+    return now >= july28;
 }
 const typeMap = computed(() => ({
-  1: t('AccountType.ClassicAccount'),
-  2: t('AccountType.SeniorAccount'),
-  3: !isAfterJuly28() ? t('AccountType.AgencyAccount') : '',
-  5: t('AccountType.SpeedAccount'),
-  6: t('AccountType.SpeedAccount'),
-  7: t('AccountType.StandardAccount'),
-  8: t('AccountType.CentAccount')
+    1: t('AccountType.ClassicAccount'),
+    2: t('AccountType.SeniorAccount'),
+    3: !isAfterJuly28() ? t('AccountType.AgencyAccount') : '',
+    5: t('AccountType.SpeedAccount'),
+    6: t('AccountType.SpeedAccount'),
+    7: t('AccountType.StandardAccount'),
+    8: t('AccountType.CentAccount')
 }));
 const fieldList = computed(() => ([
-    { label: t('Custom.PaymentHistory.AccountType'), key: 'type', copyable: false,isEnum:true,enums:typeMap.value },
+    { label: t('Custom.PaymentHistory.AccountType'), key: 'type', copyable: false, isEnum: true, enums: typeMap.value },
     { label: t('Label.Leverage'), key: 'actualLeverage', copyable: false },
     { label: t('Label.FloatingPL'), key: 'floatingPL', copyable: false },
     { label: t('Label.Balance'), key: 'balanceWithSymbol', copyable: false },

+ 3 - 3
pages/customer/components/AccountList.vue

@@ -6,13 +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" style="align-self: flex-start" v-t="'Custom.Index.AccountList'"></h3>
-                        <button type="button" class="btn btn-danger btn-shadow waves-effect"
+                        <view type="button" class="btn btn-danger btn-shadow waves-effect cursor-pointer" :data-tooltip="t('Custom.Index.AddAccount')"
                             @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>
             </view>
@@ -21,7 +21,7 @@
                     <view class="card">
                         <view class="card-header">
                             <view class="nav nav-underline card-header-tabs">
-                                <view class="nav-item cwg-cursor" v-for="(tab, index) in tabs" :key="index"
+                                <view class="nav-item cwg-cursor cursor-pointer" :data-tooltip="tab.text" v-for="(tab, index) in tabs" :key="index"
                                     @click="handleTabClick(tab.value)">
                                     <view class="nav-link" :class="{ 'active': tab.value === cativeIndex }">{{ tab.text
                                     }}

BIN
static/res 4/CustomLaunch.zip


+ 15 - 7
static/scss/global/global.scss

@@ -2122,7 +2122,12 @@ uni-content.collapsed {
 @media screen and (min-width: 768px) {
   .cursor-pointer[data-tooltip]::after {
     content: attr(data-tooltip);
-    position: fixed;
+    position: fixed !important; /* 强制固定定位,相对视口 */
+    display: inline-block;
+    min-width: 20px;
+    width: max-content;
+    height: max-content;
+    overflow: visible !important; /* 不被裁 */
     background-color: rgba(var(--bs-body-bg-rgb), 1) !important;
     border-radius: px2rpx(8);
     color: var(--bs-emphasis-color);
@@ -2132,10 +2137,11 @@ uni-content.collapsed {
     line-height: px2rpx(20);
     padding: px2rpx(6);
     white-space: nowrap;
-    z-index: 999;
+    /* 🔥 拉到最高级,覆盖绝大多数弹窗/模态框 */
+    z-index: 2147483647 !important; /* 最大安全整数 */
     pointer-events: none;
-    left: calc(var(--mouse-x, 0) + 15px);
-    top: calc(var(--mouse-y, 0) + 15px);
+    left: calc(var(--mouse-x, 0px) + 15px);
+    top: calc(var(--mouse-y, 0px) + 15px);
     opacity: 0;
     visibility: hidden;
     transform: scale(0.55) translate3d(0, 4px, 0);
@@ -2147,9 +2153,11 @@ uni-content.collapsed {
     visibility: visible;
     transform: scale(1) translate3d(0, 0, 0);
   }
+
   .cursor-pointer1[data-tooltip]::after {
-    position: absolute;
-    left: 0;
-    top: 150%;
+    // position: absolute ;
+    // left: 0;
+    // top: 150%;
+    // z-index: 2147483647 !important;
   }
 }

+ 2 - 2
static/scss/global/vu.css

@@ -17306,8 +17306,8 @@ html[data-bs-theme=dark] .text-bg-light {
 }
 
 .btn:not(.dropdown-toggle) {
-  transform: scale(1.002);
-  transition: all 0.125s ease-in-out;
+  /* transform: scale(1.002);
+  transition: all 0.125s ease-in-out; */
 }
 
 .btn[class*=btn-]:active:not(.dropdown-toggle),