更新

src/api/modules/message.ts

@@ -33,10 +33,10 @@ export const getInfo = params => {
     { params }
   );
 };
-export const getUserList = () => {
+export const getUserList = params => {
   return http.request<Result>(
     "get",
-    "/adminapi/User/get_user_list"
+    "/adminapi/User/get_user_list", { params }
   );
 };
 export const getRoomList = () => {

src/views/message/hook.tsx

@@ -89,12 +89,12 @@ export function useData() {
     searchForm.value = { ...formData }
     const { data, code } = await queryList({
       ...formData,
-      pageNum: pagination.value.currentPage,
+      page: pagination.value.currentPage,
-      pageSize: pagination.value.pageSize
+      page_limit: pagination.value.pageSize
     });
     if (code) {
       tableList.value = data.lists;
-      pagination.value.total = data.totalRow;
+      pagination.value.total = data.count;
       pagination.value.currentPage = data.pageNumber;
     }
     loading.value = false;

src/views/message/selectUser.vue

@@ -8,23 +8,24 @@ function getRef() {
   return selectUserList.value;
 }
 const searchLabel = ref([
-  { label: "用户ID", prop: "user_id", type: "input" }
+  { label: "用户ID", prop: "user_code", type: "input" }
 ]);
 const searchForm = ref({})
 const multipleTable = ref(null)
 const onSearch = (formData) => {
-
+  userList.value = []
+  selectUserList.value = []
+  getAllUserList(formData)
 }
 const props = defineProps(["userList"]);
-const getAllUserList = async () => {
+const getAllUserList = async (form) => {
-  const { code, data } = await getUserList()
+  const { code, data } = await getUserList({ ...form })
   userList.value = code ? data : []
   setTimeout(() => {
     if (userList.value.length) {
       userList.value.forEach(ele => {
         const listData = props.userList.map(e => { return Number(e) })
         if (listData.includes(ele.id)) {
-          selectUserList.value.push()
           multipleTable.value.toggleRowSelection(ele, true)
         }
       })
@@ -35,7 +36,7 @@ function handleSelectionChange(val) {
   selectUserList.value = val
 }
 onMounted(() => {
-  getAllUserList()
+  getAllUserList(searchForm.value)
 })
 defineExpose({ getRef });
 </script>

src/views/welcome/modules/statistics.vue

@@ -6,7 +6,7 @@ const statisticsData = []
 const titleData = [
   {
     name: "今日收入金额",
-    tip: "总已支付金额",
+    tip: "总计已支付金额",
     prop: 'today_money',
     tipProp: 'all_money'
   },
@@ -24,13 +24,13 @@ const titleData = [
   }, {
     name: "周实时收入金额",
     tip: "上周实时收入金额",
-    prop: 'today_wait_pay',
+    prop: 'week_money',
-    tipProp: 'all_wait_pay'
+    tipProp: 'last_week_money'
   }, {
     name: "月实时收入金额",
     tip: "上月实时收入金额",
-    prop: 'today_wait_pay_num',
+    prop: 'month_money',
-    tipProp: 'all_wait_pay_num'
+    tipProp: 'last_month_money'
   }
 ]
 if (props.allData) {