Ver código fonte

feat: 优化

ljc 1 mês atrás
pai
commit
bed192ae86

+ 0 - 2
components/cwg-dropdown.vue

@@ -60,14 +60,12 @@ const emit = defineEmits(['open', 'close', 'change', 'menuClick'])
 
 // 判断菜单项是否为选中状态
 const isActive = (item) => {
-  console.log(item)
     if (!props.showActive || !props.activeKey) return false
     // 支持多种 key 字段匹配
     const itemKey = item.key !== undefined ? item.key : 
                      item.value !== undefined ? item.value : 
                      item.sysCode !== undefined ? item.sysCode :
                      item.type !== undefined ? item.type : ''
-  console.log(itemKey,props.activeKey,'key')
     return itemKey === props.activeKey
 }
 

+ 2 - 2
components/cwg-system.vue

@@ -165,8 +165,8 @@ const isInit = ref(false)
 onMounted(() => {
   if (isInit.value) return
   isInit.value = true
-
-  getSystemList()
+  console.log('注册')
+  // getSystemList()
 
   uni.$on('updateSystemList', () => {
     getSystemList(true)

+ 1 - 0
components/cwg-tabel.vue

@@ -56,6 +56,7 @@
                                 {{ formatCellValue(row[column.prop], column, row) }}
                             </template>
                         </uni-td>
+
                     </uni-tr>
                     <!-- 桌面端展开行(仅当非移动端且行展开时显示) -->
                     <uni-tr v-if="!isMobile && expandedRows[rowIndex]" class="expand-row">

+ 5 - 4
pages/ib/index.vue

@@ -3,7 +3,7 @@
     <cwg-header :title="t('Home.page_ib.item1')" :showBack="false" />
     <uni-loading v-if="loading" />
     <uni-row v-else class="demo-uni-row uni-row1" :gutter="20">
-      <uni-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" class="uni-col-left">
+      <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="uni-col-left">
         <view class="dashboard-container">
           <!-- 余额卡片 -->
           <view class="card balance-card">
@@ -103,7 +103,7 @@
                     </view>-->
         </view>
       </uni-col>
-      <uni-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16" class="uni-col-right">
+      <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="uni-col-right">
         <view class="dashboard-container">
           <view class="card mam-card">
             <view class="card-header">
@@ -1015,7 +1015,7 @@
     min-height: 10vh;
     box-sizing: border-box;
     display: flex;
-    flex-direction: column;
+    //flex-direction: column;
     height: 100%;
   }
 
@@ -1029,9 +1029,10 @@
   .card {
     background: var(--color-white);
     color: #333;
+    flex: 1;
     padding: px2rpx(12) px2rpx(16);
     border-radius: 4px;
-    margin-bottom: px2rpx(20);
+    margin: 0 px2rpx(10) px2rpx(20);
     box-shadow: 0 px2rpx(4) px2rpx(12) rgba(0, 0, 0, 0.2);
   }
 

+ 2 - 2
service/ib.ts

@@ -95,8 +95,8 @@ export const ibApi = {
   tradeAccount: (params = {}) => post('/trade/account', params, 'Host90'),
   /** 代理佣金收入 */
   tradeAgentCommission: (params = {}, isVietnam = false) => {
-    let url = '/trade/agent/commission';
-    if (isVietnam) url += '/vn';
+    let url = '/trade/agent/commission/vn';
+    // if (isVietnam) url += '/vn';
     return post(url, params, 'Host90');
   },
   /** 新增代理 */