优化首页、分页、筛选

src/views/main/dashboard/components/charts/index.vue

@@ -14,8 +14,14 @@ import { getIndexProfit, getIndexHourReport } from '@/api/dashboard.js'
 import lineChartModel from './lineChartModel.vue'
 import userDataChart from './userDataChart.vue'
 
-
-const tableData = ref([])
+// 表格初始化数据
+const tableData = ref([
+  { platform: "穿山甲", today: "0.00", yesterday: "0.00", month: "0.00", ecpmToday: "0.00", ecpmYesterday: "0.00", ecpmMonth: "0.00" },
+  { platform: "腾讯广告", today: "0.00", yesterday: "0.00", month: "0.00", ecpmToday: "0.00", ecpmYesterday: "0.00", ecpmMonth: "0.00" },
+  { platform: "百度联盟", today: "0.00", yesterday: "0.00", month: "0.00", ecpmToday: "0.00", ecpmYesterday: "0.00", ecpmMonth: "0.00" },
+  { platform: "快手", today: "0.00", yesterday: "0.00", month: "0.00", ecpmToday: "0.00", ecpmYesterday: "0.00", ecpmMonth: "0.00" },
+  { platform: "Sigmob", today: "0.00", yesterday: "0.00", month: "0.00", ecpmToday: "0.00", ecpmYesterday: "0.00", ecpmMonth: "0.00" },
+])
 const totalProfit = ref({})
 const getIndexProfitData = async () => {
   const res = await getIndexProfit()

src/views/main/dashboard/components/charts/lineChartModel.vue

@@ -95,7 +95,7 @@ const options = ref({
         top: "0"
     }, */
     grid: {
-        top: 20,
+        top: 30,
         right: 20,
         bottom: 0,  // 可根据需要设为 0~40
         left: 40,
@@ -111,9 +111,11 @@ const options = ref({
             let result = params[0].axisValue + '<br>'; // 显示时间点
             params.forEach(function (item) {
                 // 为每个系列添加数据行
+                let value = Number(item.value);
+                let fixedValue = isNaN(value) ? '-' : value.toFixed(2);
                 result += '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:'
                     + item.color + '"></span>'
-                    + item.seriesName + ': ' + item.value + '<br>';
+                    + item.seriesName + ': ' + fixedValue + '<br>';
             });
             return result;
         }
@@ -207,8 +209,8 @@ watch(() => props.lineListData, (newVal) => {
             itemStyle: { color: '#ffcc5c' },
             lineStyle: { color: '#ffcc5c', width: 2 },
             data: props.type === 'earn' ?
-                newVal['快手']?.estimatedRevenueList ?? [] :
-                newVal['快手']?.estimatedRevenueEcpmList ?? []
+                newVal['快手联盟']?.estimatedRevenueList ?? [] :
+                newVal['快手联盟']?.estimatedRevenueEcpmList ?? []
         },
         {
             type: 'line',

src/views/main/dashboard/components/charts/userDataChart.vue

@@ -23,21 +23,20 @@
 </template>
 
 <script setup>
-import {onBeforeMount, ref} from 'vue'
+import { onBeforeMount, ref } from 'vue'
 import Chart from '@/components/charts/index.vue'
 import { getIndexUserStatistic } from '@/api/dashboard.js'
-//穿山甲、优量汇、快手、Sigmob、百度
-
-const getIndexUserStatisticData = async() => {
-    let res = await getIndexUserStatistic()
-    console.log('user',res)
-}
-
-
-// onBeforeMount(async () => {
-//   await getIndexUserStatisticData()
-// })
 
+// 表格数据
+const tableData = ref([
+    { name: '注册数', today: 0, yesterday: 0, month: 0 },
+    { name: '新增数(ZID)', today: 0, yesterday: 0, month: 0 },
+    { name: '登录数', today: 0, yesterday: 0, month: 0 },
+    { name: '新增封禁', today: 0, yesterday: 0, month: 0 },
+    { name: '总封禁数', today: 0, yesterday: 0, month: 0 },
+    { name: '新增封号', today: 0, yesterday: 0, month: 0 },
+    { name: '总封号', today: 0, yesterday: 0, month: 0 }
+]);
 
 const xAxisList = [
     '00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00',
@@ -45,9 +44,9 @@ const xAxisList = [
     '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'
 ];
 
-const options = {
+const options = ref({
     grid: {
-        top: 20,
+        top: 30,
         right: 20,
         bottom: 0,  // 可根据需要设为 0~40
         left: 40,
@@ -57,7 +56,8 @@ const options = {
         trigger: 'axis'
     },
     legend: {
-        data: ['新增数(ZID)', '注册数', '登录数', '新增封禁', '总封禁', '新增封号', '总封号']
+        // data: ['新增数(ZID)', '注册数', '登录数', '新增封禁', '总封禁', '新增封号', '总封号']
+        data: ['注册数', '新增封禁', '新增封号']
     },
     xAxis: {
         type: 'category',
@@ -67,56 +67,47 @@ const options = {
     yAxis: {
         type: 'value'
     },
-    series: [
-        {
-            name: '新增数(ZID)',
-            type: 'line',
-            data: [0.03, 0.1, 0.1, 0.3, 0.2, 0.5,0,0,0.1,0,0,0.5,0,0,0,0,0.8,0,0,0.4,0,0,0,0]
-        },
+    series: []
+})
+
+const getIndexUserStatisticData = async () => {
+    let res = await getIndexUserStatistic()
+    console.log('user', res)
+    res = res.data
+    tableData.value = [
+        { name: '注册数', today: res.today, yesterday: res.yesterday, month: res.month },
+        // { name: '新增数(ZID)', today: 0, yesterday: 0, month: 0 },
+        { name: '登录数', today: res.todayLogin, yesterday: res.yesterdayLogin, month: res.monthLogin },
+        { name: '新增封禁', today: res.todayLock, yesterday: res.yesterdayLock, month: res.monthLock },
+        // { name: '总封禁数', today: 0, yesterday: 0, month: 0 },
+        { name: '新增封号', today: res.todayRisk, yesterday: res.yesterdayRisk, month: res.monthRisk },
+        // { name: '总封号', today: 0, yesterday: 0, month: 0 }
+    ]
+
+    const { todayUser, todayLockHour, todayRiskHour } = res
+
+    options.value.series = [
         {
             name: '注册数',
             type: 'line',
-            data: [0.3, 0, 0.2, 0.1, 0.3, 0.2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.5,0,0,0]
-        },
-        {
-            name: '登录数',
-            type: 'line',
-            data: [0.2, 0.4, 0.2, 1, 0, 0.3,0,0,0,0,0,0,0,0,0,0,0,0,0.6,0,0,0,0,0]
+            data: todayUser
         },
         {
             name: '新增封禁',
             type: 'line',
-            data: [0, 0.2, 0.4, 0, 0.5, 0.7,0,0,0,0,0,0,0,0,0,0,0,0,0.4,0,0,0,0,0]
-        },
-        {
-            name: '总封禁',
-            type: 'line',
-            data: [0.1, 0.1, 0, 0.1, 0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0.3,0,0,0,0,0]
+            data: todayLockHour
         },
         {
             name: '新增封号',
             type: 'line',
-            data: [0, 0.1, 0, 0.3, 0, 0,0,0,0,0,0,0,0,0.2,0,0,0,0,0,0,0,0,0,0]
+            data: todayRiskHour
         },
-        {
-            name: '总封号',
-            type: 'line',
-            data: [0, 0, 0, 0, 0, 0,0,0,0,0,0,0,0,0,0,0.1,0,0,0,0,0,0,0,0]
-        }
     ]
 }
+onBeforeMount(async () => {
+    await getIndexUserStatisticData()
+})
 
-
-// 表格数据
-const tableData = ref([
-    { name: '注册数', today: 0, yesterday: 0, month: 877 },
-    { name: '新增数(ZID)', today: 0, yesterday: 0, month: 62 },
-    { name: '登录数', today: 1, yesterday: 0, month: 1376 },
-    { name: '新增封禁', today: 1, yesterday: 3, month: 653 },
-    { name: '总封禁数', today: 0, yesterday: 0, month: 636 },
-    { name: '新增封号', today: 1, yesterday: 3, month: 32 },
-    { name: '总封号', today: 0, yesterday: 0, month: 19 }
-]);
 </script>
 
 <style lang="scss" scoped>

src/views/main/formworkErection/adPlatformAdmin.vue

@@ -140,16 +140,12 @@
   });
 
   const formSearch = ref({
-    channelOrigin: null,// 渠道来源
-    channelType: null,// 渠道类型
-    lastLoginTime: '',// 最新登录时间
-    limit: 20,// 当前页数量(查询量)
-    nickName: null,// 用户昵称
+    channelId: null,//平台ID
+    channelName:null,//平台名称
+    loginType:null,//登录类型
+    channelStatus: null,//平台状态
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
-    registryTime: null,// 注册时间
-    total: null,// 总条数
-    userType: null,// 用户类型
+    limit: 20,// 当前页数量(查询量)
   });
 
   const dynamicFormItems = ref([])
@@ -165,51 +161,19 @@
       dynamicFormItems.value = [
         {
           label: '平台ID',
-          prop: 'nickName',
+          prop: 'channelId',
           type: 'input',
         },
         {
           label: '平台名称',
-          prop: 'nickName',
+          prop: 'channelName',
           type: 'input',
         },
-        {
-          label: '登陆类型',
-          prop: 'loginType',
-          type: 'select',
-          options: [
-            {
-              label: "全部",
-              value: null,
-            },
-            {
-              label: "账号密码",
-              value: 0,
-            },
-            {
-              label: "微信",
-              value: 1,
-            }
-          ]
-        },
         {
           label: '平台状态',
           prop: 'channelType',
           type: 'select',
-          options: [
-            {
-              label: "全部",
-              value: null,
-            },
-            {
-              label: "正常",
-              value: 0,
-            },
-            {
-              label: "锁定",
-              value: 1,
-            }
-          ]
+          options: getOptions('channel_status')
         },
       ]
     })
@@ -224,7 +188,6 @@
 
   const changeTableData = () => {
     formSearch.value.page = page.pageNum;
-    formSearch.value.pageSizes = page.pageSize;
     formSearch.value.limit = page.pageSize;
     // 分页切换
     getList();
@@ -234,25 +197,23 @@
   const handleFormSubmitted = (formData) => {
     // console.log("接收到子组件传递的数据", formData);
     formSearch.value.page = 1;
-    formSearch.value.pageSizes = 20;
-    formSearch.value.total = page.total;
     formSearch.value.limit = 20;
+    formSearch.value.channelId = formData.channelId
+    formSearch.value.channelName = formData.channelName
+    formSearch.value.channelStatus = formData.channelStatus
+
     getList();
   };
 
   // 表单重置
   const handleFormReset = () => {
     formSearch.value = {
-      channelOrigin: null,// 渠道来源
-      channelType: null,// 渠道类型
-      lastLoginTime: null,// 最新登录时间
-      limit: 20,// 当前页数量(查询量)
-      nickName: null,// 用户昵称
+      channelId: null,//平台ID
+      channelName:null,//平台名称
+      loginType:null,//登录类型
+      channelStatus: null,//平台状态
       page: 1,// 当前页码
-      pageSizes: 20,// 总页数
-      registryTime: null,// 注册时间
-      total: null,// 总条数
-      userType: null,// 用户类型
+      limit: 20,// 当前页数量(查询量)
     };
     getList();
   };

src/views/main/formworkErection/adSourceAdmin.vue

@@ -120,8 +120,6 @@ const page = reactive({
 const formSearch = ref({
     limit: 20,// 当前页数量(查询量)
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
-    total: null,// 总条数
     name: null,//名称
     placementId: null,//广告位id
 });
@@ -194,7 +192,6 @@ const getList = async () => {
 
 const changeTableData = () => {
     formSearch.value.page = page.pageNum;
-    formSearch.value.pageSizes = page.pageSize;
     formSearch.value.limit = page.pageSize;
     // 分页切换
     getList();
@@ -204,8 +201,6 @@ const changeTableData = () => {
 const handleFormSubmitted = (formData) => {
     // console.log("接收到子组件传递的数据", formData);
     formSearch.value.page = 1;
-    formSearch.value.pageSizes = 20;
-    formSearch.value.total = page.total;
     formSearch.value.limit = 20;
     getList();
 };
@@ -215,8 +210,6 @@ const handleFormReset = () => {
     formSearch.value = {
         limit: 20,// 当前页数量(查询量)
         page: 1,// 当前页码
-        pageSizes: 20,// 总页数
-        total: null,// 总条数
         name: null,//名称
         placementId: null,//广告位id
     };
@@ -235,7 +228,6 @@ const getPlacementList = async () => {
     let res = await placementList({
         limit: 999,
         page: 1,
-        pageSizes: 999,
     })
     placementListData.value = res.data
 

src/views/main/formworkErection/placementAdmin.vue

@@ -56,9 +56,9 @@
               <el-select v-model="formEdit.appData" filterable placeholder="请选择">
                 <el-option
                     v-for="item in appData"
-                    :key="item.appName"
+                    :key="item.appId"
                     :label="item.appName"
-                    :value="item">
+                    :value="item.appId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -118,8 +118,6 @@ import From from "@/components/from/index.vue";
 import Table from "@/components/table/index.vue";
 import Layer from '@/components/layer/index.vue'
 import {ElMessage} from 'element-plus'
-import {getUserList, getStaticList, riskBannedUser, riskLockUser} from '@/api/userModule.js'
-import {riskChangeUserStatus} from '@/api/riskModule.js'
 import {convertUTCToBeijing} from '@/utils/index.js'
 import {useGetDictList} from '@/hooks/useGetDictList.js'
 import {useStore} from 'vuex'
@@ -138,28 +136,16 @@ const page = reactive({
   total: 0,
 });
 
-// 分页参数, 供table使用
-const appPage = reactive({
-  pageNum: 1,
-  pageSizes: 999,
-  limit: 999,
-  total: 0,
-});
-
 // 分页数据
 const getAppList = async () => {
-  let res = await appList({...appFormSearch.value});
+  let res = await appList({page: 1, limit: 999,});
   appData.value = res.data;
   console.log('appData.value',appData.value)
 };
 
-const changeAppTableData = () => {
-  appFormSearch.value.pageNum = appPage.pageNum;
-  appFormSearch.value.pageSizes = appPage.pageSizes;
-  appFormSearch.value.limit = appPage.limit;
-  // 分页切换
-  getAppList();
-};
+function findByDitchName(id) {
+  return appData.value.find(item => item.appId === id)
+}
 
 const formSearch = ref({
   channelOrigin: null,// 渠道来源
@@ -168,26 +154,16 @@ const formSearch = ref({
   limit: 20,// 当前页数量(查询量)
   nickName: null,// 用户昵称
   page: 1,// 当前页码
-  pageSizes: 20,// 总页数
   registryTime: null,// 注册时间
-  total: null,// 总条数
   userType: null,// 用户类型
 });
 
-
-const appFormSearch = ref({
-  page: 1,// 当前页码
-  pageSizes: 999,// 总页数
-  limit: 999,
-  total: null,// 总条数
-});
-
 const dynamicFormItems = ref([])
 
 onBeforeMount(() => {
   settingData()
   getList();
-  changeAppTableData()
+  getAppList();
 });
 
 // 获取缓存数据设置筛选数据
@@ -229,7 +205,6 @@ const getList = async () => {
 
 const changeTableData = () => {
   formSearch.value.page = page.pageNum;
-  formSearch.value.pageSizes = page.pageSize;
   formSearch.value.limit = page.pageSize;
   // 分页切换
   getList();
@@ -239,8 +214,6 @@ const changeTableData = () => {
 const handleFormSubmitted = (formData) => {
   // console.log("接收到子组件传递的数据", formData);
   formSearch.value.page = 1;
-  formSearch.value.pageSizes = 20;
-  formSearch.value.total = page.total;
   formSearch.value.limit = 20;
   formSearch.value.nickName = formData.nickName;
   formSearch.value.channelOrigin = formData.channelOrigin;
@@ -261,9 +234,7 @@ const handleFormReset = () => {
     limit: 20,// 当前页数量(查询量)
     nickName: null,// 用户昵称
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
     registryTime: null,// 注册时间
-    total: null,// 总条数
     userType: null,// 用户类型
   };
   getList();
@@ -305,7 +276,7 @@ const edit = (row) => {
     formEdit.value.remark = row.remark
     formEdit.value.status = row.status
     formEdit.value.placementId = row.placementId
-    formEdit.value.appData = appData.value.find(item => item.appId === row.appId);
+    formEdit.value.appData = row.appId;
 
   } else {
     layer.value.title = '新增广告位'
@@ -350,6 +321,7 @@ const rules = reactive({
 });
 
 const submit = async (formEl) => {
+  formEdit.value.appData = findByDitchName(formEdit.value.appData)
   formEdit.value.appId = formEdit.value.appData.appId
   formEdit.value.appName = formEdit.value.appData.appName
   await formEl.validate(async (valid, fields) => {

src/views/main/outBagModule/appAdmin.vue

@@ -353,16 +353,8 @@ const formSearch = ref({
   appName: null,
   channelName: null,
   appType: null,
-
-  limit: 20, // 当前页数量(查询量)
   page: 1, // 当前页码
-  pageSizes: 20, // 总页数
-});
-
-const channelSearch = ref({
   limit: 20, // 当前页数量(查询量)
-  page: 1, // 当前页码
-  pageSizes: 20, // 总页数
 });
 
 const dynamicFormItems = ref([]);
@@ -420,7 +412,6 @@ const getChannelList = async() => {
   let res = await channelList({
     page: 1,
     limit: 999,
-    pageSizes: 999,
   })
 
   channelListData.value.push({
@@ -445,7 +436,6 @@ const getDitchList = async() => {
   let res = await ditchList({
     page: 1,
     limit: 999,
-    pageSizes: 999,
   })
   ditchListData.value = res.data
 }
@@ -463,7 +453,6 @@ const getList = async () => {
 
 const changeTableData = () => {
   formSearch.value.page = page.pageNum;
-  formSearch.value.pageSizes = page.pageSize;
   formSearch.value.limit = page.pageSize;
   // 分页切换
   getList();
@@ -475,9 +464,7 @@ const changeTableData = () => {
 const handleFormSubmitted = (formData) => {
   console.log("接收到子组件传递的数据", formData);
   formSearch.value.page = 1;
-  formSearch.value.pageSizes = 20;
   formSearch.value.limit = 20;
-
   formSearch.value.channelName = formData?.channelName;
   formSearch.value.appName = formData?.appName;
   formSearch.value.appType = formData?.appType;
@@ -491,10 +478,8 @@ const handleFormReset = () => {
     appName: null,
     channelName: null,
     appType: null,
-
-    limit: 20, // 当前页数量(查询量)
     page: 1, // 当前页码
-    pageSizes: 20, // 总页数
+    limit: 20, // 当前页数量(查询量)
   };
   getList();
 };

src/views/main/outBagModule/channelTypeAdmin.vue

@@ -69,10 +69,8 @@ const page = reactive({
 
 const formSearch = ref({
   ditchName: null,
-  limit: 20,// 当前页数量(查询量)
   page: 1,// 当前页码
-  pageSizes: 20,// 总页数
-  total: null,// 总条数
+  limit: 20,// 当前页数量(查询量)
 });
 
 const dynamicFormItems = ref([])
@@ -104,7 +102,6 @@ const getList = async () => {
 
 const changeTableData = () => {
   formSearch.value.page = page.pageNum;
-  formSearch.value.pageSizes = page.pageSize;
   formSearch.value.limit = page.pageSize;
   // 分页切换
   getList();
@@ -114,8 +111,6 @@ const changeTableData = () => {
 const handleFormSubmitted = (formData) => {
   // console.log("接收到子组件传递的数据", formData);
   formSearch.value.page = 1;
-  formSearch.value.pageSizes = 20;
-  formSearch.value.total = page.total;
   formSearch.value.limit = 20;
   formSearch.value.ditchName = formData.ditchName;
 
@@ -126,9 +121,8 @@ const handleFormSubmitted = (formData) => {
 const handleFormReset = () => {
   formSearch.value = {
     ditchName: null,
-    limit: 20,// 当前页数量(查询量)
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
+    limit: 20,// 当前页数量(查询量)
     total: null,// 总条数
   };
 

src/views/main/userModule/relieveLogsList.vue

@@ -107,8 +107,6 @@
 
     limit: 20,// 当前页数量(查询量)
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
-    total: null,// 总条数
   });
 
 
@@ -123,6 +121,11 @@
   const settingData = () => {
     loadDictData().then(async () => {
       dynamicFormItems.value = [
+        {
+          label: '用户ID',
+          prop: 'userId',
+          type: 'input',
+        },
         {
           label: '应用ID',
           prop: 'appId',
@@ -170,7 +173,6 @@
 
   const changeTableData = () => {
     formSearch.value.page = page.pageNum;
-    formSearch.value.pageSizes = page.pageSize;
     formSearch.value.limit = page.pageSize;
     // 分页切换
     getList();
@@ -181,9 +183,6 @@
     // console.log("接收到子组件传递的数据", formData);
     formSearch.value.page = 1;
     formSearch.value.limit = 20;
-    formSearch.value.pageSizes = 20;
-    formSearch.value.total = page.total || null;
-
     formSearch.value.appId = formData.appId;
     formSearch.value.channelId = formData.channelId;
     formSearch.value.channelType = formData.channelType;
@@ -222,8 +221,6 @@
 
       limit: 20,// 当前页数量(查询量)
       page: 1,// 当前页码
-      pageSizes: 20,// 总页数
-      total: null,// 总条数
     };
     getList();
   };

src/views/main/userModule/riskLogsList.vue

@@ -120,8 +120,6 @@
 
     limit: 20,// 当前页数量(查询量)
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
-    total: null,// 总条数
   });
 
 
@@ -136,6 +134,11 @@
   const settingData = () => {
     loadDictData().then(() => {
       dynamicFormItems.value = [
+        {
+          label: '用户ID',
+          prop: 'userId',
+          type: 'input',
+        },
         {
           label: '应用ID',
           prop: 'appId',
@@ -177,7 +180,6 @@
 
   const changeTableData = () => {
     formSearch.value.page = page.pageNum;
-    formSearch.value.pageSizes = page.pageSize;
     formSearch.value.limit = page.pageSize;
 
     // 分页切换
@@ -188,8 +190,6 @@
   const handleFormSubmitted = (formData) => {
     console.log("接收到子组件传递的数据", formData.appId);
     formSearch.value.page = 1;
-    formSearch.value.pageSizes = 20;
-    formSearch.value.total = page.total || null;
     formSearch.value.limit = 20;
 
     formSearch.value.appId = formData.appId;
@@ -222,8 +222,6 @@
 
       limit: 20,// 当前页数量(查询量)
       page: 1,// 当前页码
-      pageSizes: 20,// 总页数
-      total: null,// 总条数
     };
 
     getList();

src/views/main/userModule/userList.vue

@@ -147,17 +147,15 @@
   });
 
   const formSearch = ref({
-    channelOrigin: null,// 渠道来源
-    channelType: null,// 渠道类型
-    lastLoginTime: '',// 最新登录时间
+    channelOrigin: undefined,// 渠道来源
+    channelType: undefined,// 渠道类型
+    lastLoginTime: undefined,// 最新登录时间
     limit: 20,// 当前页数量(查询量)
-    nickName: null,// 用户昵称
-    userId: null,// 用户ID
+    nickName: undefined,// 用户昵称
+    userId: undefined,// 用户ID
     page: 1,// 当前页码
-    pageSizes: 20,// 总页数
-    registryTime: null,// 注册时间
-    total: null,// 总条数
-    userType: null,// 用户类型
+    registryTime: undefined,// 注册时间
+    userType: undefined,// 用户类型
   });
 
   const dynamicFormItems = ref([])
@@ -214,7 +212,6 @@
 
   const changeTableData = () => {
     formSearch.value.page = page.pageNum;
-    formSearch.value.pageSizes = page.pageSize;
     formSearch.value.limit = page.pageSize;
 
     console.log('page',page)
@@ -226,8 +223,6 @@
   const handleFormSubmitted = (formData) => {
     // console.log("接收到子组件传递的数据", formData);
     formSearch.value.page = 1;
-    formSearch.value.pageSizes = 20;
-    formSearch.value.total = page.total;
     formSearch.value.limit = 20;
     formSearch.value.nickName = formData.nickName;
     formSearch.value.userId = formData.userId;
@@ -243,16 +238,15 @@
   // 表单重置
   const handleFormReset = () => {
     formSearch.value = {
-      channelOrigin: null,// 渠道来源
-      channelType: null,// 渠道类型
-      lastLoginTime: null,// 最新登录时间
+      channelOrigin: undefined,// 渠道来源
+      channelType: undefined,// 渠道类型
+      lastLoginTime: undefined,// 最新登录时间
       limit: 20,// 当前页数量(查询量)
-      nickName: null,// 用户昵称
+      nickName: undefined,// 用户昵称
+      userId: undefined,// 用户ID
       page: 1,// 当前页码
-      pageSizes: 20,// 总页数
-      registryTime: null,// 注册时间
-      total: null,// 总条数
-      userType: null,// 用户类型
+      registryTime: undefined,// 注册时间
+      userType: undefined,// 用户类型
     };
     getList();
   };