From 6bd0f53c7bafe8936d608a6fe5a93c2ac3d83e07 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 23 Nov 2024 11:16:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=85=BC=E5=AE=B9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts        |  2 +-
 src/pages/work/user/index.vue | 64 ++++++++++++++++++++---------------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index f70a4db..f3d439c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -173,7 +173,7 @@ export interface UserPageQuery extends PageQuery {
   deptId?: number;
 
   /** 开始时间 */
-  createTime?: [string, string];
+  createTime?: [string, string] | string | undefined;
 
   /** 排序字段 */
   field?: string;
diff --git a/src/pages/work/user/index.vue b/src/pages/work/user/index.vue
index 9017990..09dcf76 100644
--- a/src/pages/work/user/index.vue
+++ b/src/pages/work/user/index.vue
@@ -1,26 +1,28 @@
 <template>
   <view class="user">
     <!-- 排序筛选 -->
-    <wd-drop-menu>
-      <wd-drop-menu-item v-model="sortValue" :options="sortOptions" @change="handleSortChange" />
-      <wd-drop-menu-item ref="dropMenuRef" title="筛选">
-        <view>
-          <wd-input
-            v-model="queryParams.keywords"
-            label="关键字"
-            placeholder="用户名/昵称/手机号"
-          />
-          <wd-datetime-picker v-model="createTimeRange" type="date" label="创建时间" />
-          <view class="flex-between py-2">
-            <wd-button class="w-20%" type="info" @click="hendleResetQuery">重置</wd-button>
-            <wd-button class="w-70%" @click="handleQuery">确定</wd-button>
+    <view class="mb-24rpx">
+      <wd-drop-menu>
+        <wd-drop-menu-item v-model="sortValue" :options="sortOptions" @change="handleSortChange" />
+        <wd-drop-menu-item ref="dropMenuRef" title="筛选">
+          <view>
+            <wd-input
+              v-model="queryParams.keywords"
+              label="关键字"
+              placeholder="用户名/昵称/手机号"
+            />
+            <wd-datetime-picker v-model="createTimeRange" type="date" label="创建时间" />
+            <view class="flex-between py-2">
+              <wd-button class="w-20%" type="info" @click="hendleResetQuery">重置</wd-button>
+              <wd-button class="w-70%" @click="handleQuery">确定</wd-button>
+            </view>
           </view>
-        </view>
-      </wd-drop-menu-item>
-    </wd-drop-menu>
+        </wd-drop-menu-item>
+      </wd-drop-menu>
+    </view>
 
     <!-- 用户卡片 -->
-    <wd-card v-for="item in dataList" class="user-card">
+    <wd-card v-for="item in dataList">
       <template #title>
         <view class="flex-between">
           <view class="flex-center">
@@ -111,7 +113,6 @@ import DeptAPI from "@/api/system/dept";
 import VutPicker from "@/components/VutPicker.vue";
 
 const message = useMessage();
-// 加载状态 loading, finished:, error
 const state = ref<LoadMoreState>("loading");
 const dataList = ref<UserPageVO[]>([]);
 
@@ -126,7 +127,7 @@ const queryParams: UserPageQuery = {
   pageSize: 10,
 };
 
-const createTimeRange = ref<any[]>([, Date.now()]);
+const createTimeRange = ref<any[]>([null, null]);
 
 const dropMenuRef = ref();
 
@@ -203,11 +204,20 @@ const handleQuery = () => {
   dropMenuRef.value?.close();
   queryParams.pageNum = 1;
 
-  queryParams.createTime = [
-    createTimeRange.value[0] ? dayjs(createTimeRange.value[0]).format("YYYY-MM-DD") : "",
-    createTimeRange.value[1] ? dayjs(createTimeRange.value[1]).format("YYYY-MM-DD") : "",
-  ];
-  console.log(queryParams.createTime);
+  // 格式化时间范围
+  const startDate = createTimeRange.value[0]
+    ? dayjs(createTimeRange.value[0]).format("YYYY-MM-DD")
+    : "";
+  const endDate = createTimeRange.value[1]
+    ? dayjs(createTimeRange.value[1]).format("YYYY-MM-DD")
+    : "";
+
+  queryParams.createTime = [startDate, endDate];
+
+  // #ifdef MP-WEIXIN
+  queryParams.createTime = `${startDate},${endDate}`;
+  // #endif
+
   loadmore();
 };
 
@@ -218,7 +228,7 @@ const hendleResetQuery = () => {
   dropMenuRef.value?.close();
   queryParams.pageNum = 1;
   queryParams.keywords = "";
-  createTimeRange.value = ["", Date.now()];
+  createTimeRange.value = ["", ""];
   loadmore();
 };
 
@@ -311,12 +321,10 @@ onLoad(() => {
 </script>
 
 <style lang="scss" scoped>
-.user-card {
-  margin-top: 20rpx;
+.user {
   :deep(.wd-cell__wrapper) {
     padding: 4rpx 0;
   }
-
   :deep(.wd-cell) {
     padding-right: 10rpx;
     background: #f8f8f8;