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

pages/ib/accountList.vue

@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
   // 账户管理
-  import { ref, nextTick } from 'vue'
+  import { ref,reactive, nextTick } from 'vue'
   import { useI18n } from 'vue-i18n'
   import { ibApi } from '@/service/ib'
   import { useFilters } from '@/composables/useFilters'
@@ -40,7 +40,7 @@
   const { t } = useI18n()
 
   const searchParams = ref({})
-  const search = ref({
+  const search = reactive({
     cId: '',
     login: '',
     platform: 'MT4',
@@ -64,17 +64,14 @@
 
   const handleSearch = (params: any) => {
     const payload = { ...params }
-    search.value = payload
+    Object.assign(search, payload)
     nextTick(() => {
       tableRef.value?.refreshTable?.()
     })
   }
 
   const handleReset = (params: any) => {
-    search.value = {
-      ...params,
-      platform: 'MT4',
-    }
+    Object.assign(search, params,{platform: 'MT4'})
     nextTick(() => {
       tableRef.value?.refreshTable?.()
     })

pages/ib/recording.vue

@@ -112,9 +112,11 @@
   const searchParams = ref({
     types: 1,
     date: defaultDateRange,
+    startDate: defaultDateRange[0],
+    endDate: defaultDateRange[1],
   })
 
-  const search = ref({
+  const search = reactive({
     types: 1,
     startDate: defaultDateRange[0],
     endDate: defaultDateRange[1],
@@ -143,7 +145,7 @@
 
   const handleSearch = (params: any) => {
     const payload = { ...params }
-    search.value = payload
+    Object.assign(search, payload)
     nextTick(() => {
       tableRef.value?.refreshTable?.()
     })
@@ -154,10 +156,7 @@
       ...params,
       types: 1,
     }
-    search.value = {
-      ...params,
-      types: 1,
-    }
+    Object.assign(search, params,{ types: 1,})
     nextTick(() => {
       tableRef.value?.refreshTable?.()
     })
@@ -168,12 +167,12 @@
   })
   // 表格列配置 根据types 切换
   const columns = computed(() => {
-    return columnList.value[search.value.types]
+    return columnList.value[search.types]
   })
 
   const mobilePrimaryFields = computed(() => {
     return [
-      ...mobileList.value[search.value.types],
+      ...mobileList.value[search.types],
       {
         prop: 'more',
         type: 'more',
@@ -186,7 +185,7 @@
   // 接口 根据types 切换
   const listApi = computed(() => {
     let other = {}
-    switch (search.value.types) {
+    switch (search.types) {
       case 1:
         other = {
           mamType: 0,
@@ -205,7 +204,7 @@
         break
     }
 
-    return (params) => ibApi[apiList.value[search.value.types]]({ ...params, ...other })
+    return (params) => ibApi[apiList.value[search.types]]({ ...params, ...other })
   })
 
   const cancel = async (id) => {

pages/ib/subsList.vue

@@ -13,8 +13,7 @@
             </button>
           </view>
           <view class="search-bar">
-            <cwg-complex-search :fields="filterFields" v-model="searchParams" @search="handleSearch"
-                                @reset="handleReset" />
+            <cwg-complex-search :fields="filterFields" v-model="searchParams" @search="handleSearch" @reset="handleReset" />
           </view>
         </view>
       </cwg-match-media>
@@ -89,13 +88,10 @@
   const { t, locale } = useI18n()
   const { Code } = Config
   const searchParams = ref({})
-  const search = ref({
+  const search = reactive({
     ibNo: '',
     name: '',
     cId: '',
-    data: '',
-    startDate: '',
-    endDate: '',
   })
 
   const filterFields = [
@@ -212,19 +208,17 @@
 
   const handleSearch = (params: any) => {
     // 拦截处理 daterange，将 date 拆分为 startDate 和 endDate
+    console.log(params)
     const payload = { ...params }
+    Object.assign(search, payload)
 
-
-    search.value = payload
     nextTick(() => {
       tableRef.value.refreshTable()
     })
   }
 
   const handleReset = (params: any) => {
-    search.value = {
-      ...params,
-    }
+    Object.assign(search, params)
     nextTick(() => {
       tableRef.value.refreshTable()
     })

pages/mine/components/BankItem.vue

@@ -433,7 +433,6 @@ onMounted(() => {
 
 :deep(.uni-row1) {
     .uni-col {
-        padding: 0 10px !important;
     }
 
     .uni-forms-item {

pages/mine/components/SecurityCenterTab.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="user-form crm-form">
-        <uni-row class="demo-uni-row uni-row1">
-            <uni-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+        <uni-row class="demo-uni-row uni-row1" :gutter="20">
+            <uni-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" class="card bg-body">
                 <view class="content-title">
                     <view v-t="'PersonalManagement.Title.CustomerZonePasswordChange'"></view>
                 </view>
@@ -40,7 +40,7 @@
                     </uni-row>
                 </uni-forms>
             </uni-col>
-            <uni-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+            <uni-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" class="card bg-body">
                 <view class="content-title">
                     <view v-t="'PersonalManagement.Title.EmailChange'"></view>
                 </view>
@@ -226,9 +226,9 @@ onMounted(() => {
 
 
 <style scoped lang="scss">
+  @import "@/uni.scss";
 :deep(.uni-row1) {
     .uni-col {
-        padding: 0 10px !important;
     }
 
     .uni-forms-item {
@@ -288,7 +288,7 @@ onMounted(() => {
     }
 
     .btn-code {
-        margin-bottom: px2rpx(18);
+        margin-bottom: px2rpx(12);
         width: auto;
         padding: px2rpx(10) px2rpx(16);
     }

static/scss/global/global.scss

@@ -1372,7 +1372,7 @@ uni-content.collapsed {
     box-sizing: border-box;
 
     .uni-col {
-        padding: 0 px2rpx(10) !important;
+        //padding: 0 px2rpx(10) !important;
         box-sizing: border-box;
     }