From 802d33db8f4376bf0bb06815801d419bcb08dd71 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 27 Feb 2024 17:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=92=B1=E5=8C=85=E5=92=8C?=
 =?UTF-8?q?=E5=BA=97=E9=95=BF=E8=AE=A2=E5=8D=95=E7=BB=86=E8=8A=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news/user/report.vue | 102 ++++++++++++++++++++++---------------
 pages/news1/wallet.vue     |  63 ++++++++++++++---------
 pages/news3/shopOrder.vue  |  10 ++--
 3 files changed, 105 insertions(+), 70 deletions(-)

diff --git a/pages/news/user/report.vue b/pages/news/user/report.vue
index d3e46fa..03f200b 100644
--- a/pages/news/user/report.vue
+++ b/pages/news/user/report.vue
@@ -9,28 +9,25 @@
 				<view class="title">订单数据</view>
 				<view class="info">
 					<view class="item">
-						订单金额<text>¥867.00</text>
+						订单金额<text>¥{{infor.orderData.orderMoney}}</text>
 					</view>
 					<view class="item">
-						订单数<text>23</text>
+						订单数<text>{{infor.orderData.orderCount}}</text>
 					</view>
 					<view class="item">
-						支持人数<text>23</text>
+						支持人数<text>{{infor.orderData.orderPayUser}}</text>
 					</view>
 					<view class="item">
-						订单金额<text>¥867.00</text>
+						总成本金额<text>¥{{infor.orderData.orderCostMoney}}</text>
 					</view>
 					<view class="item">
-						总成本金额<text>¥867.00</text>
+						预估利益<text>¥{{infor.orderData.orderInterest}}</text>
 					</view>
 					<view class="item">
-						预估利益<text>¥867.00</text>
+						付费会员数<text>{{infor.orderData.payMemberCount}}</text>
 					</view>
 					<view class="item">
-						付费会员数<text>200</text>
-					</view>
-					<view class="item">
-						付费分销数<text>200</text>
+						付费分销数<text>{{infor.orderData.payDealerCount}}</text>
 					</view>
 				</view>
 			</view>
@@ -38,10 +35,10 @@
 				<view class="title">退款数据</view>
 				<view class="info">
 					<view class="item">
-						退款单数<text>23</text>
+						退款单数<text>{{infor.refundData.refundCount}}</text>
 					</view>
 					<view class="item">
-						退款金额<text>¥867.00</text>
+						退款金额<text>¥{{infor.refundData.refundTotalMoney}}</text>
 					</view>
 				</view>
 			</view>
@@ -49,13 +46,13 @@
 				<view class="title">用户数据</view>
 				<view class="info">
 					<view class="item">
-						访客数<text>23</text>
+						访客数<text>{{infor.userData.visitorCount}}</text>
 					</view>
 					<view class="item">
-						浏览量<text>56</text>
+						浏览量<text>{{infor.userData.viewCount}}</text>
 					</view>
 					<view class="item">
-						新增用户数<text>23</text>
+						新增用户数<text>{{infor.userData.newUserCount}}</text>
 					</view>
 				</view>
 			</view>
@@ -73,35 +70,32 @@
 			</view>
 			<view class="c" :style="{'opacity': (startTime||dateIndex>-1)?1:0.6 }" @click="quantityFilter">筛选</view>
 		</view>
-		<u-calendar v-model="isShow" mode="range" @change="getTime" range-color='#F34A40' range-bg-color='#FFBDBA'
-			active-bg-color='#F34A40'></u-calendar>
+		<u-calendar v-model="isShow" mode="range" @change="getTime" range-color='#FF6257' range-bg-color='#FFBDBA'
+			active-bg-color='#FF6257'></u-calendar>
 		<view class="report-bd" v-if="tabIndex == 1">
 			<view class="module1">
 				<view class="title">订单数据</view>
 				<view class="info">
 					<view class="item">
-						订单金额<text>¥867.00</text>
-					</view>
-					<view class="item">
-						订单数<text>23</text>
+						订单金额<text>¥{{infor.orderData.orderMoney}}</text>
 					</view>
 					<view class="item">
-						支持人数<text>23</text>
+						订单数<text>{{infor.orderData.orderCount}}</text>
 					</view>
 					<view class="item">
-						订单金额<text>¥867.00</text>
+						支持人数<text>{{infor.orderData.orderPayUser}}</text>
 					</view>
 					<view class="item">
-						总成本金额<text>¥867.00</text>
+						总成本金额<text>¥{{infor.orderData.orderCostMoney}}</text>
 					</view>
 					<view class="item">
-						预估利益<text>¥867.00</text>
+						预估利益<text>¥{{infor.orderData.orderInterest}}</text>
 					</view>
 					<view class="item">
