feat: 佣金

config/index.ts

@@ -18,11 +18,12 @@ 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',
-  Host90: ht + "//data." + ho + "." + dt,
+  // Host90: ht + "//data." + ho + "." + dt,
+  // Host80: 'http://192.168.0.24:8000',
+  // Host00: 'http://192.168.0.24:8000',
+  // Host85: 'http://192.168.0.24:8000',
+  // Host04: 'http://192.168.0.24:8004',
+  Host90: 'http://192.168.0.24:9000',
   HostShop: ht + "//shopcustom." + ho + "." + dt,
   HostShopImg: ht + "//shopmanager." + ho + "." + dt,
   Host87: ht + "//followup." + ho + "." + dt,

pages/ib/const/report.ts

@@ -67,21 +67,21 @@ export const useReportConst = () => {
   '2': [
     { prop: 'ibNo', label: t('Label.AttributionNumber') },
     { prop: 'login', label: t('Label.TradingAccount') },
-    {
-      prop: 'groupType', label: t('Label.Type'),
-      type: 'tag',
-      tagMap: {
-        1: t('AccountType.ClassicAccount'),
-        2: t('AccountType.SeniorAccount'),
-        3: !isAfterJuly28() ? t('AccountType.AgencyAccount') : '',
-        4: t('AccountType.ProfessionalAccount'),
-        5: t('AccountType.SpeedAccount'),
-        6: t('AccountType.SpeedAccount'),
-        7: t('AccountType.StandardAccount'),
-        8: t('AccountType.CentAccount'),
-      },
-    },
-    { prop: 'symbol', label: t('Label.Varieties') },
+    // {
+    //   prop: 'groupType', label: t('Label.Type'),
+    //   type: 'tag',
+    //   tagMap: {
+    //     1: t('AccountType.ClassicAccount'),
+    //     2: t('AccountType.SeniorAccount'),
+    //     3: !isAfterJuly28() ? t('AccountType.AgencyAccount') : '',
+    //     4: t('AccountType.ProfessionalAccount'),
+    //     5: t('AccountType.SpeedAccount'),
+    //     6: t('AccountType.SpeedAccount'),
+    //     7: t('AccountType.StandardAccount'),
+    //     8: t('AccountType.CentAccount'),
+    //   },
+    // },
+    // { prop: 'symbol', label: t('Label.Varieties') },
     {
       prop: 'volume', label: t('Label.Volume'),
       formatter: ({ row }) => {
@@ -94,25 +94,25 @@ export const useReportConst = () => {
         return `${groupCurrency1(row.currency)}${numberFormat(row.rebateAmount ?? '0')}`
       },
     },
-    {
-      prop: 'rebatePoint', label: t('Label.rebatePoint'),
-      formatter: ({ row }) => {
-        return `${groupCurrency1(row.currency)}${numberFormat(row.rebatePoint ?? '0')}/${t('Label.Lot')}`
-      },
-    },
+    // {
+    //   prop: 'rebatePoint', label: t('Label.rebatePoint'),
+    //   formatter: ({ row }) => {
+    //     return `${groupCurrency1(row.currency)}${numberFormat(row.rebatePoint ?? '0')}/${t('Label.Lot')}`
+    //   },
+    // },
     {
       prop: 'commissionAmount', label: t('Label.commissionAmount'),
       formatter: ({ row }) => {
         return `${groupCurrency1(row.currency)}${numberFormat(row.commissionAmount ?? '0')}`
       },
     },
-    {
-      prop: 'commissionPoint', label: t('Label.commissionPoint'),
-      formatter: ({ row }) => {
-        return `${groupCurrency1(row.currency)}${numberFormat(row.commissionPoint ?? '0')}/${t('Label.Lot')}`
-      },
-    },
-    { prop: 'openTime', label: t('Label.OpenTime') },
+    // {
+    //   prop: 'commissionPoint', label: t('Label.commissionPoint'),
+    //   formatter: ({ row }) => {
+    //     return `${groupCurrency1(row.currency)}${numberFormat(row.commissionPoint ?? '0')}/${t('Label.Lot')}`
+    //   },
+    // },
+    // { prop: 'openTime', label: t('Label.OpenTime') },
     { prop: 'closeTime', label: t('Label.CloseTime') },
   ],
   '3_1': [

pages/ib/report.vue

@@ -1,18 +1,18 @@
 <template>
   <cwg-page-wrapper class="create-page" :isHeaderFixed="true">
     <cwg-header :title="titleList[reportType]" />
-    <uni-loading v-if="loading"/>
+    <uni-loading v-if="loading" />
     <view v-else class="account-content">
       <view class="search-content">
         <view class="search-bar">
           <cwg-complex-search :fields="filterFields" v-model="searchParams" @search="handleSearch"
-            @reset="handleReset" />
+                              @reset="handleReset" />
         </view>
       </view>
 
       <cwg-tabel ref="tableRef" :columns="columns" :mobilePrimaryFields="mobilePrimaryFields" :queryParams="search"
-        :api="listApi" :show-operation="false" :showPagination="true" :showSummary="true" :immediate="false"
-        :summaryMethod="getSummaries">
+                 :api="listApi" :show-operation="false" :showPagination="true" :showSummary="true" :immediate="false"
+                 :summaryMethod="getSummaries">
       </cwg-tabel>
     </view>
   </cwg-page-wrapper>
@@ -30,13 +30,13 @@
   import { isAfterJuly28 } from '@/utils/dateUtils'
   import useUserStore from '@/stores/use-user-store'
 
-const { numberFormat } = useFilters()
-const { t } = useI18n()
-const { columnList, mobileList, platformOptions, customTypeList, groupCurrency1, groupTypeName } = useReportConst()
-let { Code } = Config
-const { userInfo } = useUserStore()
-const tableRef = ref(null)
-const loading = ref(false)
+  const { numberFormat } = useFilters()
+  const { t } = useI18n()
+  const { columnList, mobileList, platformOptions, customTypeList, groupCurrency1, groupTypeName } = useReportConst()
+  let { Code } = Config
+  const { userInfo } = useUserStore()
+  const tableRef = ref(null)
+  const loading = ref(false)
 
   const typeList = computed(() => [
     { text: t('Ib.Report.Title1'), value: 1 },
@@ -59,24 +59,24 @@ const loading = ref(false)
     }
   })
 
-const detailTypeList = computed(() => [
-  { text: t('Ib.Report.Tit1'), value: 1 },
-  { text: t('Ib.Report.Tit2'), value: 2 },
-  { text: t('Ib.Report.Tit3'), value: 3 },
-  { text: t('Ib.Report.Tit4'), value: 4 },
-])
-
-const isShortList = computed(() => [
-  { text: t('State.All'), value: 0 },
-  { text: t('Ib.Report.item1'), value: 1 },
-  { text: t('Ib.Report.item2'), value: 2 },
-])
-
-const now = new Date()
-const year = now.getFullYear()
-const month = String(now.getMonth() + 1).padStart(2, '0')
-const day = String(now.getDate()).padStart(2, '0')
-const defaultDateRange = [`${year}-${month}-01`, `${year}-${month}-${day}`]
+  const detailTypeList = computed(() => [
+    { text: t('Ib.Report.Tit1'), value: 1 },
+    { text: t('Ib.Report.Tit2'), value: 2 },
+    { text: t('Ib.Report.Tit3'), value: 3 },
+    { text: t('Ib.Report.Tit4'), value: 4 },
+  ])
+
+  const isShortList = computed(() => [
+    { text: t('State.All'), value: 0 },
+    { text: t('Ib.Report.item1'), value: 1 },
+    { text: t('Ib.Report.item2'), value: 2 },
+  ])
+
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = String(now.getMonth() + 1).padStart(2, '0')
+  const day = String(now.getDate()).padStart(2, '0')
+  const defaultDateRange = [`${year}-${month}-01`, `${year}-${month}-${day}`]
 
   const reportType = ref(1)
 
@@ -91,7 +91,7 @@ const defaultDateRange = [`${year}-${month}-01`, `${year}-${month}-${day}`]
     date: defaultDateRange,
   })
 
