feat: 拆分报告，

components/AddBankDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <uni-popup ref="popupRef" type="center" background-color="#fff" style="z-index: 9999;">
+  <uni-popup ref="popupRef" type="center" background-color="#fff" style="z-index: 999;">
     <view class="dialog-container">
       <view class="dialog-header">
         <text class="dialog-title" v-t="typeMap[form.type]"></text>

components/cwg-complex-search.vue

@@ -130,6 +130,11 @@ const props = defineProps({
         type: Number,
         default: 1
     },
+    // 不设置默认数据
+    noData: {
+        type: Boolean,
+        default: false
+    },
     // 表单初始值 / v-model 绑定值
     modelValue: {
         type: Object,
@@ -208,28 +213,32 @@ const selectChip = (key, value) => {
 // 初始化表单数据
 const initFormData = () => {
     const initial = {}
+  if (!props.noData) {
     props.fields.forEach(field => {
-        // 1. 优先使用外部传入的 modelValue（如果值不为 null 或 undefined）
-        if (props.modelValue && props.modelValue[field.key] != null) {
-            initial[field.key] = props.modelValue[field.key]
-        }
-        // 2. 其次使用字段配置的 defaultValue
-        else if (field.defaultValue !== undefined) {
-            initial[field.key] = field.defaultValue
-        }
-        // 3. 日期字段特殊处理：默认当前月（即使 modelValue 中存在但为 null/undefined）
-        else if (field.type === 'date' || field.type === 'daterange') {
-            initial[field.key] = getDefaultDateValue(field)
-        }
-        // 4. select 类型字段如果没有默认值，默认置空，不强制选第一个
-        else if (field.type === 'select') {
-            initial[field.key] = null
-        }
-        // 5. 其他字段默认为空字符串
-        else {
-            initial[field.key] = ''
-        }
+      // 1. 优先使用外部传入的 modelValue（如果值不为 null 或 undefined）
+      if (props.modelValue && props.modelValue[field.key] != null) {
+        initial[field.key] = props.modelValue[field.key]
+      }
+      // 2. 其次使用字段配置的 defaultValue
+      else if (field.defaultValue !== undefined) {
+        initial[field.key] = field.defaultValue
+        return
+      }
+      // 3. 日期字段特殊处理：默认当前月（即使 modelValue 中存在但为 null/undefined）
+      else if (field.type === 'date' || field.type === 'daterange') {
+        initial[field.key] = getDefaultDateValue(field)
+      }
+      // 4. select 类型字段如果没有默认值，默认置空，不强制选第一个
+      else if (field.type === 'select') {
+        initial[field.key] = null
+      }
+      // 5. 其他字段默认为空字符串
+      else {
+        initial[field.key] = ''
+      }
     })
+  }
+
     formData.value = initial
     tempFormData.value = JSON.parse(JSON.stringify(initial))
     handleSearch()

components/cwg-video-player.vue

@@ -10,7 +10,8 @@
 <script setup>
 import { computed, ref, watch } from 'vue'
 import { onLoad, onUnload } from '@dcloudio/uni-app'
-
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
 const props = defineProps({
     videoUrl: {
         type: String,

composables/useMenuSplit.ts

@@ -255,8 +255,12 @@ export function useMenuSplit(handleClick1: (item: MenuItem) => void) {
             label: 'Home.page_ib.item3',
             icon: 'crm-newspaper',
             children: [
-                { path: '/pages/ib/report', label: 'Home.page_ib.item3', icon: 'icon-withdrawal' },
+                // { path: '/pages/ib/report', label: 'Home.page_ib.item3', icon: 'icon-withdrawal' },
                 { path: '/pages/ib/complexReport', label: 'Home.page_ib.item11', icon: 'icon-withdrawal' },
+              { path: '/pages/ib/report?type=1', label: 'Ib.Report.Title1', icon: 'icon-withdrawal' },
+              { path: '/pages/ib/report?type=2', label: 'Ib.Report.Title2', icon: 'icon-withdrawal' },
+              { path: '/pages/ib/report?type=3', label: 'Ib.Report.Title3', icon: 'icon-withdrawal' },
+              { path: '/pages/ib/report?type=6', label: 'news_add_field.IbReport.Title6', icon: 'icon-withdrawal' },
             ],
         },
       // 推广

pages/ib/components/applyIbDialog.vue

@@ -2,73 +2,64 @@
   <cwg-popup :title="t(title)" :visible="visible" @close="closeDia" @confirm="confirmDia" :width="'900px'">
     <view class="dia-content">
       <uni-forms ref="formRef" labelWidth="200">
-        <uni-forms-item v-if="isFormApplyIb" :label="t('Ib.Custom.Manage3')+':'" prop="customerId">
+        <uni-forms-item v-if="isFormApplyIb" :label="t('Ib.Custom.Manage3') + ':'" prop="customerId">
           <cwg-combox v-model:value="addAgentForm.customerId" :options="customerList"
-                      :placeholder="t('placeholder.choose')" filterable @change="changeCustomer" style="max-width: 280px" />
+                      :placeholder="t('placeholder.choose')" filterable @change="changeCustomer"
+                      style="max-width: 280px" />
         </uni-forms-item>
-        <uni-loading v-if="laoding"/>
+        <uni-loading v-if="laoding" />
         <view v-else class="commission-table-container" v-if="addAgentForm.customerId">
           <table class="commission-table">
             <thead>
-              <tr>
-                <th style="width: 80px;">{{ t('Ib.Custom.Status') }}</th>
-                <th style="width: 100px;"></th>
-                <th style="width: 100px;"></th>
-                <th style="width: 80px;">METAL</th>
-                <th>FX</th>
-                <th>ENERGY</th>
-                <th>CFD</th>
-                <th>INDEX</th>
-              </tr>
+            <tr>
+              <th style="width: 60px;">{{ t('Ib.Custom.Status') }}</th>
+              <th style="width: 135px;"></th>
+              <th style="width: 100px;"></th>
+              <th style="width: 80px;">METAL</th>
+              <th>FX</th>
+              <th>ENERGY</th>
+              <th>CFD</th>
+              <th>INDEX</th>
+              <th>CRYPTO</th>
+            </tr>
             </thead>
             <tbody v-for="(group, gIndex) in commissionTemplateTableData" :key="gIndex">
-              <tr v-for="(item, iIndex) in group.items" :key="iIndex">
-                <td v-if="iIndex === 0" :rowspan="group.items.length" class="center-td">
-                  <switch :checked="group.isOpen" @change="(e) => onGroupSwitchChange(e, group)" color="#2b5aed"
-                          style="transform:scale(0.8)" />
-                </td>
-                <td v-if="iIndex === 0" :rowspan="group.items.length" class="center-td group-name-td">
-                  {{ group.accountGroup }}
-                </td>
-                <td class="center-td type-td">
-                  {{ item.type }}
-                </td>
-                <td style="width: 80px;">
-                  <cwg-combox
-                    v-model:value="item.energy"
-                    :options="formatOptions(item.energyOptions)"
-                    :placeholder="t('placeholder.choose')"
-                  />
-                </td>
-                <td>
-                  <cwg-combox
-                    v-model:value="item.forex"
-                    :options="formatOptions(item.forexOptions)"
-                    :placeholder="t('placeholder.choose')"
-                  />
-                </td>
-                <td>
-                  <cwg-combox
-                    v-model:value="item.energy2"
-                    :options="formatOptions(item.energy2Options)"
-                    :placeholder="t('placeholder.choose')"
-                  />
-                </td>
-                <td>
-                  <cwg-combox
-                    v-model:value="item.index"
-                    :options="formatOptions(item.indexOptions)"
-                    :placeholder="t('placeholder.choose')"
-                  />
-                </td>
-                <td>
-                  <cwg-combox
-                    v-model:value="item.metal"
-                    :options="formatOptions(item.metalOptions)"
-                    :placeholder="t('placeholder.choose')"
-                  />
-                </td>
-              </tr>
+            <tr v-for="(item, iIndex) in group.items" :key="iIndex">
+              <td v-if="iIndex === 0" :rowspan="group.items.length" class="center-td">
+                <switch :checked="group.isOpen" @change="(e) => onGroupSwitchChange(e, group)" color="#2b5aed"
+                        style="transform:scale(0.7)" />
+              </td>
+              <td v-if="iIndex === 0" :rowspan="group.items.length" class="center-td group-name-td">
+                {{ group.accountGroup }}
+              </td>
+              <td class="center-td type-td">
+                {{ item.type }}
+              </td>
+              <td style="width: 75px;">
+                <cwg-combox v-model:value="item.energy" :options="formatOptions(item.energyOptions)"
+                            :placeholder="t('placeholder.choose')" />
+              </td>
+              <td>
+                <cwg-combox v-model:value="item.forex" :options="formatOptions(item.forexOptions)"
+                            :placeholder="t('placeholder.choose')" />
+              </td>
+              <td>
+                <cwg-combox v-model:value="item.energy2" :options="formatOptions(item.energy2Options)"
+                            :placeholder="t('placeholder.choose')" />
+              </td>
+              <td>
+                <cwg-combox v-model:value="item.index" :options="formatOptions(item.indexOptions)"
+                            :placeholder="t('placeholder.choose')" />
+              </td>
+              <td>
+                <cwg-combox v-model:value="item.metal" :options="formatOptions(item.metalOptions)"
+                            :placeholder="t('placeholder.choose')" />
+              </td>
+              <td>
+                <cwg-combox v-model:value="item.crypto" :options="formatOptions(item.cryptoOptions)"
+                            :placeholder="t('placeholder.choose')" />
+              </td>
+            </tr>
             </tbody>
           </table>
         </view>
@@ -145,6 +136,9 @@
         let params = {
           customId: props.detail.id,
         }
+        addAgentForm.value = {
+          customerId: props.detail.id,
+        }
         if (props.paramsType == 'vietnam') {
           params = {
             agentId: props.detail.id,
@@ -229,6 +223,8 @@
               index1: 0,
               metal1: 0,
               energy1: 0,
+              crypto: 0,
+              crypto1: 0,
             }
 
             rebates.forEach((rebate: any) => {
@@ -237,6 +233,7 @@
               else if (rebate.symbolCategory === 3) rebateRow.metal = rebate.point || 0
               else if (rebate.symbolCategory === 4) rebateRow.energy = rebate.point || 0
               else if (rebate.symbolCategory === 5) rebateRow.energy2 = rebate.point || 0
+              else if (rebate.symbolCategory === 6) rebateRow.crypto = rebate.point || 0
             })
 
             superRebates.forEach((rebate: any) => {
@@ -245,6 +242,7 @@
               else if (rebate.symbolCategory === 3) rebateRow.metal1 = rebate.point || 0
               else if (rebate.symbolCategory === 4) rebateRow.energy1 = rebate.point || 0
               else if (rebate.symbolCategory === 5) rebateRow.energy2Max = rebate.point || 0
+              else if (rebate.symbolCategory === 6) rebateRow.crypto1 = rebate.point || 0
             })
 
             rebateRow.forexOptions = generateOptions(rebateRow.forex1)
@@ -252,6 +250,7 @@
             rebateRow.metalOptions = generateOptions(rebateRow.metal1)
             rebateRow.energyOptions = generateOptions(rebateRow.energy1)
             rebateRow.energy2Options = generateOptions(rebateRow.energy2Max)
+            rebateRow.cryptoOptions = generateOptions(rebateRow.crypto1)
 
             groupedData[accountGroup].push(rebateRow)
           }
@@ -275,6 +274,8 @@
               index1: 0,
               metal1: 0,
               energy1: 0,
+              crypto: 0,
+              crypto1: 0,
             }
 
             commissions.forEach((comm: any) => {
@@ -283,6 +284,7 @@
               else if (comm.symbolCategory === 3) commissionRow.metal = comm.point || 0
               else if (comm.symbolCategory === 4) commissionRow.energy = comm.point || 0
               else if (comm.symbolCategory === 5) commissionRow.energy2 = comm.point || 0
+              else if (comm.symbolCategory === 6) commissionRow.crypto = comm.point || 0
             })
 
             superCommissions.forEach((comm: any) => {
@@ -291,6 +293,7 @@
               else if (comm.symbolCategory === 3) commissionRow.metal1 = comm.point || 0
               else if (comm.symbolCategory === 4) commissionRow.energy1 = comm.point || 0
               else if (comm.symbolCategory === 5) commissionRow.energy2Max = comm.point || 0
+              else if (comm.symbolCategory === 6) commissionRow.crypto1 = comm.point || 0
             })
 
             commissionRow.forexOptions = generateOptions(commissionRow.forex1)
@@ -298,6 +301,7 @@
             commissionRow.metalOptions = generateOptions(commissionRow.metal1)
             commissionRow.energyOptions = generateOptions(commissionRow.energy1)
             commissionRow.energy2Options = generateOptions(commissionRow.energy2Max)
+            commissionRow.cryptoOptions = generateOptions(commissionRow.crypto1)
 
             groupedData[accountGroup].push(commissionRow)
           }
@@ -308,7 +312,7 @@
           return {
             accountGroup,
             // 默认不展开
-            isOpen:groupedData[accountGroup].some(item => item.isOpen == 1) || false ,
+            isOpen: groupedData[accountGroup].some(item => item.isOpen == 1) || false,
             items: groupedData[accountGroup],
           }
         }).filter(item => item.items.length > 0)
@@ -403,6 +407,9 @@
         if (row.energy2 !== undefined && row.energy2 !== null) {
           pointList.push({ symbolCategory: 5, point: row.energy2 }) // Energy
         }
+        if (row.crypto !== undefined && row.crypto !== null) {
+          pointList.push({ symbolCategory: 6, point: row.crypto }) // Crypto
+        }
       })
     })
 
