1.修改时间;

src/pages/ConsumptionReport/ConsumptionReport.vue

@@ -20,8 +20,9 @@
 					<view class="consumption-report-info">
 						<view class="consumption-report-data">
 							<view class="consumer-list">
-								<picker @change="dataRangeChange" :value="dataRangeIndex" :range="dataRangeArr">
-									<view class="uni-input">{{dataRangeArr[dataRangeIndex]}}</view>
+								<picker @change="dataRangeChange" :value="dataRangeIndex" :range="dataRangeArr"
+									range-key="week">
+									<view class="uni-input">{{dataRangeArr[dataRangeIndex].week||""}}</view>
 								</picker>
 							</view>
 						</view>
@@ -103,11 +104,13 @@
 					<view class="average-daily-consumption">
 						<view class="average-daily-consumption-item">
 							<text>¥</text>
-							<text class="average-daily-consumption-item-num">{{dayConsumerTrend.userWeekAvgAmount}}</text>
+							<text
+								class="average-daily-consumption-item-num">{{dayConsumerTrend.userWeekAvgAmount}}</text>
 						</view>
 						<view class="average-daily-consumption-item average-daily-consumption-item-orange">
 							<text>¥</text>
-							<text class="average-daily-consumption-item-num">{{dayConsumerTrend.classWeekAvgAmount}}</text>
+							<text
+								class="average-daily-consumption-item-num">{{dayConsumerTrend.classWeekAvgAmount}}</text>
 						</view>
 					</view>
 					<view class="average-daily-consumption-contrast">
@@ -466,16 +469,18 @@
 		}
 		return (false);
 	}
