From b2c242d375fca946d9194d22317c0050d0b4e980 Mon Sep 17 00:00:00 2001
From: fox <1466778434@qq.com>
Date: Sat, 22 Mar 2025 17:53:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages_order/mine/runningWater.vue                  | 255 ++++++++-------------
 pages_order/mine/withdraw.vue                      |   2 +-
 pages_order/static/runningWater/icon-arrow.png     | Bin 0 -> 597 bytes
 .../static/runningWater/icon-commission.png        | Bin 0 -> 3768 bytes
 4 files changed, 91 insertions(+), 166 deletions(-)
 create mode 100644 pages_order/static/runningWater/icon-arrow.png
 create mode 100644 pages_order/static/runningWater/icon-commission.png

diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue
index 089c18d..e9b1351 100644
--- a/pages_order/mine/runningWater.vue
+++ b/pages_order/mine/runningWater.vue
@@ -1,86 +1,51 @@
 <template>
-	<view class="running-water">
+	<view class="page">
 		<!-- 导航栏 -->
-		<navbar title="流水记录" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
-
-		<view class="bg"></view>
-
-		<view class="money-info-wrapper">
-			<view class="money-info">
-				<view class="total-brokerage">
-					<view class="title">总佣金</view>
-					<view class="total-money">￥{{ totalMoney }}</view>
-					<!-- <view class="btn">
-						<view @click="$utils.navigateTo('/pages_order/mine/withdraw')" class="">
-							提现
-						</view>
-					</view> -->
-				</view>
-
-				<view class="total-withdraw">
-					<view class="title">累计提现</view>
-					<view class="total-money">￥{{ totalWithdraw }}</view>
-					<!-- <view class="btn">
-						<view class="">
-							提现记录
-						</view>
-					</view> -->
-				</view>
-			</view>
+		<navbar title="提现记录" leftClick @leftClick="$utils.navigateBack" color="#fff" />
+
+		<view class="tools">
+			<uv-datetime-picker 
+				ref="datetimePicker" 
+				v-model="selectedTime" 
+				mode="year-month" 
+				@confirm="onTimeChange"
+			></uv-datetime-picker>
+			<button plain class="flex btn" @click="openTimePicker">
+				<text>{{ displaySelectedTime }}</text>
+				<image class="btn-icon" src="../static/runningWater/icon-arrow.png" mode="widthFix"></image>
+			</button>
 		</view>
 
-		<view class="date-select">
-			<!-- <view class="select-title">
-				金额明细
-			</view> -->
-			<view class="year-info"
-			@click="openCalendars">
-				<view class="time-unit">
-					<!-- format('YYYY-MM-DD HH:mm:ss') -->
-					{{ $dayjs(beforeDate).format('YYYY') }}年
-					<uv-icon name="arrow-down-fill"></uv-icon>
-				</view>
-				<view class="time-unit">
-					{{ $dayjs(beforeDate).format('MM') }}月
-					<uv-icon name="arrow-down-fill"></uv-icon>
+		<view class="card list">
+			<template v-if="list.length">
+				<view class="flex list-item" 
+					v-for="(item, index) in list"
+					:key="index"
+				>
+					<image class="list-item-icon" src="../static/runningWater/icon-commission.png" mode="widthFix"></image>
+					<view class="list-item-info">
+						<view class="highlight">佣金提现</view>
+						<view>{{ item.createTime }}</view>
+					</view>
+					<view class="list-item-value">{{ `-${item.money}` }}</view>
 				</view>
-				<text class="interval">至</text>
-				<view class="time-unit">
-					{{ $dayjs(afterDate).format('YYYY') }}年
-					<uv-icon name="arrow-down-fill"></uv-icon>
-				</view>
-				<view class="time-unit">
-					{{ $dayjs(afterDate).format('MM') }}月
-					<uv-icon name="arrow-down-fill"></uv-icon>
-				</view>
-			</view>
-		</view>
-
-		<view class="tab-box">
-			<view class="tab-box1">
-				<uv-cell center border :title="item.title" v-for="(item, index) in list" :key="index"
-					:value="x[item.type] + item.money" :label="item.createTime" />
-			</view>
-
-			<view style="padding: 100rpx 0;" v-if="list.length == 0">
+			</template>
+			<template v-else>
 				<uv-empty mode="history" textSize="28rpx" iconSize="100rpx" />
