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

src/pages/SchoolReport/SchoolReport.vue

@@ -268,13 +268,14 @@
 						</view>
 						<view class="school-report-context-card-eight-details">
 							<view class="consumer-details-header">
-								<view v-for="item in consumerDetailsHeaderList" class="consumer-details-header-item">
+								<view v-for="(item,index) in consumerDetailsHeaderList" :key="index"
+									class="consumer-details-header-item">
 									<text>{{item}}</text>
 								</view>
 							</view>
 							<view v-if="isOpen" class="consumer-details-body-box">
 								<view v-for="(item,index) in campusConsumerDetailObj.campusConsumerDetailList"
-									class="consumer-details-body"
+									:key="index" class="consumer-details-body"
 									:style="{background:Number.isInteger(index/2)?'#FFFFFF':'#F8F8F7'}">
 									<view class="consumer-details-body-item" v-for="(e,i) in item.consumerDetailsArr"
 										:class="i?'':'consumer-details-body-data'">
@@ -286,14 +287,14 @@
 								<view class="consumer-details-body" style="background: #FFFFFF;">
 									<view class="consumer-details-body-item"
 										v-for="(e,i) in campusConsumerDetailObj.campusConsumerDetailList[0].consumerDetailsArr"
-										:class="i?'':'consumer-details-body-data'">
+										:key="i" :class="i?'':'consumer-details-body-data'">
 										<text>{{e}}</text>
 									</view>
 								</view>
 								<view class="consumer-details-body" style="background: #F8F8F7;">
 									<view class="consumer-details-body-item"
 										v-for="(e,i) in campusConsumerDetailObj.campusConsumerDetailList[1].consumerDetailsArr"
-										:class="i?'':'consumer-details-body-data'">
+										:key="i" :class="i?'':'consumer-details-body-data'">
 										<text>{{e}}</text>
 									</view>
 								</view>
@@ -313,11 +314,12 @@
 								v-if="isOpen&&campusConsumerDetailObj.campusConsumerDetailList.length<=7">
 							</view>
 							<view v-if="isOpen"
-								v-for="item in campusConsumerDetailObj.campusConsumerDetailCalculateList"
-								class="consumer-details-sum">
+								v-for="(item,index) in campusConsumerDetailObj.campusConsumerDetailCalculateList"
+								:key="index" class="consumer-details-sum">
 								<view v-for="(e,i) in item.consumerDetailsSumArr" class="consumer-details-sum-item"
-									:class="i?'':'consumer-details-sum-type'">
+									:key="i" :class="i?'':'consumer-details-sum-type'">
 									<text :style="{color:item.calculateType=='较上月'?trendColorList[i]:''}"> {{e}} </text>
+									<template v-if="i ==0"><span class="type-unit">{{unitTypeList[index]}}</span></template>
 								</view>
 							</view>
 						</view>
@@ -1217,6 +1219,7 @@
 					notCateringNumber: '', //未就餐次数
 				},
 				trendColorList: [],
+				unitTypeList: ['(次)', '(次)', '(元)', '', '(元)'],
 				// 就餐情况
 				diningSituations: {
 					diningSituationsDate: '',
@@ -2596,7 +2599,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 								.sortCalculateType);
 							let tmpColorList = [''];
 							this.campusConsumerDetailObj.campusConsumerDetailCalculateList.forEach((e, index) => {
-								e.calculateType = ['就餐(次)', '未就餐(次)', '均值(元)', '较上月', '总计(元)'][e
+								e.calculateType = ['就餐', '未就餐', '均值', '较上月', '总计'][e
 									.calculateType -
 									1
 								];
@@ -2657,7 +2660,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 						this.campusConsumerDetailObj.campusConsumerDetailList = JSON.parse(JSON.stringify(
 							tmpDetailList));
 						let tmpCalculatList = [];
-						let calculateTypeList = ['就餐(次)', '未就餐(次)', '均值(元)', '较上月', '总计(元)'];
+						let calculateTypeList = ['就餐', '未就餐', '均值', '较上月', '总计'];
 						calculateTypeList.forEach(e => {
 							tmpCalculatList.push({
 								"calculateType": e,
@@ -5162,7 +5165,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 									font-family: PingFangSC-Regular, PingFang SC;
 									font-weight: 400;
 									color: rgba(0, 0, 0, 0.45);
-									text-align: left;
+									display: inline-block;
+									position: absolute;
 								}
 							}