+	// 时间处理模块
+	import dayjs from 'dayjs'
 	export default {
 		name: 'ConsumptionReport',
 		data() {
 			return {
 				consumerNameIndex: 0,
 				dataRangeIndex: 0,
-				consumerNameArr: [],	// 学生姓名列表
-				consumerInfo:[],	//家长关联的学生信息
-				specifiedConsumerInfo:{},	//选择学生的信息
-				dayConsumerTrend:{},	//日消费趋势数据
+				consumerNameArr: [], // 学生姓名列表
+				consumerInfo: [], //家长关联的学生信息
+				specifiedConsumerInfo: {}, //选择学生的信息
+				dayConsumerTrend: {}, //日消费趋势数据
 				// 日期范围列表
 				dataRangeArr: ['12月06日~12月12日', '11月29日~12月05日', '11月22日~11月28日'],
 				// 日消费趋势图表数据
@@ -503,43 +508,59 @@
 			}
 		},
 		mounted() {
-			this.queryPatriarchByStudent().then(()=>{
+			this.queryPatriarchByStudent().then(() => {
 				this.queryDayConsumerTrend()
 			})
 			this.getDataRangeArr()
+
+			let tmpArr = []
+			// 获取时间
+			for (let i = 1; i <= 4; i++) {
+				let startWeek = dayjs().subtract(i, 'week').startOf('week').add(1, 'day');
+				let endWeek = dayjs().subtract(i, 'week').endOf('week').add(1, 'day');
+				// console.warn("一周开始-----", dayjs().subtract(i, 'week').startOf('week').add(1, 'day').format("YYYY年MM月DD日"))
+				// console.warn("一周结束-----", dayjs().subtract(i, 'week').endOf('week').add(1, 'day').format("YYYY年MM月DD日"))
+				tmpArr.push({
+					week: (startWeek.format("YYYY年MM月DD日")) + '~' + (endWeek.format("YYYY年MM月DD日")),
+					startDate: startWeek.format("YYYY-MM-DD"),
+					endDate: endWeek.format("YYYY-MM-DD")
+				})
+			}
+			this.dataRangeArr = tmpArr
 		},
 		methods: {
 			consumerChange(e) {
 				this.consumerNameIndex = e.target.value
-				this.specifiedConsumerInfo=this.consumerInfo[this.consumerNameIndex]
+				this.specifiedConsumerInfo = this.consumerInfo[this.consumerNameIndex]
 				this.queryDayConsumerTrend()
 			},
 			dataRangeChange(e) {
 				this.dataRangeIndex = e.target.value
+				this.queryDayConsumerTrend()
 			},
 			// 获取当前日期
-			getNowFormatDate(){
-				var date=new Date()
-				var seperator='-'
-				var year=date.getFullYear()
-				var month=date.getMonth()+1
-				var day=date.getDate()
-				if(month>=1&&month<=9){
-					month='0'+month
+			getNowFormatDate() {
+				var date = new Date()
+				var seperator = '-'
+				var year = date.getFullYear()
+				var month = date.getMonth() + 1
+				var day = date.getDate()
+				if (month >= 1 && month <= 9) {
+					month = '0' + month
 				}
-				if(day>=1&&day<=9){
-					day='0'+day
+				if (day >= 1 && day <= 9) {
+					day = '0' + day
 				}
-				var currentdate=year+seperator+month+seperator+day
+				var currentdate = year + seperator + month + seperator + day
 				return currentdate
 			},
 			// 获取日期范围列表
-			getDataRangeArr(){
+			getDataRangeArr() {
 				console.log(this.getNowFormatDate())
 			},
 			// 查询家长关联的学生
 			queryPatriarchByStudent() {
-				let this_=this
+				let this_ = this
 				return new Promise((resolve, reject) => {
 					$.ajax({
 						url: gHost + '/report-push/student-consumer-report/queryPatriarchByStudent',
@@ -547,13 +568,14 @@
 						dataType: 'json',
 						contentType: 'application/x-www-form-urlencoded',
 						data: {
-							phone:getQueryParams('phone')
+							phone: getQueryParams('phone')
 						},
 						success: function(res) {
-							if(res.code==200){
-								this_.consumerNameArr=res.obj.map(element=>element.name)
-								this_.consumerInfo=res.obj
-								this_.specifiedConsumerInfo=this_.consumerInfo[this_.consumerNameIndex]
+							if (res.code == 200) {
+								this_.consumerNameArr = res.obj.map(element => element.name)
+								this_.consumerInfo = res.obj
+								this_.specifiedConsumerInfo = this_.consumerInfo[this_
+									.consumerNameIndex]
 							}
 							resolve()
 						},
@@ -564,35 +586,53 @@
 				})
 			},
 			// 查询周要点，消费金额
-			
+
 			// 日消费趋势
-			queryDayConsumerTrend(){
-				let this_=this
-				return new Promise((resolve, reject) => {
-					$.ajax({
-						url: gHost + '/report-push/student-consumer-report/queryDayConsumerTrend',
-						type: 'get',
-						dataType: 'json',
-						contentType: 'application/x-www-form-urlencoded',
-						data: {
-							userId:this_.specifiedConsumerInfo.id,
-							schoolId:this_.specifiedConsumerInfo.schoolid,
-							startDate:'2021-12-06',
-							endDate:'2021-12-12'
-						},
-						success: function(res) {
-							if(res.code==200){
-								this_.dayConsumerTrend=res.obj
-								this_.dailyConsumptionData=Object.values(this_.dayConsumerTrend.dayConsumerMap).reverse()
-								this_.dailyConsumptionDate=Object.keys(this_.dayConsumerTrend.dayConsumerMap).map(element=>element.substr(5).replace('-','/')).reverse()
+			async queryDayConsumerTrend() {
+				let this_ = this
+				try {
+					await new Promise((resolve, reject) => {
+						$.ajax({
+							url: gHost + '/report-push/student-consumer-report/queryDayConsumerTrend',
+							type: 'get',
+							dataType: 'json',
+							contentType: 'application/x-www-form-urlencoded',
+							data: {
+								userId: this_.specifiedConsumerInfo.id || "",
+								schoolId: this_.specifiedConsumerInfo.schoolid || "",
+								startDate: this_.dataRangeArr[this_.dataRangeIndex] ? this_
+									.dataRangeArr[this_.dataRangeIndex].startDate : "",
+								endDate: this_.dataRangeArr[this_.dataRangeIndex] ? this_.dataRangeArr[
+									this_.dataRangeIndex].endDate : "",
+							},
+							success: function(res) {
+								if (res.code == 200) {
+									this_.dayConsumerTrend = res.obj
+									this_.dailyConsumptionData = Object.values(this_
+										.dayConsumerTrend
+										.dayConsumerMap).reverse()
+									this_.dailyConsumptionDate = Object.keys(this_.dayConsumerTrend
+										.dayConsumerMap).map(element => element.substr(5)
+										.replace(
+											'-',
+											'/')).reverse()
+									resolve()
+									return
+								}
+								reject(res.message)
+							},
+							error: function(error) {
+								reject(error)
 							}
-							resolve()
-						},
-						error: function(error) {
-							reject(error)
-						}
+						})
 					})
-				})
+				} catch (e) {
+					console.warn(e)
+					//TODO handle the exception
+					uni.showModal({
+						content: e.message
+					})
+				}
 			},
 		}
 	}