-const filterFields = ref([])
+  const filterFields = ref([])
 
   const search = reactive({
     detail_type: 1,
@@ -106,234 +106,234 @@ const filterFields = ref([])
     isShort: 0,
   })
 
-const country = computed(() => {
-  return userInfo.customInfo.country
-})
-
-const agentLevels = ref<Array<{ key: string, options: any[] }>>([
-  {
-    key: 'agentId_0',
-    options: [
-      { value: 0, text: t('news_add_field.IbReport.ALL') },
-      { value: -1, text: t('news_add_field.IbReport.DirectlyUnder') },
-    ],
-  },
-])
-
-const handleAgentChange = async (val: any, levelIndex: number) => {
-  console.log(val, 'change1')
-  
-  // 截断当前层级之后的所有层级
-  agentLevels.value.splice(levelIndex + 1)
-
-  // 清理 searchParams 中被移除层级的值
-  const params = { ...searchParams.value }
-  for (let key in params) {
-    if (key.startsWith('agentId_')) {
-      const idx = parseInt(key.split('_')[1])
-      if (idx > levelIndex) {
-        delete params[key]
-      }
-    }
-  }
-  
-  // 更新当前选中的代理ID
-  params[`agentId_${levelIndex}`] = val
-  
-  // 同步更新 searchParams
-  searchParams.value = { ...params }
-  
-  // 确保更新完成后再执行搜索
-  await nextTick()
-  handleSearch(searchParams.value)
-  
-  if (val === 0 || val === -1 || val === '') {
-    return
-  }
+  const country = computed(() => {
+    return userInfo.customInfo.country
+  })
 
-  try {
-    const res = await ibApi.ibTree({ pid: val })
-    if (res.code === Code.StatusOK && res.data && res.data.length > 0) {
-      const nextOptions = []
-      res.data.forEach((item: any) => {
-        if (item.ibNo) {
-          nextOptions.push({
-            value: item.id,
-            text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
-          })
+  const agentLevels = ref<Array<{ key: string, options: any[] }>>([
+    {
+      key: 'agentId_0',
+      options: [
+        { value: 0, text: t('news_add_field.IbReport.ALL') },
+        { value: -1, text: t('news_add_field.IbReport.DirectlyUnder') },
+      ],
+    },
+  ])
+
+  const handleAgentChange = async (val: any, levelIndex: number) => {
+    console.log(val, 'change1')
+
+    // 截断当前层级之后的所有层级
+    agentLevels.value.splice(levelIndex + 1)
+
+    // 清理 searchParams 中被移除层级的值
+    const params = { ...searchParams.value }
+    for (let key in params) {
+      if (key.startsWith('agentId_')) {
+        const idx = parseInt(key.split('_')[1])
+        if (idx > levelIndex) {
+          delete params[key]
         }
-      })
-      if (nextOptions.length > 0) {
-        agentLevels.value.push({
-          key: `agentId_${levelIndex + 1}`,
-          options: nextOptions,
-        })
       }
     }
-    setFields()
 
-  } catch (error) {
-    uni.showToast({ title: 'Error', icon: 'none' })
-  }
-}
+    // 更新当前选中的代理ID
+    params[`agentId_${levelIndex}`] = val
 
-const getSummaries = (param: any) => {
-  const { columns, summaryData } = param
-  const sums: string[] = []
-  if (!summaryData || Object.keys(summaryData).length === 0) return sums
+    // 同步更新 searchParams
+    searchParams.value = { ...params }
 
-  columns.forEach((column: any, index: number) => {
-    if (index === 0) {
-      sums[index] = t('Label.Total')
+    // 确保更新完成后再执行搜索
+    await nextTick()
+    handleSearch(searchParams.value)
+
+    if (val === 0 || val === -1 || val === '') {
       return
     }
 
-    const type = reportType.value
-    const detailType = search.detail_type
+    try {
+      const res = await ibApi.ibTree({ pid: val })
+      if (res.code === Code.StatusOK && res.data && res.data.length > 0) {
+        const nextOptions = []
+        res.data.forEach((item: any) => {
+          if (item.ibNo) {
+            nextOptions.push({
+              value: item.id,
+              text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
+            })
+          }
+        })
+        if (nextOptions.length > 0) {
+          agentLevels.value.push({
+            key: `agentId_${levelIndex + 1}`,
+            options: nextOptions,
+          })
+        }
+      }
+      setFields()
 
-    // 根据不同的列 prop 进行合计数据显示和格式化
-    const prop = column.prop
-    if (!prop) {
-      sums[index] = ''
-      return
+    } catch (error) {
+      uni.showToast({ title: 'Error', icon: 'none' })
     }
+  }
 
-    if (type == 1) {
-      if (['deposit', 'withdrawal', 'credit'].includes(prop)) {
-        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-      } else {
-        sums[index] = ''
+  const getSummaries = (param: any) => {
+    const { columns, summaryData } = param
+    const sums: string[] = []
+    if (!summaryData || Object.keys(summaryData).length === 0) return sums
+
+    columns.forEach((column: any, index: number) => {
+      if (index === 0) {
+        sums[index] = t('Label.Total')
+        return
       }
-    } else if (type == 2) {
-      if (['volume', 'rebateAmount', 'commissionAmount'].includes(prop)) {
-        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-      } else {
+
+      const type = reportType.value
+      const detailType = search.detail_type
+
+      // 根据不同的列 prop 进行合计数据显示和格式化
+      const prop = column.prop
+      if (!prop) {
         sums[index] = ''
+        return
       }
-    } else if (type == 3) {
-      if (detailType == 4) {
-        if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
+
+      if (type == 1) {
+        if (['deposit', 'withdrawal', 'credit'].includes(prop)) {
           sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
         } else {
           sums[index] = ''
         }
-      } else {
-        if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
+      } else if (type == 2) {
+        if (['volume', 'rebateAmount', 'commissionAmount'].includes(prop)) {
           sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
         } else {
           sums[index] = ''
         }
-      }
-    } else if (type == 4) {
-      if (['credit', 'balance', 'equity', 'floating'].includes(prop)) {
-        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-      } else {
-        sums[index] = ''
-      }
-    } else if (type == 6) {
-      if (prop === 'amount') {
-        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-      } else {
-        sums[index] = ''
-      }
-    } else if (type == 7) {
-      if (['fxVolume', 'cfdVolume', 'indexVolume', 'metalVolume'].includes(prop)) {
-        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
-      } else {
-        sums[index] = ''
-      }
-    } else if (type == 24) {
-      if (prop === 'volume') {
-        sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) + ' /手' : '0'
-      } else if (prop === 'rebate') {
-        sums[index] = summaryData[prop] ? '$' + numberFormat(summaryData[prop]) : '0'
+      } else if (type == 3) {
+        if (detailType == 4) {
+          if (['volume', 'storage', 'taxes', 'profit'].includes(prop)) {
+            sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+          } else {
+            sums[index] = ''
+          }
+        } else {
+          if (['commission', 'volume', 'storage', 'taxes', 'profit', 'totalProfit'].includes(prop)) {
+            sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+          } else {
+            sums[index] = ''
+          }
+        }
+      } else if (type == 4) {
+        if (['credit', 'balance', 'equity', 'floating'].includes(prop)) {
+          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+        } else {
+          sums[index] = ''
+        }
+      } else if (type == 6) {
+        if (prop === 'amount') {
+          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+        } else {
+          sums[index] = ''
+        }
+      } else if (type == 7) {
+        if (['fxVolume', 'cfdVolume', 'indexVolume', 'metalVolume'].includes(prop)) {
+          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) : '0'
+        } else {
+          sums[index] = ''
+        }
+      } else if (type == 24) {
+        if (prop === 'volume') {
+          sums[index] = summaryData[prop] ? numberFormat(summaryData[prop]) + ' /手' : '0'
+        } else if (prop === 'rebate') {
+          sums[index] = summaryData[prop] ? '$' + numberFormat(summaryData[prop]) : '0'
+        } else {
+          sums[index] = ''
+        }
       } else {
         sums[index] = ''
       }
-    } else {
-      sums[index] = ''
-    }
-  })
+    })
 
-  return sums
-}
+    return sums
+  }
 
   const handleSearch = (params: any) => {
-    console.log(params,'params')
+    console.log(params, 'params')
     // 默认类型为页面参数
-    const payload: any = { ...params,reportType: reportType.value }
-
-  let finalAgentId = payload.agentId_0
-  for (let i = agentLevels.value.length - 1; i >= 0; i--) {
-    const val = payload[`agentId_${i}`]
-    if (val !== undefined && val !== '') {
-      finalAgentId = val
-      break
+    const payload: any = { ...params, reportType: reportType.value }
+
+    let finalAgentId = payload.agentId_0
+    for (let i = agentLevels.value.length - 1; i >= 0; i--) {
+      const val = payload[`agentId_${i}`]
+      if (val !== undefined && val !== '') {
+        finalAgentId = val
+        break
+      }
+    }
+    console.log(finalAgentId, 'finalAgentId')
+    payload.agentId = finalAgentId
+    if (payload.date?.length) {
+      payload.startDate = payload.date[0]
+      payload.endDate = payload.date[1]
     }
-  }
-    console.log(finalAgentId,'finalAgentId')
-  payload.agentId = finalAgentId
-  if (payload.date?.length) {
-    payload.startDate = payload.date[0]
-    payload.endDate = payload.date[1]
-  }
 
-  const type = Number(payload.reportType)
-  if (![1, 3, 4, 7, 24].includes(type)) payload.platform = ''
-  if (![1, 2, 3, 4, 7].includes(type)) payload.login = ''
-  if (type !== 7) payload.cId = ''
-  if (![3, 7].includes(type)) payload.isShort = 0
-  if (type !== 3) payload.detail_type = null
-  if (type !== 24) payload.customType = 0
+    const type = Number(payload.reportType)
+    if (![1, 3, 4, 7, 24].includes(type)) payload.platform = ''
+    if (![1, 2, 3, 4, 7].includes(type)) payload.login = ''
+    if (type !== 7) payload.cId = ''
+    if (![3, 7].includes(type)) payload.isShort = 0
+    if (type !== 3) payload.detail_type = null
+    if (type !== 24) payload.customType = 0
 
     Object.assign(search, payload)
-  // search.reportType = payload.reportType
-  // search.detail_type = payload.detail_type
-  // search.customType = payload.customType
-  // search.platform = payload.platform
-  // search.startDate = payload.startDate
-  // search.endDate = payload.endDate
-  // search.date = payload.date
-  // search.agentId = payload.agentId
-  // search.login = payload.login
-  // search.cId = payload.cId
-  // search.isShort = payload.isShort
-  nextTick(() => {
-    tableRef.value?.refreshTable?.()
-  })
-}
-
-const handleReset = (emptyParams: any) => {
-  // 重置时清理级联菜单到只有第一层
-  agentLevels.value.splice(1)
-  handleSearch(emptyParams)
-}
-
-const initIbTree = async () => {
-  const res = await ibApi.ibTree({ pid: 0 })
-
-  if (res.code === Code.StatusOK) {
-    if (res.data && res.data.length > 0) {
-      res.data.forEach((item: any) => {
-        if (item.ibNo) {
-          let option = {
-            value: item.id,
-            text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
+    // search.reportType = payload.reportType
+    // search.detail_type = payload.detail_type
+    // search.customType = payload.customType
+    // search.platform = payload.platform
+    // search.startDate = payload.startDate
+    // search.endDate = payload.endDate
+    // search.date = payload.date
+    // search.agentId = payload.agentId
+    // search.login = payload.login
+    // search.cId = payload.cId
+    // search.isShort = payload.isShort
+    nextTick(() => {
+      tableRef.value?.refreshTable?.()
+    })
+  }
+
+  const handleReset = (emptyParams: any) => {
+    // 重置时清理级联菜单到只有第一层
+    agentLevels.value.splice(1)
+    handleSearch(emptyParams)
+  }
+
+  const initIbTree = async () => {
+    const res = await ibApi.ibTree({ pid: 0 })
+
+    if (res.code === Code.StatusOK) {
+      if (res.data && res.data.length > 0) {
+        res.data.forEach((item: any) => {
+          if (item.ibNo) {
+            let option = {
+              value: item.id,
+              text: item.name ? `${item.ibNo} - ${item.name}` : item.ibNo,
+            }
+            agentLevels.value[0].options.push(option)
           }
-          agentLevels.value[0].options.push(option)
-        }
-      })
-    } else {
-      uni.showToast({
-        title: res.msg, icon: 'none',
-      })
+        })
+      } else {
+        uni.showToast({
+          title: res.msg, icon: 'none',
+        })
+      }
     }
   }
-}
 
   // 表格列配置 根据types 切换
   const columns = computed(() => {
-    console.log(reportType.value,'23')
+    console.log(reportType.value, '23')
 
     if (reportType.value == 3) {
       console.log(columnList.value[`3_${search.detail_type}`])
@@ -369,71 +369,71 @@ const initIbTree = async () => {
       const type = reportType.value
       const detailType = search.detail_type
 
-    if (type == 1) apiFn = ibApi.tradeDw
-    else if (type == 2) apiFn = ibApi.tradeAgentCommission
-    else if (type == 3) {
-      if (detailType == 1) apiFn = ibApi.tradeHistory
-      else if (detailType == 2) apiFn = ibApi.tradePendingHistory
-      else if (detailType == 3) apiFn = ibApi.tradePending
-      else if (detailType == 4) apiFn = ibApi.tradePosition
-    } else if (type == 4) apiFn = ibApi.tradeAccount
-    else if (type == 5) apiFn = ibApi.tradeIb
-    else if (type == 6) apiFn = ibApi.ibReportBalance
-    else if (type == 7) apiFn = ibApi.tradeSymbolCategory
-    else if (type == 24) apiFn = ibApi.tradeSalesHidden
-    if (apiFn) {
-      if (type == 2) {
-        const isVietnam = country.value === 'VN' // 这里需要你实际的取国家逻辑
-        return await apiFn(params, isVietnam)
+      if (type == 1) apiFn = ibApi.tradeDw
+      else if (type == 2) apiFn = ibApi.tradeAgentCommission
+      else if (type == 3) {
+        if (detailType == 1) apiFn = ibApi.tradeHistory
+        else if (detailType == 2) apiFn = ibApi.tradePendingHistory
+        else if (detailType == 3) apiFn = ibApi.tradePending
+        else if (detailType == 4) apiFn = ibApi.tradePosition
+      } else if (type == 4) apiFn = ibApi.tradeAccount
+      else if (type == 5) apiFn = ibApi.tradeIb
+      else if (type == 6) apiFn = ibApi.ibReportBalance
+      else if (type == 7) apiFn = ibApi.tradeSymbolCategory
+      else if (type == 24) apiFn = ibApi.tradeSalesHidden
+      if (apiFn) {
+        if (type == 2) {
+          const isVietnam = country.value === 'VN' // 这里需要你实际的取国家逻辑
+          return await apiFn(params, isVietnam)
+        }
+        return await apiFn(params)
       }
-      return await apiFn(params)
     }
-  }
-})
-
-watch(() => searchParams.value.reportType, (val) => {
-  const type = Number(val)
-  search.reportType = type
-  if (type === 24) {
-    searchParams.value.customType = 0
-    searchParams.value.detail_type = null
-    search.customType = 0
-    search.detail_type = null
-  } else if (type === 3) {
-    if (searchParams.value.detail_type == null) searchParams.value.detail_type = 1
-    if (search.detail_type == null) search.detail_type = 1
-  } else {
-    searchParams.value.detail_type = null
-    search.detail_type = null
-    searchParams.value.customType = 0
-    search.customType = 0
-  }
-}, { immediate: true })
+  })
 
-watch(() => searchParams.value.detail_type, (val) => {
-  search.detail_type = val == null ? null : Number(val)
-})
+  watch(() => searchParams.value.reportType, (val) => {
+    const type = Number(val)
+    search.reportType = type
+    if (type === 24) {
+      searchParams.value.customType = 0
+      searchParams.value.detail_type = null
+      search.customType = 0
+      search.detail_type = null
+    } else if (type === 3) {
+      if (searchParams.value.detail_type == null) searchParams.value.detail_type = 1
+      if (search.detail_type == null) search.detail_type = 1
+    } else {
+      searchParams.value.detail_type = null
+      search.detail_type = null
+      searchParams.value.customType = 0
+      search.customType = 0
+    }
+  }, { immediate: true })
+
+  watch(() => searchParams.value.detail_type, (val) => {
+    search.detail_type = val == null ? null : Number(val)
+  })
 
-watch(() => searchParams.value.platform, (val) => {
-  search.platform = val
-})
+  watch(() => searchParams.value.platform, (val) => {
+    search.platform = val
+  })
 
-watch(() => searchParams.value.customType, (val) => {
-  search.customType = val
-})
+  watch(() => searchParams.value.customType, (val) => {
+    search.customType = val
+  })
 
   watch(() => searchParams.value.isShort, (val) => {
     search.isShort = val
   })
   onLoad((options) => {
-    console.log(options?.type,'type')
+    console.log(options?.type, 'type')
     // search.reportType = options?.type;
     // searchParams.value.reportType = options?.type;
     reportType.value = options?.type
-    nextTick(()=>{
+    nextTick(() => {
       setFields()
     })
-  });
+  })
   onMounted(async () => {
     loading.value = true
     await initIbTree()
@@ -454,137 +454,137 @@ watch(() => searchParams.value.customType, (val) => {
     //   },
     // ]
 
-  if (type === 3) {
-    fields.push({
-      key: 'detail_type',
-      type: 'select',
-      label: t('placeholder.choose'),
-      placeholder: t('placeholder.choose'),
-      options: detailTypeList.value,
-      defaultValue: 1,
-      isSelect: true,
-    })
-  }
+    if (type === 3) {
+      fields.push({
+        key: 'detail_type',
+        type: 'select',
+        label: t('placeholder.choose'),
+        placeholder: t('placeholder.choose'),
+        options: detailTypeList.value,
+        defaultValue: 1,
+        isSelect: true,
+      })
+    }
 
-  if ([1, 3, 4, 7, 24].includes(type)) {
-    fields.push({
-      key: 'platform',
-      type: 'select',
-      label: t('Label.Platform'),
-      placeholder: t('placeholder.choose'),
-      options: platformOptions,
-      defaultValue: 'MT4',
-    })
-  }
+    if ([1, 3, 4, 7, 24].includes(type)) {
+      fields.push({
+        key: 'platform',
+        type: 'select',
+        label: t('Label.Platform'),
+        placeholder: t('placeholder.choose'),
+        options: platformOptions,
+        defaultValue: 'MT4',
+      })
+    }
 
-  if (type === 24) {
-    fields.push({
-      key: 'customType',
-      type: 'select',
-      label: t('placeholder.choose'),
-      placeholder: t('placeholder.choose'),
-      options: customTypeList.value,
-      defaultValue: 0,
-      isSelect: true,
-    })
-  }
+    if (type === 24) {
+      fields.push({
+        key: 'customType',
+        type: 'select',
+        label: t('placeholder.choose'),
+        placeholder: t('placeholder.choose'),
+        options: customTypeList.value,
+        defaultValue: 0,
+        isSelect: true,
+      })
+    }
 
-  console.log(agentLevels.value)
-  agentLevels.value.forEach((level, index) => {
-    fields.push({
-      key: level.key,
-      type: 'select',
-      label: t('State.All'),
-      options: level.options,
-      placeholder: t('State.All'),
-      onChange: (val: any) => handleAgentChange(val, index),
-      defaultValue: index === 0 ? 0 : '',
+    console.log(agentLevels.value)
+    agentLevels.value.forEach((level, index) => {
+      fields.push({
+        key: level.key,
+        type: 'select',
+        label: t('State.All'),
+        options: level.options,
+        placeholder: t('State.All'),
+        onChange: (val: any) => handleAgentChange(val, index),
+        defaultValue: index === 0 ? 0 : '',
+      })
     })
-  })
 
-  if ([1, 2, 3, 4, 7].includes(type)) {
-    fields.push({
-      key: 'login',
-      type: 'input',
-      label: t('Label.TradingAccount'),
-      placeholder: t('Label.TradingAccount'),
-      defaultValue: '',
-    })
-  }
+    if ([1, 2, 3, 4, 7].includes(type)) {
+      fields.push({
+        key: 'login',
+        type: 'input',
+        label: t('Label.TradingAccount'),
+        placeholder: t('Label.TradingAccount'),
+        defaultValue: '',
+      })
+    }
 
-  if (type === 7) {
-    fields.push({ key: 'cId', type: 'input', label: 'CID', placeholder: 'CID', defaultValue: '' })
-  }
+    if (type === 7) {
+      fields.push({ key: 'cId', type: 'input', label: 'CID', placeholder: 'CID', defaultValue: '' })
+    }
 
-  if ([3, 7].includes(type)) {
-    fields.push({
-      key: 'isShort',
-      type: 'select',
-      label: t('placeholder.choose'),
-      placeholder: t('placeholder.choose'),
-      options: isShortList.value,
-      defaultValue: 0,
-      isSelect: true,
-    })
-  }
+    if ([3, 7].includes(type)) {
+      fields.push({
+        key: 'isShort',
+        type: 'select',
+        label: t('placeholder.choose'),
+        placeholder: t('placeholder.choose'),
+        options: isShortList.value,
+        defaultValue: 0,
+        isSelect: true,
+      })
+    }
 
-  fields.push({ key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' })
-  filterFields.value = fields
-}
+    fields.push({ key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' })
+    filterFields.value = fields
+  }
 
 </script>
 
 <style lang="scss" scoped>
-@import "@/uni.scss";
-
-.search-content {
-  display: flex;
-  justify-content: space-between;
-}
-
-.report-platform {
-  display: flex;
-  align-items: center;
-
-  .checklist-box {
-    cursor: pointer;
-    box-sizing: border-box;
-    padding: 0 px2rpx(20);
-    border: 1px solid #DCDFE6;
-    background-color: #f5f5f5;
-    height: px2rpx(35);
-    line-height: px2rpx(35);
-    border-radius: px2rpx(4) 0 0 px2rpx(4);
-
-    &:last-child {
-      border-radius: 0 px2rpx(4) px2rpx(4) 0;
-    }
+  @import "@/uni.scss";
+
+  .search-content {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .report-platform {
+    display: flex;
+    align-items: center;
+
+    .checklist-box {
+      cursor: pointer;
+      box-sizing: border-box;
+      padding: 0 px2rpx(20);
+      border: 1px solid #DCDFE6;
+      background-color: #f5f5f5;
+      height: px2rpx(35);
+      line-height: px2rpx(35);
+      border-radius: px2rpx(4) 0 0 px2rpx(4);
+
+      &:last-child {
+        border-radius: 0 px2rpx(4) px2rpx(4) 0;
+      }
 
-    &.active {
-      color: var(--color-white);
-      background-color: var(--color-error);
-      border-color: var(--color-error);
+      &.active {
+        color: var(--color-white);
+        background-color: var(--color-error);
+        border-color: var(--color-error);
+      }
     }
   }
-}
-
-.search-input-box {
-  .uni-input {
-    height: px2rpx(35);
-    border: 1px solid #DCDFE6;
-    padding: 0 px2rpx(20);
-    border-radius: px2rpx(4);
-    background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
+
+  .search-input-box {
+    .uni-input {
+      height: px2rpx(35);
+      border: 1px solid #DCDFE6;
+      padding: 0 px2rpx(20);
+      border-radius: px2rpx(4);
+      background-color: rgba(var(--bs-body-bg-rgb), var(--bs-bg-opacity)) !important;
+    }
   }
-}
 
-.agent-select {
-  width: px2rpx(240);
-}
+  .agent-select {
+    width: px2rpx(240);
+  }
 
-.search-btn {
-  height: px2rpx(36);
-  line-height: px2rpx(36);
-  margin: 0;
-}
+  .search-btn {
+    height: px2rpx(36);
+    line-height: px2rpx(36);
+    margin: 0;
+  }
 </style>

service/ib.ts

@@ -99,6 +99,12 @@ export const ibApi = {
     // if (isVietnam) url += '/vn';
     return post(url, params, 'Host90');
   },
+  /** 代理佣金收入-明细？ */
+  tradeAgentCommissionAggregation: (params = {}, isVietnam = false) => {
+    let url = '/trade/agent/commission/vn/aggregation';
+    // if (isVietnam) url += '/vn';
+    return post(url, params, 'Host90');
+  },
   /** 新增代理 */
   tradeIb: (params = {}) => post('/ib/report/new', params, 'Host90'),
   /** 挂单历史 */