-						付费会员数<text>200</text>
+						付费会员数<text>{{infor.orderData.payMemberCount}}</text>
 					</view>
 					<view class="item">
-						付费分销数<text>200</text>
+						付费分销数<text>{{infor.orderData.payDealerCount}}</text>
 					</view>
 				</view>
 			</view>
@@ -109,10 +103,10 @@
 				<view class="title">退款数据</view>
 				<view class="info">
 					<view class="item">
-						退款单数<text>23</text>
+						退款单数<text>{{infor.refundData.refundCount}}</text>
 					</view>
 					<view class="item">
-						退款金额<text>¥867.00</text>
+						退款金额<text>¥{{infor.refundData.refundTotalMoney}}</text>
 					</view>
 				</view>
 			</view>
@@ -120,13 +114,13 @@
 				<view class="title">用户数据</view>
 				<view class="info">
 					<view class="item">
-						访客数<text>23</text>
+						访客数<text>{{infor.userData.visitorCount}}</text>
 					</view>
 					<view class="item">
-						浏览量<text>56</text>
+						浏览量<text>{{infor.userData.viewCount}}</text>
 					</view>
 					<view class="item">
-						新增用户数<text>23</text>
+						新增用户数<text>{{infor.userData.newUserCount}}</text>
 					</view>
 				</view>
 			</view>
@@ -134,10 +128,10 @@
 				<view class="title">佣金数据</view>
 				<view class="info">
 					<view class="item">
-						累计佣金已结算金额<text>23</text>
+						累计佣金已结算金额<text>{{infor.commissionData.settleTotalMoney}}</text>
 					</view>
 					<view class="item">
-						累计佣金结算金额<text>23</text>
+						累计佣金结算金额<text>{{infor.commissionData.nosettleTotalMoney}}</text>
 					</view>
 				</view>
 			</view>
@@ -161,7 +155,31 @@
 				isShow: false,
 				startTime: '',
 				endTime: '',
-				recentDate: ''
+				recentDate: '',
+				infor: {
+					orderData: {
+						orderMoney: 135,
+						orderCount: 362,
+						orderPayUser: 324,
+						orderCostMoney: 475,
+						orderInterest: 50,
+						payMemberCount: 60,
+						payDealerCount: 83,
+					},
+					refundData: {
+						refundCount: 350,
+						refundTotalMoney: 240,
+					},
+					userData: {
+						visitorCount: 240,
+						viewCount: 750,
+						newUserCount: 120,
+					},
+					commissionData: {
+						settleTotalMoney: 290,
+						nosettleTotalMoney: 345,
+					}
+				}
 			}
 		},
 		onLoad() {
@@ -254,8 +272,8 @@
 
 <style lang="scss" scoped>
 	::v-deep .u-btn--primary {
-		background-color: #FC3E27 !important;
-		border-color: #FC3E27;
+		background-color: #FF6257 !important;
+		border-color: #FF6257;
 	}
 
 	.report {
@@ -334,7 +352,7 @@
 			.c {
 				width: 100%;
 				line-height: 88rpx;
-				background: #F34A40;
+				background: #FF6257;
 				border-radius: 88rpx;
 				font-size: 28rpx;
 				font-weight: 500;
@@ -352,7 +370,7 @@
 			.module1 {
 				width: 100%;
 				height: 504rpx;
-				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 20%);
 				border-radius: 10rpx;
 				padding: 25rpx 20rpx;
 				box-sizing: border-box;
@@ -390,7 +408,7 @@
 				width: 100%;
 				height: 246rpx;
 				margin-top: 20rpx;
-				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 30%);
 				border-radius: 10rpx;
 				padding: 25rpx 20rpx;
 				box-sizing: border-box;
@@ -428,7 +446,7 @@
 				width: 100%;
 				height: 246rpx;
 				margin-top: 20rpx;
-				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 30%);
 				border-radius: 10rpx;
 				padding: 25rpx 20rpx;
 				box-sizing: border-box;
@@ -466,7 +484,7 @@
 				width: 100%;
 				height: 246rpx;
 				margin-top: 20rpx;
-				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 30%);
 				border-radius: 10rpx;
 				padding: 25rpx 20rpx;
 				box-sizing: border-box;
diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue
index 1c9cd2c..38a0288 100644
--- a/pages/news1/wallet.vue
+++ b/pages/news1/wallet.vue
@@ -74,8 +74,8 @@
 					<text class="line"></text>
 				</view>
 			</view>
