zhb hace 1 mes
padre
commit
0c836e23b7

+ 15 - 30
pages/customer/components/AccountCardDesktop.vue

@@ -5,9 +5,10 @@
             <cwg-icon name="chevron-right" :size="20" color="#6c8595"
                 :class="['chevron-icon', { expanded: isExpanded }]" />
         </button>
-
         <!-- 标签区域 -->
         <view class="labels-container">
+            <view class="account-number" @click="copy(account.accountNumber)"># {{ account.accountNumber }}</view>
+            <view class="account-number" @click="copy(account.fwq)">{{ account.fwq }}</view>
             <view class="labels">
                 <template v-for="(label, index) in account.labels" :key="index">
                     <view v-if="label" class="label-badge">
@@ -15,8 +16,6 @@
                     </view>
                 </template>
             </view>
-            <view class="account-number"># {{ account.accountNumber }}</view>
-            <view class="account-nickname">{{ nickName }}</view>
         </view>
 
         <!-- 主要内容区域(余额和操作按钮) -->
@@ -87,25 +86,6 @@
                     <cwg-label-line-value :label="t('Documentary.console.item3')" :value="account.platform" />
                 </view>
             </view>
-            <!-- 额外操作行(服务器、登录、更改密码,折叠时隐藏) -->
-            <view class="extra-actions">
-                <!-- 登录复制行 -->
-                <view class="copy-row">
-                    <span class="label">{{ account.platform }} 登陆</span>
-                    <span class="value">{{ account.login }}</span>
-                    <view class="copy-btn" @click="copy(account.login)">
-                        <cwg-icon name="copy" :size="16" color="#2e3a47" />
-                    </view>
-                </view>
-
-                <!-- 更改交易密码按钮 -->
-                <view class="change-password-btn" @click="handleAction('changePassword1')" v-if="!isDemo">
-                    <span class="btn-icon">
-                        <cwg-icon name="crm-xg" :size="16" color="#2e3a47" />
-                    </span>
-                    更改交易密码
-                </view>
-            </view>
         </view>
 
         <!-- 通知区域(预留) -->
@@ -175,14 +155,14 @@ const actionButtons = computed(() => [
     { 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')) }
 ])
 const fieldList = ref([
-    { label: 'Custom.PaymentHistory.AccountType', key: 'nickname', copyable: false },
-    { label: 'Label.Leverage', key: 'actualLeverage', copyable: false },
-    { label: 'Documentary.console.item5', key: 'floatingPL', copyable: false },
-    { label: 'Label.Balance', key: 'balanceWithSymbol', copyable: false },
-    { label: 'Label.Equity', key: 'equityWithSymbol', copyable: false },
-    { label: 'Label.Credit', key: 'creditWithSymbol', copyable: false },
-    { label: 'Documentary.console.item3', key: 'platform', copyable: false },
-    { label: 'Documentary.console.item4', key: 'login', copyable: true }
+    { label: t('Custom.PaymentHistory.AccountType'), key: 'nickname', copyable: false },
+    { label: t('Label.Leverage'), key: 'actualLeverage', copyable: false },
+    { label: t('Label.FloatingPL'), key: 'floatingPL', copyable: false },
+    { label: t('Label.Balance'), key: 'balanceWithSymbol', copyable: false },
+    { label: t('Label.Equity'), key: 'equityWithSymbol', copyable: false },
+    { label: t('Label.Credit'), key: 'creditWithSymbol', copyable: false },
+    { label: t('Documentary.console.item3'), key: 'platform', copyable: false },
+    { label: t('Documentary.console.item4'), key: 'login', copyable: true }
 ])
 const nickName = ref(accountInfo.value.nickName)
 
@@ -400,6 +380,11 @@ onBeforeUnmount(() => {
             font-size: px2rpx(18);
             font-weight: 600;
             line-height: 1.3;
+            cursor: pointer;
+            color: #2e3a47;
+            &:hover {
+                color: #1e2a3a;
+            }
         }
 
         .account-nickname {

+ 14 - 8
pages/customer/components/AccountCardMobile.vue

@@ -1,16 +1,13 @@
 <template>
     <view class="account-card">
-        <!-- 更多按钮 -->
-
-
         <!-- 标签区域 -->
         <view class="card-top">
             <view class="labels-container">
-                <view class="account-number">{{ account.accountNumber }}</view>
+                <view class="account-number" @click="copy(account.accountNumber)"># {{ account.accountNumber }}</view>
                 <view class="account-number" @click="copy(account.fwq)">{{ account.fwq }}</view>
                 <view class="labels">
                     <template v-for="(label, index) in account.labels" :key="index">
-                        <view v-if="label" class="label-badge">
+                        <view v-if="label" class="label-badge" :class="{ 'active': index === 0 && isDemo }">
                             {{ label }}
                         </view>
                     </template>
@@ -46,9 +43,6 @@
                 <text class="balance-number">{{ balanceInteger }}</text>
                 <text class="balance-decimal">{{ balanceDecimal }} {{ account.currency }}</text>
             </view>
-
-            <!-- 移动端圆形按钮组 -->
-
         </view>
         <view class="info-bottom">
             <!-- 底部信息区域(折叠时隐藏) -->
@@ -287,10 +281,22 @@ onBeforeUnmount(() => {
             font-weight: 500;
         }
 
+        .active {
+            background-color: rgba(70, 205, 124, 0.08);
+            color: rgb(14, 115, 55);
+            font-weight: 500;
+        }
+
         .account-number {
             font-size: px2rpx(18);
             font-weight: 600;
             line-height: 1.3;
+            cursor: pointer;
+            color: #2e3a47;
+
+            &:hover {
+                color: #1e2a3a;
+            }
         }
 
         .account-nickname {