From ce3529d921bec196d263054684d52240438ac73e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sat, 20 Sep 2025 19:13:04 +0800
Subject: [PATCH] 11

---
 src/pages/tabbar/flowStatistics.vue | 40 +++++++-------------
 src/pages/water/waterTotal.vue      | 58 ++++++++++++++---------------
 2 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
index b78b4c3..bbace32 100644
--- a/src/pages/tabbar/flowStatistics.vue
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -1,19 +1,8 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			:fixed="false"
-			height="100%"
-			v-model="pageHook.list"
-			:default-page-size="10"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			@query="query"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-			@scroll="pageHook.scroll"
-		>
+		<z-paging ref="pageRef" :fixed="false" height="100%" v-model="pageHook.list" :default-page-size="10"
+			safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @query="query"
+			:auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false" @scroll="pageHook.scroll">
 			<template #top>
 				<view class="h-30rpx" />
 				<view class="flex items-center justify-between">
@@ -21,16 +10,9 @@
 						<text class="text-30 font-600">流水统计</text>
 						<tm-text color="#999999" font-size="26">{{ formatVal }}</tm-text>
 						<view class="flex items-center cursor-pointer">
-							<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"
-							>
+							<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">
 								<image class="w-[30rpx] h-[30rpx]" src="@/static/page/filter.svg" />
 								<text class="ml-1 text-30">筛选</text>
 							</tm-between-time>
@@ -54,7 +36,8 @@
 					<view class="flex justify-between mb-2">
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
 							<text class="flex-1 text-sm text-center text-gray-600">流水金额</text>
-							<text class="flex-1 text-sm text-center text-gray-800">¥ {{ hooks.useMoney(v.totalPayPrice) }}</text>
+							<text class="flex-1 text-sm text-center text-gray-800">¥ {{ hooks.useMoney(v.totalPayPrice)
+							}}</text>
 						</view>
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
 							<text class="flex-1 text-sm text-center text-gray-600">流水次数</text>
@@ -64,7 +47,9 @@
 					<view class="flex justify-between mb-2">
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
 							<text class="flex-1 text-sm text-center text-gray-600">盈利金额</text>
-							<text class="flex-1 text-sm text-center text-green-500">¥ {{ hooks.useMoney(v.totalProfitPrice) }}</text>
+							<text class="flex-1 text-sm text-center text-green-500">¥ {{
+								hooks.useMoney(v.totalProfitPrice)
+							}}</text>
 						</view>
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
 							<text class="flex-1 text-sm text-center text-gray-600">盈利次数</text>
@@ -74,7 +59,8 @@
 					<view class="flex justify-between mb-0">
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
 							<text class="flex-1 text-sm text-center text-gray-600">退款金额</text>
-							<text class="flex-1 text-sm text-center text-red-500">¥ {{ hooks.useMoney(v.totalRefundPrice) }}</text>
+							<text class="flex-1 text-sm text-center text-red-500">¥ {{
+								hooks.useMoney(v.totalRefundPrice) }}</text>
 						</view>
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
 							<text class="flex-1 text-sm text-center text-gray-600">退款次数</text>
diff --git a/src/pages/water/waterTotal.vue b/src/pages/water/waterTotal.vue
index 92ec53f..22eb968 100644
--- a/src/pages/water/waterTotal.vue
+++ b/src/pages/water/waterTotal.vue
@@ -1,31 +1,16 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			:fixed="false"
-			height="100%"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-		>
+		<z-paging ref="pageRef" :fixed="false" height="100%" safe-area-inset-bottom :loading-more-enabled="true"
+			:show-scrollbar="false" :auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false">
 			<template #top>
 				<view class="h-30rpx" />
 				<view class="bg-white rounded-12rpx p-20rpx flex justify-between items-center">
 					<text class="text-30 font-600">月度流水统计</text>
 					<tm-text color="#999999" font-size="26">{{ formatVal }}</tm-text>
 					<view class="flex items-center cursor-pointer">
-						<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"
-						>
+						<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">
 							<image class="w-[30rpx] h-[30rpx]" src="@/static/page/filter.svg" />
 							<text class="ml-1 text-30">筛选</text>
 						</tm-between-time>
@@ -38,7 +23,8 @@
 			<view v-if="state.waterData.merchantId" class="bg-white rounded-16rpx p-3 mb-2 shadow-md">
 				<view class="flex justify-between items-center text-sm text-gray-800 mb-1">
 					<view class="flex items-center">