@@ -429,7 +436,7 @@
 
   const closeDia = () => {
     addAgentForm.value = {
-      customerId: ''
+      customerId: '',
     }
     commissionTemplateTableData.value = []
     emit('close')
@@ -532,7 +539,7 @@
     }
 
     th {
-      padding: px2rpx(12) px2rpx(10);
+      padding: px2rpx(12) px2rpx(5);
       text-align: center;
       font-weight: bold;
       color: #909399;
@@ -542,7 +549,7 @@
     }
 
     td {
-      padding: px2rpx(8) px2rpx(10);
+      padding: px2rpx(8) px2rpx(7);
       border: 1px solid #ebeef5;
       vertical-align: middle;
     }
@@ -561,8 +568,8 @@
     }
 
     :deep(.cwg-combox) {
-      width: 100%;
-      min-width: px2rpx(80);
+      //width: 100%;
+      width: px2rpx(60);
     }
   }
 

pages/ib/report.vue

@@ -31,6 +31,7 @@
   // 报告
   import { ref, computed, onMounted, watch, nextTick } from 'vue'
   import { useI18n } from 'vue-i18n'
+  import { onLoad } from '@dcloudio/uni-app'
   import Config from '@/config/index'
   import { ibApi } from '@/service/ib'
   import { useReportConst } from '@/pages/ib/const/report'
