Merge branch 'V1.5.24_feature' of...

Merge branch 'V1.5.24_feature' of https://git.xiaopay.net/lizhishu/xzf_uniapp-wechat-web into V1.5.24_feature

# Conflicts:
#	src/pages/ConsumptionReport/ConsumptionReport.vue

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>
@@ -468,6 +469,8 @@
 		}
 		return (false);
 	}
+	// 时间处理模块
+	import dayjs from 'dayjs'
 	export default {
 		name: 'ConsumptionReport',
 		data() {
@@ -512,6 +515,21 @@
 				this.queryStudentConsumerPreference()
 			})
 			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) {
@@ -521,6 +539,7 @@
 			},
 			dataRangeChange(e) {
 				this.dataRangeIndex = e.target.value
+				this.queryDayConsumerTrend()
 			},
 			// 获取当前日期
 			getNowFormatDate() {
@@ -570,108 +589,53 @@
 				})
 			},
 			// 查询周要点，消费金额
-			queryWeekConsumerAmout() {
-				let this_ = this
-				return new Promise((resolve, reject) => {
-					$.ajax({
-						url: gHost + '/report-push/student-consumer-report/queryWeekConsumerAmout',
-						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_.weekConsumerAmout = res.obj
-								this_.weekConsumerTrend(this_.weekConsumerAmout.compareStatus)
-							}
-							resolve()
-						},
-						error: function(error) {
-							reject(error)
-						}
-					})
-				})
-			},
-			// 周消费趋势箭头
-			weekConsumerTrend(compareStatus) {
-				switch (compareStatus) {
-					case 0:
-						this.condition = ''
-						this.trendimg = '../../static/images/trend0.png'
-						return
-					case 1:
-						this.condition = '+'
-						this.trendimg = '../../static/images/trend.png'
-						return
-					case 2:
-						this.condition = '-'
-						this.trendimg = '../../static/images/trend2.png'
-						return
-				}
-			},
+
 			// 日消费趋势
-			queryDayConsumerTrend() {
+			async queryDayConsumerTrend() {
 				let this_ = this
-				return new Promise((resolve, reject) => {
+				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: '2021-12-06',
-							endDate: '2021-12-12'
+								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
+									this_.dailyConsumptionData = Object.values(this_
+										.dayConsumerTrend
 										.dayConsumerMap).reverse()
 									this_.dailyConsumptionDate = Object.keys(this_.dayConsumerTrend
-									.dayConsumerMap).map(element => element.substr(5).replace('-',
+										.dayConsumerMap).map(element => element.substr(5)
+										.replace(
+											'-',
 											'/')).reverse()
-							}
 									resolve()
-						},
-						error: function(error) {
-							reject(error)
-						}
-					})
-				})
-			},
-			// 查询学生消费偏好类型
-			queryStudentConsumerPreference() {
-				let this_ = this
-				return new Promise((resolve, reject) => {
-					$.ajax({
-						url: gHost + '/report-push/student-consumer-report/queryStudentConsumerPreference',
-						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_.consumptionPreferencesData=res.obj
+									return
 								}
-							resolve()
+								reject(res.message)
 							},
 							error: function(error) {
 								reject(error)
 							}
 						})
 					})
+				} catch (e) {
+					console.warn(e)
+					//TODO handle the exception
+					uni.showModal({
+						content: e.message
+					})
+				}
 			},
 			// 消费偏好百分比
 			consumerPreferencePercent(num){