-						<image class="w-50rpx h-50rpx rounded-8rpx" :src="filePath(state.waterData.logoPic)" mode="aspectFill" />
+						<image class="w-50rpx h-50rpx rounded-8rpx" :src="filePath(state.waterData.logoPic)"
+							mode="aspectFill" />
 						<view class="ml-2">{{ state.waterData.merchantName }}</view>
 					</view>
 					<view>{{ state.waterData.day }}</view>
@@ -47,31 +33,38 @@
 					<view class="flex justify-between mb-2">
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
 							<text class="flex-1 text-sm text-center text-gray-600">流水金额</text>
-							<text class="flex-1 text-sm text-center text-gray-800">¥ {{ hooks.useMoney(state.waterData.totalPayPrice) }}</text>
+							<text class="flex-1 text-sm text-center text-gray-800">¥ {{
+								hooks.useMoney(state.waterData.totalPayPrice) }}</text>
 						</view>
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
 							<text class="flex-1 text-sm text-center text-gray-600">流水次数</text>
-							<text class="flex-1 text-sm text-center text-gray-800">{{ state.waterData.totalPayCount || 0 }}</text>
+							<text class="flex-1 text-sm text-center text-gray-800">{{ state.waterData.totalPayCount || 0
+							}}</text>
 						</view>
 					</view>
 					<view class="flex justify-between mb-2">
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
 							<text class="flex-1 text-sm text-center text-gray-600">盈利金额</text>
-							<text class="flex-1 text-sm text-center text-green-500">¥ {{ hooks.useMoney(state.waterData.totalProfitPrice) }}</text>
+							<text class="flex-1 text-sm text-center text-green-500">¥ {{
+								hooks.useMoney(state.waterData.totalProfitPrice) }}</text>
 						</view>
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
 							<text class="flex-1 text-sm text-center text-gray-600">盈利次数</text>
-							<text class="flex-1 text-sm text-center text-green-500">{{ state.waterData.totalProfitCount || 0 }}</text>
+							<text class="flex-1 text-sm text-center text-green-500">{{ state.waterData.totalProfitCount
+								|| 0
+							}}</text>
 						</view>
 					</view>
 					<view class="flex justify-between mb-0">
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
 							<text class="flex-1 text-sm text-center text-gray-600">退款金额</text>
-							<text class="flex-1 text-sm text-center text-red-500">¥ {{ hooks.useMoney(state.waterData.totalRefundPrice) }}</text>
+							<text class="flex-1 text-sm text-center text-red-500">¥ {{
+								hooks.useMoney(state.waterData.totalRefundPrice) }}</text>
 						</view>
 						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
 							<text class="flex-1 text-sm text-center text-gray-600">退款次数</text>
-							<text class="flex-1 text-sm text-center text-red-500">{{ state.waterData.totalRefundCount || 0 }}</text>
+							<text class="flex-1 text-sm text-center text-red-500">{{ state.waterData.totalRefundCount ||
+								0 }}</text>
 						</view>
 					</view>
 				</view>
@@ -90,7 +83,10 @@ import { flowStatisticsApi } from "@@/api"
 const pageRef = ref<any>(null)
 const state = reactive<any>({
 	pa: {
-		createTimeList: [hooks.useTime(new Date(), "{y}-{m}-{d}"), hooks.useTime(new Date(), "{y}-{m}-{d}")],
+		createTimeList: [
+			hooks.useTime(new Date(), "{y}-{m}-{d}") + " 00:00:00",
+			hooks.useTime(new Date(), "{y}-{m}-{d}") + " 23:59:59",
+		],
 	},
 	formatVal: "",
 	date: [hooks.useTime(new Date(), "{y}-{m}"), hooks.useTime(new Date(), "{y}-{m}")],
@@ -132,7 +128,11 @@ const getWaterTotalData = async () => {
 // 时间范围选择器确认
 const datePickerConfirm = (date: any) => {
 	if (!formatVal.value) return
-	state.pa.createTimeList = formatVal.value.split("~")
+	const list = formatVal.value.split("~")
+	state.pa.createTimeList = [
+		list[0] + " 00:00:00",
+		list[1] + " 23:59:59",
+	]
 	getWaterTotalData()
 }
 </script>