From fc4f26063137e08b777703bced33bbff1d0ab44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 3 Apr 2023 15:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/MyBenefits/MyBenefits.js    | 17 +++++++++
 pages.json                      | 18 +++++-----
 pages/MyBenefits/MyBenefits.vue | 63 +++++++++++++++++++++++++--------
 pages/upicker/u-picker.vue      |  2 +-
 4 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 api/MyBenefits/MyBenefits.js

diff --git a/api/MyBenefits/MyBenefits.js b/api/MyBenefits/MyBenefits.js
new file mode 100644
index 0000000..c2d6983
--- /dev/null
+++ b/api/MyBenefits/MyBenefits.js
@@ -0,0 +1,17 @@
+import request from "../request.js"
+
+//个人中心 我的收益  金额
+export function personRevenue(nurseStationPersonId, monthStartTime, monthEndTime) {
+	return request({
+		url: `/nurseApplet/personCenter/personRevenue?nurseStationPersonId=${nurseStationPersonId}&&monthStartTime=${monthStartTime}&&monthEndTime=${monthEndTime}`,
+		method: 'GET'
+	})
+}
+
+// 个人中心 我的收益  订单列表分页
+export function personRevenueDetails(nurseStationPersonId, monthStartTime, monthEndTime) {
+	return request({
+		url: `/nurseApplet/personCenter/personRevenueDetails?nurseStationPersonId=${nurseStationPersonId}&&monthStartTime=${monthStartTime}&&monthEndTime=${monthEndTime}`,
+		method: 'GET',
+	})
+}
diff --git a/pages.json b/pages.json
index b3d0370..4fad2ab 100644
--- a/pages.json
+++ b/pages.json
@@ -6,10 +6,16 @@
 		{
 			"path": "pages/startup/startup",
 			"style": {
-				"navigationBarTitleText": "启动页",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom"
 			}
-		},{
+		}, {
+			"path": "pages/MyBenefits/MyBenefits",
+			"style": {
+				"navigationBarTitleText": "我的收益",
+				"enablePullDownRefresh": false
+			}
+		}, {
 			"path": "pages/Modifyinformation/Modifyinformation",
 			"style": {
 				"navigationBarTitleText": "修改信息",
@@ -22,13 +28,7 @@
 				"navigationBarTitleText": "个人信息",
 				"navigationStyle": "custom"
 			}
-		},{
-			"path": "pages/MyBenefits/MyBenefits",
-			"style": {
-				"navigationBarTitleText": "我的收益",
-				"enablePullDownRefresh": false
-			}
-		},  {
+		}, {
 			"path": "pages/Mymission/Mymission",
 			"style": {
 				"navigationBarTitleText": "我的工单",
diff --git a/pages/MyBenefits/MyBenefits.vue b/pages/MyBenefits/MyBenefits.vue
index 7e52759..068eec6 100644
--- a/pages/MyBenefits/MyBenefits.vue
+++ b/pages/MyBenefits/MyBenefits.vue
@@ -10,7 +10,7 @@
 				本月收益(元）
 			</view>
 			<view class="center">
-				2000.00
+				{{toppricerlist.monthOrderTotalPrice}}
 			</view>
 			<view class="bottom">
 				<view class="bottomitem">
@@ -18,7 +18,7 @@
 						今日收益(元)
 					</view>
 					<view class="price">
-						180
+						{{toppricerlist.todayOrderPrice}}
 					</view>
 				</view>
 				<view class="bottomitem">
@@ -26,22 +26,22 @@
 						累计总收益(元)
 					</view>
 					<view class="price">
-						10000.00
+						{{toppricerlist.orderTotalPrice}}
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="list">
-			<view class="item">
+			<view class="item" v-for="(item,index) in Detailslist" :key="index">
 				<view class="time">
-					03.27 8:00-12:00
+					{{item.serviceDate}} {{item.serviceStartTime}}
 				</view>
 				<view class="border"></view>
 				<view class="title">
-					陪诊（省立医院）
+					{{item.nurseItemName}}
 				</view>
 				<view class="price">
-					+ 20.00
+					+ {{item.revenueAmount}}
 				</view>
 			</view>
 		</view>
@@ -55,7 +55,7 @@
 				</view>
 				<view class="upiker">
 					<upicker mode="time" v-model="timeshow" :params="timeparams" v-if="timeindex==0" start-year='2023'
-						:end-year='newyear'>
+						:end-year='newyear' @confirm='timeconfirm'>
 					</upicker>
 				</view>
 				<view class="ucalendar">
@@ -70,6 +70,10 @@
 <script>
 	import ucalendar from '../ucalendar/u-calendar.vue'
 	import upicker from '../upicker/u-picker.vue'
+	import {
+		personRevenue,
+		personRevenueDetails
+	} from '@/api/MyBenefits/MyBenefits.js'
 	export default {
 		components: {
 			ucalendar,
@@ -77,8 +81,9 @@
 		},
 		data() {
 			return {
+				nursePersonId: 35, //护理员id
 				tiemmask: false, //遮罩层
-				timeparams: {
+				timeparams: { //时间picker
 					year: true,
 					month: true,
 					day: false,
@@ -86,24 +91,50 @@
 					minute: false,
 					second: false
 				},
-				timeshow: false,
-				timetablist: [{
+				timeshow: false, //时间遮罩层
+				timetablist: [{ //切换
 					name: '月份选择'
 				}, {
 					name: '自定义'
 				}, ],
-				timeindex: 0,
+				timeindex: 0, //切换绑定的index
 				tiemshow: false, //选择时间开关
 				newtime: null, //开局月份
 				newyear: null, //当前年份
+				monthStartTime: '', //开始时间
+				monthEndTime: '', //结束时间
+				toppricerlist: {}, //toplist
+				Detailslist: [], //详细
 			};
 		},
 		onShow() {
 			this.nowtime();
+			this.personRevenueinfo();
+			this.personRevenueDetailsinfo();
 		},
 		methods: {
+			//收益详细
+			personRevenueDetailsinfo() {
+				personRevenueDetails(this.nursePersonId, this.monthStartTime, this.monthEndTime).then(res => {
+					this.Detailslist = res.data
+				})
+			},
+			//我的收益
+			personRevenueinfo() {
+				personRevenue(this.nursePersonId, this.monthStartTime, this.monthEndTime).then(res => {
+					this.toppricerlist = res.data
+				})
+			},
+			//选择时间
+			timeconfirm(e) {
+				this.tiemmask = false
+				this.newtime = e.year + '.' + e.month
+				this.monthStartTime = e.year + '-' + e.month
+			},
 			ucalendarchange(e) {
-				console.log(e)
+				this.tiemmask = false
+				this.newtime = e.startYear + '.' +
+					e.startMonth + '.' + e.startDay + ' - ' + e.endYear + '.' + e.endMonth + '.' + e.endDay
 			},
 			//time
 			timechange(index) {
@@ -124,8 +155,12 @@
 					//获取当前日期
 				};
 				//拼接
+				if (date.month < 10) {
+					this.newtime = date.year + ".0" + date.month
+				} else {
+					this.newtime = date.year + "." + date.month
+				}
 				this.newyear = date.year
-				this.newtime = date.year + "." + date.month
 			},
 		}
 	}
diff --git a/pages/upicker/u-picker.vue b/pages/upicker/u-picker.vue
index c33ba98..d0277a6 100644
--- a/pages/upicker/u-picker.vue
+++ b/pages/upicker/u-picker.vue
@@ -85,7 +85,7 @@
 					</view>
 				</picker-view-column>
 			</picker-view>
-			<view class="btn">
+			<view class="btn" @tap="getResult('confirm')">
 				确定
 			</view>
 		</view>