-			<u-calendar v-model="timeShow" mode="range" @change="getTime" range-color='#F34A40' range-bg-color='#FFBDBA'
-				active-bg-color='#F34A40'></u-calendar>
+			<u-calendar v-model="timeShow" mode="range" @change="getTime" range-color='#FF6257' range-bg-color='#FFBDBA'
+				active-bg-color='#FF6257'></u-calendar>
 			<u-dropdown class="dropdownStyle" ref="dropdown1" height="100" title-size='28' active-color="#464646"
 				@open="dropOpen" @close="dropClose">
 				<u-dropdown-item title="筛选" @update:modelValue="open()">
@@ -83,9 +83,13 @@
 						<view class="slotItem">
 							<view class="title">时间</view>
 							<view class="timecontainer">
-								<u-input disabled border v-model="start_at" placeholder="开始日期" @click="onTime(1)" />
-								<text style="margin:0 20rpx;">-</text>
-								<u-input border disabled v-model="end_at" placeholder="结束日期" @click="onTime(2)" />
+								<view class="selectTime" @click="timeShow = true">
+									{{start_at?start_at:'开始日期'}}
+								</view>
+								<text>-</text>
+								<view class="selectTime" @click="timeShow = true">
+									{{end_at?end_at:'结束日期'}}
+								</view>
 							</view>
 						</view>
 
@@ -234,10 +238,6 @@
 			getTime(e) {
 				this.start_at = e.startDate;
 				this.end_at = e.endDate;
-				console.log(this.start_at)
-			},
-			onTime(index) {
-				this.timeShow = true
 			},
 			cashOut() {
 				// 立即提现
@@ -255,19 +255,6 @@
 	}
 </script>
 <style lang="scss" scoped>
-	::v-deep .u-btn--primary {
-		background-color: #FC3E27 !important;
-		border-color: #FC3E27;
-	}
-
-	::v-deep .u-dropdown__content__mask {
-		background: #fff !important;
-	}
-
-	::v-deep .u-empty {
-		padding: 100rpx 0;
-	}
-
 	page {
 		// min-height: calc(100vh);
 		min-height: 100%;
@@ -486,6 +473,7 @@
 
 						.timecontainer {
 							display: flex;
+							justify-content: center;
 							align-items: center;
 						}
 
@@ -567,7 +555,7 @@
 				text-align: center !important;
 				background-color: #F3F4F6 !important;
 				border-color: #F3F4F6 !important;
-				width:40rpx !important;
+				width: 40rpx !important;
 				padding: 0 70rpx !important;
 			}
 
@@ -740,4 +728,33 @@
 			}
 		}
 	}
+
+	.selectTime {
+		width: 288rpx;
+		height: 70rpx;
+		background: #F3F3F3;
+		border-radius: 44rpx;
+		text-align: center;
+		line-height: 70rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 28rpx;
+		color: #A1A1A1;
+		font-style: normal;
+		text-transform: none;
+		margin: 0 15rpx;
+	}
+
+	::v-deep .u-btn--primary {
+		background-color: #FF6257 !important;
+		border-color: #FF6257;
+	}
+
+	::v-deep .u-dropdown__content__mask {
+		background: #fff !important;
+	}
+
+	::v-deep .u-empty {
+		padding: 100rpx 0;
+	}
 </style>
diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue
index f748de4..0464175 100644
--- a/pages/news3/shopOrder.vue
+++ b/pages/news3/shopOrder.vue
@@ -131,8 +131,8 @@
 				</view>
 			</view>
 		</u-popup>
-		<u-calendar v-model="timeShow" mode="range" @change="getTime" range-color='#F34A40' range-bg-color='#FFBDBA'
-			active-bg-color='#F34A40'></u-calendar>
+		<u-calendar v-model="timeShow" mode="range" @change="getTime" range-color='#FF6257' range-bg-color='#FFBDBA'
+			active-bg-color='#FF6257'></u-calendar>
 		<u-popup v-model="afterSale" width="80%" border-radius="10" :closeable="true" mode="center">
 			<view class="afterSales">
 				<view class="filterTitle">
@@ -172,7 +172,7 @@
 			</view>
 		</u-popup>
 		<u-modal v-model="deleteShow" :show-cancel-button="true" :closable='false' @cancel="deleteShow=false"
-			@confirm="handleOk" title="确认删除订单？" confirm-color="#F55349">
+			@confirm="handleOk" title="确认删除订单？" confirm-color="#FF6257">
 			<view class="slot-content order-modal">
 				<view class="content">删除之后订单无法恢复，无法处理您的售后问题 ，请慎重考虑</view>
 				<view class="desc" @click="toggleImage()">
@@ -460,8 +460,8 @@
 
 <style scoped lang="scss">
 	::v-deep .u-btn--primary {
-		background-color: #FC3E27 !important;
-		border-color: #FC3E27;
+		background-color: #FF6257 !important;
+		border-color: #FF6257;
 	}
 
 	::v-deep .u-mask-zoom,