Merge branch 'admin_dev' of http://112.213.107.185:3000/cwg-crm/gypsy-crm-frontend-vu into admin_dev

components/AddBankDialog.vue

@@ -521,7 +521,7 @@
       border-top: 1px solid #f3f4f6;
 
       .btn {
-        min-width: px2rpx(120);
+        min-width: px2rpx(90);
         padding: px2rpx(12) px2rpx(24);
         border-radius: px2rpx(6);
         font-size: px2rpx(14);

components/cwg-complex-search.vue

@@ -55,6 +55,7 @@
                         :placeholder="dateField.placeholder || (dateField.type === 'daterange' ? '选择日期范围' : '选择日期')"
                         @change="handleDateChange" />
                 </view>
+                <view v-else class="mobile-date-wrapper"></view>
                 <button class="filter-chip" @click="openFilterPopup">
                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none"
                         stroke="#141d22" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"

components/cwg-header.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="pages-header" v-if="showBack">
     <view class="header">
-      <view v-if="showBack" class="back">
+      <view v-if="showBackIcon" class="back">
         <cwg-icon name="dropdown" class="back-icon" color="#000" @click="handleBack" />
       </view>
       <view>{{ headerTitleReady ? headerTitle : '' }}</view>
@@ -32,6 +32,56 @@ const showBack = computed(() => {
 
   return !noBackPages.includes(route.path)
 })
+
+const showBackIcon = computed(() => {
+  // 不显示返回图标的页面
+  const noBackIconPages = [
+    '/',
+    '/pages/customer/index',
+    '/pages/customer/trade-history',
+    '/pages/customer/trade-position',
+    '/pages/customer/recording-history',
+    '/pages/customer/deposit-select',
+    '/pages/customer/withdrawal-select',
+    '/pages/customer/payment-history',
+    '/pages/customer/transfer',
+    '/pages/customer/wallet-transfer',
+    '/pages/customer/wallet-history',
+    '/pages/activities/index',
+    '/pages/analytics/analystViews',
+    '/pages/analytics/news',
+    '/pages/common/download',
+    '/pages/common/chat',
+    '/pages/mine/info',
+    '/pages/common/notice',
+    '/pages/ib/index',
+    '/pages/ib/customer',
+    '/pages/ib/subsList',
+    '/pages/ib/agentList',
+    '/pages/ib/accountList',
+    '/pages/ib/transfer',
+    '/pages/ib/withdraw-select',
+    '/pages/ib/agent-transfer',
+    '/pages/ib/recording',
+    '/pages/ib/report',
+    '/pages/ib/complexReport',
+    '/pages/follow/index',
+    '/pages/follow/trading-center',
+    '/pages/follow/report',
+    '/pages/follow/transfer',
+    '/pages/follow/transfer-history',
+    '/pages/follow/trading-management',
+    '/pages/follow/follow-list',
+    '/pages/follow/account-management',
+    '/pages/follow/subscribe-list',
+    '/pages/follow/record',
+    '/pages/wallet/index',
+    '/pages/mine/index',
+    '/pages/login/index'
+  ]
+
+  return !noBackIconPages.includes(route.path)
+})
 function slashToDash(str: string) {
   return str.replace(/\//g, '.');
 }

components/cwg-popup.vue

@@ -255,7 +255,6 @@ defineExpose({
     :deep(.cwg-dialog) {
         width: px2rpx(600) !important;
         max-height: 70vh;
-        overflow-y: scroll;
     }
 
     .dialog-content {

components/cwg-sidebar.vue

@@ -91,7 +91,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
+import { ref, computed, watch, onMounted,onUnmounted  } from 'vue'
 import useUserStore from '@/stores/use-user-store'
 import { useMenuSplit } from '@/composables/useMenuSplit'
 import { storeToRefs } from 'pinia'

composables/useMenuSplit.ts

@@ -259,16 +259,17 @@ export function useMenuSplit(handleClick1: (item: MenuItem) => void) {
                 { path: '/pages/ib/complexReport', label: 'Home.page_ib.item11', icon: 'icon-withdrawal' },
             ],
         },
-        {
-            isOpenMenu: false,
-            path: '/',
-            label: 'Home.page_ib.item12',
-            icon: 'crm-bulletin',
-            submenuHeight: 1 * ((40 + 8)) + 8,
-            children: [
-                { path: '/pages/ib/promotion', label: 'Home.page_ib.item13', icon: 'icon-withdrawal' },
-            ],
-        },
+      // 推广
+        // {
+        //     isOpenMenu: false,
+        //     path: '/',
+        //     label: 'Home.page_ib.item12',
+        //     icon: 'crm-bulletin',
+        //     submenuHeight: 1 * ((40 + 8)) + 8,
+        //     children: [
+        //         { path: '/pages/ib/promotion', label: 'Home.page_ib.item13', icon: 'icon-withdrawal' },
+        //     ],
+        // },
     ])
 
     const followBaseMenus = computed<MenuItem[]>(() => [

config/index.ts

@@ -17,10 +17,10 @@ const config = {
   Host00: ht + "//ucard." + ho + "." + dt,
   Host85: ht + "//ucard." + ho + "." + dt,
   Host04: ht + "//pay." + ho + "." + dt,
-  // Host80: 'http://192.168.0.21:8000',
-  // Host00: 'http://192.168.0.21:8000',
-  // Host85: 'http://192.168.0.21:8000',
-  // Host04: 'http://192.168.0.21:8004',
+  // Host80: 'http://192.168.0.25:8000',
+  // Host00: 'http://192.168.0.25:8000',
+  // Host85: 'http://192.168.0.25:8000',
+  // Host04: 'http://192.168.0.25:8004',
   Host90: ht + "//data." + ho + "." + dt,
   HostShop: ht + "//shopcustom." + ho + "." + dt,
   HostShopImg: ht + "//shopmanager." + ho + "." + dt,

pages/follow/index.vue

@@ -447,6 +447,7 @@
     display: flex;
     flex-wrap: wrap;
     align-items: stretch;
+    margin: 0 auto!important;
   }
 
   .uni-col-left {

pages/follow/trading-center.vue

@@ -8,7 +8,7 @@
       </view>
       <cwg-complex-search :fields="filterFields" v-model="searchParams" @search="handleSearch"
                           @reset="handleReset" />
-      <cwg-tabel ref="tableRef" :columns="currentColumns" :immediate="true" :queryParams="queryParams" :api="listApi"
+      <cwg-tabel ref="tableRef" :columns="currentColumns" :mobilePrimaryFields="mobilePrimaryFields" :immediate="true" :queryParams="queryParams" :api="listApi"
                  :show-operation="false" @sort-change="handleSortChange">
 
         <!-- TOP/推荐 -->
@@ -383,6 +383,17 @@
     { prop: 'recommendReason', label: t('Documentary.tradingCenter.item142'), align: 'center', width: 100 },
     { prop: 'subscribe', label: t('Documentary.tradingCenter.item24'), slot: 'subscribe', align: 'center', width: 100 },
   ])
+  const mobilePrimaryFields = computed(() => [
+    { prop: 'nickname', label: t('Documentary.tradingCenter.item1'), align: 'center' },
+    { prop: 'maskLogin', label: t('newLoop.item11'), align: 'center' },
+    { prop: 'groupType', label: t('Label.AccountType'), slot: 'groupType', align: 'center' },
+    {
+      prop: 'more',
+      type: 'more',
+      width: 20,
+      align: 'right',
+    },
+  ])
 
   const getAccountTypeText = (type: number) => {
     const accountTypeMap: Record<number, string> = {
@@ -457,13 +468,13 @@
     uni.showLoading({ title: t('State.InTheProcessing') })
     try {
       let res = await documentaryApi.followDealSubscribeInfo({ dealId: row.dealId })
-      if (res.code === 200 || res.code === 0 || res.code === 10000) {
+      if (res.code === 200) {
         dialogFllowData1.value = row
         dialogFllowData.value.protect = 0
         dialogFllowLoginData.value = res.data || []
         dialogFllow.value = true
       } else {
-        uni.showToast({ title: res.msg || 'Error', icon: 'none' })
+        uni.showToast({ title: res.msg, icon: 'none' })
       }
     } finally {
       uni.hideLoading()
@@ -520,12 +531,12 @@
       }
 
       let res = await documentaryApi.followDealSubscriSubscribe(payload)
-      if (res.code === 200 || res.code === 0 || res.code === 10000) {
+      if (res.code === 200) {
         uni.showToast({ title: t('Msg.Success'), icon: 'success' })
         applyFllowCancel()
       } else {
-        const msg = res.msg === 'EMPTY_POSITION_BEFORE_SUBSCRIBE' ? t('Documentary.tradingCenter.item134') : res.msg
-        uni.showToast({ title: msg || 'Error', icon: 'none' })
+        const msg = res.msg == 'EMPTY_POSITION_BEFORE_SUBSCRIBE' ? t('Documentary.tradingCenter.item134') : res.msg
+        uni.showToast({ title: msg , icon: 'none' })
       }
     } finally {
       submitting = false

pages/ib/index.vue

@@ -998,6 +998,7 @@
     display: flex;
     flex-wrap: wrap;
     align-items: stretch;
+    margin: 0 auto!important;
   }
 
   .uni-col-left {

pages/mine/components/AddFileDialog.vue

@@ -212,7 +212,7 @@ defineExpose({
         border-top: 1px solid #f3f4f6;
 
         .btn {
-            min-width: px2rpx(120);
+            min-width: px2rpx(90);
             padding: px2rpx(12) px2rpx(24);
             border-radius: px2rpx(6);
             font-size: px2rpx(14);