From 1fc8626c5f59f3856f1e58023db5232dba977cb9 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 10 Apr 2025 20:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/flowStatistics.vue  | 16 +---------------
 src/pages/tabbar/individualOrder.vue | 26 ++++++++++++++++++++++++--
 src/static/page/filter.svg           | 15 +++++++++++++++
 3 files changed, 40 insertions(+), 17 deletions(-)
 create mode 100644 src/static/page/filter.svg

diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
index 68095a0..a398ffb 100644
--- a/src/pages/tabbar/flowStatistics.vue
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -29,21 +29,7 @@
 							:quickDate="[]"
 							:drawerSize="900"
 						>
-							<svg
-								t="1742280333491"
-								class="icon"
-								viewBox="0 0 1024 1024"
-								version="1.1"
-								xmlns="http://www.w3.org/2000/svg"
-								p-id="4288"
-								width="16"
-								height="14"
-							>
-								<path
-									d="M568.552727 954.181818a86.341818 86.341818 0 0 1-41.425454-10.472727l-114.269091-62.836364a86.574545 86.574545 0 0 1-44.916364-76.101818V442.181818a16.989091 16.989091 0 0 0-6.981818-13.730909L97.047273 218.298182 93.090909 214.807273A85.876364 85.876364 0 0 1 155.927273 69.818182h711.214545A86.574545 86.574545 0 0 1 930.909091 214.807273l-3.490909 3.490909-266.24 213.410909a17.454545 17.454545 0 0 0-6.050909 13.730909v422.4A86.341818 86.341818 0 0 1 568.552727 954.181818zM141.963636 166.632727l262.283637 209.454546A85.178182 85.178182 0 0 1 437.061818 442.181818v362.589091a17.92 17.92 0 0 0 8.610909 15.592727l114.269091 62.138182a17.687273 17.687273 0 0 0 17.687273 0 17.221818 17.221818 0 0 0 8.378182-15.36V445.44a85.876364 85.876364 0 0 1 31.883636-67.258182l263.214546-211.549091a17.687273 17.687273 0 0 0 1.62909-18.152727 17.454545 17.454545 0 0 0-15.592727-8.843636H155.927273a17.221818 17.221818 0 0 0-13.963637 27.694545zM920.669091 512h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z m0 128.930909h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z m0 128h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z"
-									p-id="4289"
-								/>
-							</svg>
+							<image class="w-[30rpx] h-[30rpx]" src="@/static/page/filter.svg" />
 							<text class="ml-1 text-30">筛选</text>
 						</tm-between-time>
 					</view>
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 1eff5c6..bb7a0fb 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -15,8 +15,20 @@
 		>
 			<template #top>
 				<view class="h-30rpx" />
-				<view class="bg-white rounded-16rpx px-20rpx">
+				<view class="flex justify-between items-center bg-white rounded-16rpx px-20rpx">
 					<z-tabs :list="tabs" @change="tabChange" />
+					<tm-between-time
+						start="2020-1-1"
+						end="2050-1-1"
+						v-model="state.date"
+						v-model:model-str="state.formatVal"
+						@confirm="datePickerConfirm"
+						format="YYYY-MM-DD"
+						:quickDate="[]"
+						:drawerSize="900"
+					>
+						<view class="w-100rpx text-center second-text-28 text-30 mb-4rpx">筛选</view>
+					</tm-between-time>
 				</view>
 			</template>
 
@@ -221,7 +233,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from "vue"
+import { ref, reactive, computed } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 import { hooks, router } from "@@/index"
 import { filePath } from "@@/utils/file"
@@ -238,13 +250,17 @@ const tabs = [
 const state = reactive<any>({
 	pa: {
 		orderStatus: tabs[0].id,
+		createTimeList: [],
 	},
 	showDrawer: false,
 	refundScene: 0,
 	curOrder: {},
 	refundDetail: {},
 	remark: "",
+	date: "",
+	formatVal: "",
 })
+const formatVal = computed(() => (state.date.length === 2 ? state.formatVal : ""))
 
 const pageHook = hooks.usePage(pageRef, individualOrderApi.page, null, "data.records")
 
@@ -272,6 +288,12 @@ const query = (page: number, pagesize: number) => {
 	pageHook.startPage(page, pagesize, false, state.pa)
 }
 
+// 时间范围选择器确认
+const datePickerConfirm = (date: any) => {
+	state.pa.createTimeList = formatVal.value.split("~")
+	pageRef.value.reload(false)
+}
+
 // 重置状态
 const resetState = () => {
 	state.refundScene = 0
diff --git a/src/static/page/filter.svg b/src/static/page/filter.svg
new file mode 100644
index 0000000..5a5d603
--- /dev/null
+++ b/src/static/page/filter.svg
@@ -0,0 +1,15 @@
+<svg
+    t="1742280333491"
+    class="icon"
+    viewBox="0 0 1024 1024"
+    version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    p-id="4288"
+    width="16"
+    height="16"
+>
+    <path
+        d="M568.552727 954.181818a86.341818 86.341818 0 0 1-41.425454-10.472727l-114.269091-62.836364a86.574545 86.574545 0 0 1-44.916364-76.101818V442.181818a16.989091 16.989091 0 0 0-6.981818-13.730909L97.047273 218.298182 93.090909 214.807273A85.876364 85.876364 0 0 1 155.927273 69.818182h711.214545A86.574545 86.574545 0 0 1 930.909091 214.807273l-3.490909 3.490909-266.24 213.410909a17.454545 17.454545 0 0 0-6.050909 13.730909v422.4A86.341818 86.341818 0 0 1 568.552727 954.181818zM141.963636 166.632727l262.283637 209.454546A85.178182 85.178182 0 0 1 437.061818 442.181818v362.589091a17.92 17.92 0 0 0 8.610909 15.592727l114.269091 62.138182a17.687273 17.687273 0 0 0 17.687273 0 17.221818 17.221818 0 0 0 8.378182-15.36V445.44a85.876364 85.876364 0 0 1 31.883636-67.258182l263.214546-211.549091a17.687273 17.687273 0 0 0 1.62909-18.152727 17.454545 17.454545 0 0 0-15.592727-8.843636H155.927273a17.221818 17.221818 0 0 0-13.963637 27.694545zM920.669091 512h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z m0 128.930909h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z m0 128h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z"
+        p-id="4289"
+    />
+</svg>
\ No newline at end of file