修改用户列表筛选使用登录时间

src/views/main/userModule/components/ecpmDialog.vue

@@ -123,7 +123,7 @@ const changeTableData = (type) => {
 // 搜索
 const handleFormSubmitted = (formData) => {
     console.log("接收到子组件传递的数据", formData);
-    formSearch.value.adsourceType = formData.adsourceType;
+    formSearch.value.adsourceType = formData.adsourceType === '' ? undefined : formData.adsourceType;
     formSearch.value.loginStatus = formData.loginStatus || undefined;
 
     getList();

src/views/main/userModule/userList.vue

@@ -40,16 +40,20 @@
           </template>
         </el-table-column> -->
         <el-table-column prop="ditchName" label="渠道来源" width="150" />
-        <el-table-column prop="todayVideo" label="今日视频播放数" width="130" />
+        <el-table-column prop="todayVideo" label="当日视频播放数" width="130" />
         <el-table-column prop="totalVideo" label="视频播放总数" width="110" />
         <el-table-column prop="nearlyIncome" label="前三日总收益" width="110">
           <template #default="scope">{{
             roundPrice(scope.row.nearlyIncome, 3)
           }} </template>
         </el-table-column>
-        <el-table-column prop="totalIncome" label="用户贡献（当日/总共）" sortable width="200">
+        <el-table-column prop="totalIncome" label="用户当日贡献" sortable width="140">
+          <template #default="scope">
+            {{ roundPrice(scope.row.todayIncome === 0 ? '0.000' : scope.row.todayIncome ?? '0.000', 3) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalIncome" label="用户总贡献" sortable width="140">
           <template #default="scope">
-            {{ roundPrice(scope.row.todayIncome === 0 ? '0.000' : scope.row.todayIncome ?? '0.000', 3) }} /
             {{ roundPrice(scope.row.totalIncome === 0 ? '0.000' : scope.row.totalIncome ?? '0.000', 3) }}
           </template>
         </el-table-column>
@@ -194,10 +198,12 @@ const formSearch = ref({
   ditchId: undefined,// 渠道来源
   userStatus: 1,// 用户状态
   appIds: undefined, //所属应用
-  registryTimeBegin: getTodayRangeLocal(),// 注册时间
-  registryTimeEnd: undefined,// 注册时间
+  // registryTimeBegin: getTodayRangeLocal(),// 注册时间
+  // registryTimeEnd: undefined,// 注册时间
   page: 1,// 当前页码
   limit: 20,// 当前页数量(查询量)
+  lastLoginTimeBegin: getTodayRangeLocal(), //最新登录时间开始
+  lastLoginTimeEnd:undefined //最新登录时间结束
 });
 
 const dynamicFormItems = ref([])
@@ -243,8 +249,8 @@ const settingData = async () => {
         defaultVal: 1,
         options: getOptions('user_status'),
       },
-      { label: '注册时间开始', prop: 'registryTimeBegin', type: 'date', defaultVal: getTodayRangeLocal() },
-      { label: '注册时间结束', prop: 'registryTimeEnd', type: 'date' },
+      { label: '登录时间开始', prop: 'lastLoginTimeBegin', type: 'date', defaultVal: getTodayRangeLocal() },
+      { label: '登录时间结束', prop: 'lastLoginTimeEnd', type: 'date' },
     ]
 
     // 设置动态选项
@@ -349,8 +355,8 @@ const handleFormSubmitted = (formData) => {
   formSearch.value.ditchId = formData.ditchId;
   formSearch.value.userStatus = formData.userStatus;
   formSearch.value.appIds = formData.appIds;
-  formSearch.value.registryTimeBegin = convertUTCToBeijing(formData.registryTimeBegin, false) || undefined
-  formSearch.value.registryTimeEnd = convertUTCToBeijing(formData.registryTimeEnd, false) || undefined
+  formSearch.value.lastLoginTimeBegin = convertUTCToBeijing(formData.lastLoginTimeBegin, false) || undefined
+  formSearch.value.lastLoginTimeEnd = convertUTCToBeijing(formData.lastLoginTimeEnd, false) || undefined
 
   getList(0);
 };
@@ -363,10 +369,12 @@ const handleFormReset = () => {
     ditchId: undefined,// 渠道来源
     userStatus: 1,// 用户状态
     appIds: undefined, //所属应用
-    registryTimeBegin: getTodayRangeLocal(),// 注册时间
-    registryTimeEnd: undefined,// 注册时间
+    // registryTimeBegin: getTodayRangeLocal(),// 注册时间
+    // registryTimeEnd: undefined,// 注册时间
     page: 1,// 当前页码
     limit: 20,// 当前页数量(查询量)
+    lastLoginTimeBegin: getTodayRangeLocal(), //最新登录时间开始
+    lastLoginTimeEnd:undefined //最新登录时间结束
   };
 
   page.pageNum = 1