-			</view>
+			</template>
 		</view>
 
-		<Calendars ref="calendars" @select="handleSelectCalendars"></Calendars>
 	</view>
 </template>
 
 <script>
 	import mixinsList from "@/mixins/list.js"
-	import Calendars from "@/components/calendars/index.vue"
 	export default {
 		mixins: [mixinsList],
-		components: {
-			Calendars
-		},
 		data() {
 			return {
+				selectedTime: new Date(),
+
 				x: ['+', '-', '-', '+'],
 				mixinsListApi: "getWaterPageList",
 				beforeDate: new Date(), //开始日期
@@ -90,6 +55,11 @@
 				totalWithdraw : 0,
 			}
 		},
+		computed: {
+			displaySelectedTime() {
+				return this.$dayjs(this.selectedTime).format("YYYY年M月")
+			}
+		},
 		methods: {
 			//打开日历
 			openCalendars() {
@@ -117,120 +87,75 @@
 				this.list = result.page.records
 				this.total = result.page.total
 			},
+
+			openTimePicker() {
+				this.$refs.datetimePicker.open();
+			},
+			onTimeChange(e) {
+				// todo
+				console.log('--onTimeChange', e)
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.running-water {
-		width: 750rpx;
-		background: #F5F5F5;
-		margin: 0 auto;
+	.page {
+		background-color: $uni-bg-color;
 		min-height: 100vh;
-
-		.bg {
-			background: $uni-color;
-			padding: 100rpx 0rpx;
-			box-sizing: border-box;
+				
+		/deep/ .nav-bar__view {
+			background-image: linear-gradient(#84A73F, #D8FF8F);
 		}
+	}
 
-		.money-info-wrapper {
-			padding: 0rpx 20rpx;
-			box-sizing: border-box;
-			background: white;
-			height: 130rpx;
-
-			.money-info {
-				display: flex;
-				flex-wrap: wrap;
-				background: white;
-				border-radius: 20rpx;
-				overflow: hidden;
-				transform: translateY(-60%);
-				box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, .1);
-
-				.total-brokerage,
-				.total-withdraw {
-					width: 50%;
-					text-align: center;
-					padding: 20rpx 0rpx;
-
-					.title {
-						font-size: 34rpx;
-					}
-
-					.total-money {
-						color: $uni-color;
-						font-size: 36rpx;
-						margin: 20rpx 0rpx;
-					}
-
-					.btn {
-						display: flex;
-						justify-content: center;
-						align-items: center;
-
-						view {
-							width: 40%;
-							border: 1px solid $uni-color;
-							padding: 10rpx;
-							color: $uni-color;
-							border-radius: 10rpx;
-						}
-					}
-				}
+	.tools {
+		background-color: $uni-fg-color;
+		padding: 25rpx 42rpx;
+
+		.btn {
+			display: inline-block;
+			border: none;
+			color: #000000;
+			font-size: 28rpx;
+			line-height: 40rpx;
+
+			&-icon {
+				width: 28rpx;
+				height: 28rpx;
+				margin-left: 12rpx;
 			}
 		}
+	}
+	
+	.list {
+		margin: 9rpx 13rpx;
+		padding: 31rpx 20rpx;
+
+		&-item {
+			padding-bottom: 19rpx;
+			border-bottom: 1rpx solid #E0E0E0;
+			margin-bottom: 20rpx;
+			font-size: 28rpx;
+
+			&-icon {
+				width: 56rpx;
+				height: auto;
+				margin-right: 10rpx;
+			}
 
-		.date-select {
-			padding: 0rpx 20rpx;
-			box-sizing: border-box;
-			background: white;
-			padding-bottom: 20rpx;
-			display: flex;
-			justify-content: center;
-
-			.select-title {}
-
-			.year-info {
-				display: flex;
-				color: $uni-color;
-				font-size: 26rpx;
-
-				.time-unit {
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					border: 1px solid $uni-color;
-					margin: 0rpx 10rpx;
-					border-radius: 10rpx;
-					box-sizing: border-box;
-					padding: 7rpx 12rpx;
-
-					&::v-deep .uv-icon {
-						display: flex;
-						align-items: center;
-					}
-
-					&::v-deep .uv-icon__icon {
-						color: $uni-color !important;
-						margin-left: 5rpx;
-						font-size: 20rpx !important;
-					}
-				}
+			&-info {
+				flex: 1;
+				color: #949494;
 
-				.interval {
-					display: flex;
-					align-items: center;
+				.highlight {
+					color: #333333;
 				}
 			}
-		}
 
-		.tab-box {
-			margin: 20rpx;
-			background-color: #fff;
-			border-radius: 20rpx;
-			overflow: hidden;
+			&-value {
+				color: #FF2A2A;
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages_order/mine/withdraw.vue b/pages_order/mine/withdraw.vue
index f5601b3..fe61b4a 100644
--- a/pages_order/mine/withdraw.vue
+++ b/pages_order/mine/withdraw.vue
@@ -15,7 +15,7 @@
 					<view class="flex desc">
 						<!-- todo: 对接接口字段 -->
 						<view>{{ `累积提现：${123 || 0} 元` }}</view>
-						<button plain class="btn">
+						<button plain class="btn" @click="toRunningWater">
 							<text>提现记录</text>
 							<image class="btn-icon" src="@/static/image/center/icon-arrow.png" mode="widthFix"></image>
 						</button>
diff --git a/pages_order/static/runningWater/icon-arrow.png b/pages_order/static/runningWater/icon-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8bdd092ea472a7c7e25f13245edcc4f54bd757b
GIT binary patch
literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%4@pEpR7gwh)JuquVH5`N-yq4oNF*CdDH|-<AjQHh7Rn_X3FVUeH4zaON=fda
zD2kO_rtDnG23aT;lx)O`5*nB9a7Oz3&&)S7|AvKk^?mi8^StMIp7Ye{;8WMZc>V*{
zobkUx=@yK@E<CUKNIx4+!cts`3E!ay9$^|@*BEqM0AUd718_Nx;0x|xCf?TwbR;fg
zI6fBrCkJ3B?8FXy#x=~#@Alvh$;n0+y}x1(t~Q#c8xH2QA8-*%@?u*+`xU;pgo)^k
zMYw>5-(A`VM=?KjJylS<z71&IaURpr6>D)UDg7g92I3@U;4KbeZ!16pAezrb0Pn;8
z9N<Tr$~}z#p*Vx_cv)z?8>dTvMs3Kl7`+Qu9xo`|o)7<3UTyKiMB%Qp7*$aGGz-IR
z&7CmaD)dheY{aX|f~JxtgdU4?7={Oh1`!aqnm}BE%>@(T%zCWGv%>w~$^yo{E|`+^
z4!~_}!u^US3v#Vu*Y4$%537My)3EYEVS?E>QRveP*K?95c`=eHG#-P;g<dO*N8W92
zoyvrF?C3%qPMe42w<gtlFaa-evYVM$O=?{RFp7I(84hGJ-AIQ|&Fo#15!TR>o67=5
zpT5ODtxLx?)<y7dNS#{*E2ClMgTp-A(uJQAJgAQEQl~W&HZ~lLS$LB{AK6>_v<0wq
j^J*9W1GbC4e}dBQ?U7$&SLP$$00000NkvXXu0mjf{aFoK

literal 0
HcmV?d00001

diff --git a/pages_order/static/runningWater/icon-commission.png b/pages_order/static/runningWater/icon-commission.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9092b7acc513d7d7208c1ebf756fda5aa85dc0a
GIT binary patch
literal 3768
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

literal 0
HcmV?d00001