From a47986702331b290b3837bcea28663d9d43a689c Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Sat, 27 Sep 2025 17:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchForm/index.vue       | 6 +++---
 src/components/exportDialog/index.vue     | 5 +++--
 src/views/Financial/Recharge/hook.tsx     | 2 +-
 src/views/Statistical/giftRecord/hook.tsx | 5 +++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue
index d374ea0..ec64d9b 100644
--- a/src/components/SearchForm/index.vue
+++ b/src/components/SearchForm/index.vue
@@ -12,11 +12,11 @@
         </el-select>
         <!-- 时间 -->
         <el-date-picker v-if="item.type === 'date'" clearable v-model="form[item.prop]" :disabled-date="disabledDate"
-          type="date" class="!w-[160px]" :placeholder="`请选择${item.label}`" format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD" />
+          type="datetime" class="!w-[160px]" :placeholder="`请选择${item.label}`" format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss" />
         <!-- 时间范围  daterange-->
         <el-date-picker :disabled-date="disabledDate" v-if="item.type === 'daterange'" format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD" v-model="form[item.prop]" type="daterange" range-separator="至"
+          value-format="YYYY-MM-DD" v-model="form[item.prop]" type="datetime" range-separator="至"
           start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
diff --git a/src/components/exportDialog/index.vue b/src/components/exportDialog/index.vue
index 9894ad1..8d6bbeb 100644
--- a/src/components/exportDialog/index.vue
+++ b/src/components/exportDialog/index.vue
@@ -25,8 +25,9 @@ defineExpose({ getRef });
 <template>
   <el-form ref="ruleFormRef" :model="newFormInline" :rules="formRules" label-width="120px">
     <el-form-item label="选择时间" prop="time">
-      <el-date-picker v-model="newFormInline.time" format="YYYY-MM-DD" :disabled-date="disabledDate"
-        value-format="YYYY-MM-DD" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+      <el-date-picker v-model="newFormInline.time" format="YYYY-MM-DD HH:mm:ss" :disabled-date="disabledDate"
+        value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+        end-placeholder="结束日期">
       </el-date-picker>
     </el-form-item>
   </el-form>
diff --git a/src/views/Financial/Recharge/hook.tsx b/src/views/Financial/Recharge/hook.tsx
index 0c4931d..934c40e 100644
--- a/src/views/Financial/Recharge/hook.tsx
+++ b/src/views/Financial/Recharge/hook.tsx
@@ -51,7 +51,7 @@ export function useData() {
     // { label: "总收入（￥）", prop: "total_money" },
     { label: "未支付（￥）", prop: "unpaid_money" },
     {
-      label: "zongs（￥）", prop: "paid_money"
+      label: "总收入（￥）", prop: "paid_money"
     },
     { label: "微信支付（￥）", prop: "wx_money" },
     { label: "支付宝支付（￥）", prop: "ali_money" },
diff --git a/src/views/Statistical/giftRecord/hook.tsx b/src/views/Statistical/giftRecord/hook.tsx
index 83968dc..a4e349c 100644
--- a/src/views/Statistical/giftRecord/hook.tsx
+++ b/src/views/Statistical/giftRecord/hook.tsx
@@ -159,6 +159,11 @@ export function useData() {
         const exportData = async (formData) => {
           const { data, code } = await queryGiftGiveList({
             ...formData,
+            send_user: searchForm.value.send_user,
+            gift_user: searchForm.value.gift_user,
+            from_id: searchForm.value.from_id,
+            gift_id: searchForm.value.gift_id,
+            from: searchForm.value.from,
             page: 1,
             page_limit: 20000
           });