@@ -50,11 +51,11 @@
     { text: t('Ib.Report.Title1'), value: 1 },
     { text: t('Ib.Report.Title2'), value: 2 },
     { text: t('Ib.Report.Title3'), value: 3 },
-    { text: t('Ib.Report.Title6'), value: 4 },
+    // { text: t('Ib.Report.Title6'), value: 4 },
     // 新增代理
     // { text: t('Ib.Report.Title5'), value: 5 },
     { text: t('news_add_field.IbReport.Title6'), value: 6 },
-    { text: t('Ib.Report.Title7'), value: 7 },
+    // { text: t('Ib.Report.Title7'), value: 7 },
     //  加点报告
     // { text: t('Ib.Report.Title8'), value: 24 },
   ])
@@ -78,8 +79,9 @@
   const day = String(now.getDate()).padStart(2, '0')
   const defaultDateRange = [`${year}-${month}-01`, `${year}-${month}-${day}`]
 
+  const reportType = ref(1)
+
   const searchParams = ref<any>({
-    reportType: 1,
     detail_type: null,
     customType: 0,
     platform: 'MT4',
@@ -93,7 +95,6 @@
   const filterFields = ref([])
 
   const search = ref({
-    reportType: 1,
     detail_type: null as number | null,
     customType: 0,
     platform: 'MT4',
@@ -176,7 +177,7 @@
         return
       }
 
-      const type = search.value.reportType
+      const type = reportType.value
       const detailType = search.value.detail_type
 
       // 根据不同的列 prop 进行合计数据显示和格式化
@@ -247,7 +248,9 @@
   }
 
   const handleSearch = (params: any) => {
-    const payload: any = { ...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--) {
@@ -319,18 +322,22 @@
 
   // 表格列配置 根据types 切换
   const columns = computed(() => {
-    if (search.value.reportType === 3) {
+    console.log(reportType.value,'23')
+
+    if (reportType.value == 3) {
+      console.log(columnList.value[`3_${search.value.detail_type}`])
       return columnList.value[`3_${search.value.detail_type}`] || []
     }
-    return columnList.value[search.value.reportType] || []
+    console.log(columnList.value[reportType.value])
+    return columnList.value[reportType.value] || []
   })
 
   const mobilePrimaryFields = computed(() => {
     let list: any[] = []
-    if (search.value.reportType === 3) {
+    if (reportType.value === 3) {
       list = mobileList.value[`3_${search.value.detail_type}`] || []
     } else {
-      list = mobileList.value[search.value.reportType] || []
+      list = mobileList.value[reportType.value] || []
     }
     return [
       ...list,
@@ -347,7 +354,7 @@
   const listApi = computed(() => {
     return async (params: any) => {
       let apiFn = ibApi.tradeDw
-      const type = search.value.reportType
+      const type = reportType.value
       const detailType = search.value.detail_type
 
       if (type == 1) apiFn = ibApi.tradeDw
@@ -406,26 +413,34 @@
   watch(() => searchParams.value.isShort, (val) => {
     search.value.isShort = val
   })
-
+  onLoad((options) => {
+    console.log(options?.type,'type')
+    // search.value.reportType = options?.type;
+    // searchParams.value.reportType = options?.type;
+    reportType.value = options?.type
+    nextTick(()=>{
+      setFields()
+    })
+  });
   onMounted(async () => {
     loading.value = true
     await initIbTree()
-    setFields()
     loading.value = false
   })
   const setFields = () => {
-    const type = Number(searchParams.value.reportType ?? 1)
-    const fields: any[] = [
-      {
-        key: 'reportType',
-        type: 'select',
-        label: t('Home.page_ib.item3'),
-        placeholder: t('placeholder.choose'),
-        options: typeList.value,
-        defaultValue: 1,
-        isSelect: true,
-      },
-    ]
+    const type = Number(reportType.value ?? 1)
+    const fields = []
+    // const fields: any[] = [
+    //   {
+    //     key: 'reportType',
+    //     type: 'select',
+    //     label: t('Home.page_ib.item3'),
+    //     placeholder: t('placeholder.choose'),
+    //     options: typeList.value,
+    //     defaultValue: 1,
+    //     isSelect: true,
+    //   },
+    // ]
 
     if (type === 3) {
       fields.push({

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>
@@ -24,7 +23,7 @@
         <view class="search-content pc-search-content">
           <view class="search-bar">
             <cwg-complex-search :fields="filterFields" v-model="searchParams" @search="handleSearch"
-                                @reset="handleReset" />
+                                @reset="handleReset" noData/>
           </view>
           <view class="search-bar">
             <button type="primary" class="search-button" @click="addSub">
@@ -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 = [
@@ -108,7 +104,7 @@
       defaultValue: '',
     },
     { key: 'cId', type: 'input', label: 'CID', placeholder: 'CID', defaultValue: '' },
-    { key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange' },
+    { key: 'date', label: t('placeholder.Start') + ' - ' + t('placeholder.End'), type: 'daterange',defaultValue: ['',''] },
   ]
   const tableRef = ref(null)
   const applyIbDialogRef = ref(null)
@@ -213,18 +209,15 @@
   const handleSearch = (params: any) => {
     // 拦截处理 daterange，将 date 拆分为 startDate 和 endDate
     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/AddFileDialog.vue

@@ -1,12 +1,12 @@
 <template>
-    <uni-popup ref="fileRef" type="center" background-color="#fff">
-        <view class="dialog-container">
-            <view class="dialog-header">
-                <text class="dialog-title">{{ form.title }}</text>
-                <view class="dialog-close" @click="close">
-                    <text>×</text>
-                </view>
-            </view>
+  <cwg-popup :title="form.title" :visible="visible" @close="close" @confirm="submit" >
+<!--        <view class="dialog-container">-->
+<!--            <view class="dialog-header">-->
+<!--                <text class="dialog-title">{{ form.title }}</text>-->
+<!--                <view class="dialog-close" @click="close">-->
+<!--                    <text>×</text>-->
+<!--                </view>-->
+<!--            </view>-->
             <uni-forms ref="formRef" :rules="rules" :model="form" labelWidth="200" label-position="top"
                 class="crm-form">
                 <uni-row class="form-row uni-row1">
@@ -55,12 +55,12 @@
                     </template>
                 </uni-row>
             </uni-forms>
-            <view class="dialog-footer">
-                <view class="btn btn-cancel" @click="close">{{ t('Btn.Cancel') }}</view>
-                <view class="btn btn-confirm" @click="submit">{{ t('Btn.Confirm') }}</view>
-            </view>
-        </view>
-    </uni-popup>
+<!--            <view class="dialog-footer">-->
+<!--                <view class="btn btn-cancel" @click="close">{{ t('Btn.Cancel') }}</view>-->
+<!--                <view class="btn btn-confirm" @click="submit">{{ t('Btn.Confirm') }}</view>-->
+<!--            </view>-->
+<!--        </view>-->
+  </cwg-popup>
 </template>
 
 <script setup lang="ts">
@@ -82,6 +82,7 @@ const emit = defineEmits(["success"]);
 
 const fileRef = ref<any>(null);
 const formRef = ref<any>(null);
+const visible = ref(false);
 
 const form = ref<AddBankForm>({});
 
@@ -111,12 +112,14 @@ const open = async (item) => {
 
 
     getBankList()
-    fileRef.value?.open();
+  visible.value = true
+    // fileRef.value?.open();
 };
 
 // 关闭弹窗
 const close = () => {
-    fileRef.value?.close();
+    // fileRef.value?.close();
+    visible.value = false
     resetForm();
 };
 

pages/mine/components/BankInfoTab.vue

@@ -125,7 +125,7 @@
                             </view>
                         </view>
                         <uni-forms :model="item" labelWidth="200" label-position="top">
-                            <uni-row class="demo-uni-row">
+                            <uni-row class="demo-uni-row" :gutter="20">
                                 <uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
                                     <uni-forms-item>
                                         <cwg-file-picker-wrapper v-model="item.bankFront" :editable="editingId === item.id"
@@ -413,7 +413,7 @@ const hobbys = computed(() => {
     }
 });
 // 状态
-const updateUrl = config.Host80
+const updateUrl = config.Host05
 const editingId = ref(null)
 const bankList = ref([])
 const isZh = computed(() => ['cn', 'zh', 'zhHant'].includes(locale.value));
@@ -764,7 +764,7 @@ onMounted(() => {
 
 :deep(.uni-row1) {
     .uni-col {
-        padding: 0 0 !important;
+        //padding: 0 0 !important;
     }
 
     .uni-forms-item {