校园报告文案修改

src/pages/SchoolReport/SchoolReport.vue

@@ -92,7 +92,7 @@
 									</view>
 								</view>
 								<view class="school-report-context-card-one-context-txt">
-									<text v-if="isEatLow">食堂消费占比<text
+									<text v-if="isEatLow">正餐消费占比<text
 											class="txt-important-two">过低</text>,请及时调整饮食习惯</text>
 									<text v-else>饮食较<text class="txt-important-two">均衡</text>，继续保持哦</text>
 								</view>
@@ -103,7 +103,7 @@
 									</view>
 								</view>
 								<view class="school-report-context-card-one-context-txt">
-									消费总额 <text class="txt-important">{{consumerAmountObj.consumerAmount}}</text>元,超过全校
+									消费 <text class="txt-important">{{consumerAmountObj.consumerAmount}}</text>元,超过全校
 									<text class="txt-important">{{consumerAmountObj.exceedRate}}%</text>
 									的同学<text v-if="isReasonable">,请及时评估生活费是否合理</text>
 								</view>
@@ -124,8 +124,9 @@
 						<!-- 门禁报告 -->
 						<view v-show="tabIndex==2" class="attendance-report-context-card-one-context">
 							<view class="attendance-report-context-card-one-context-item">
-								<text v-if="attendanceReport.abnormalNum">共<text
+								<text v-if="attendanceReport.abnormalNum&&attendanceReport.abnormalNum!=-1">共<text
 										class="txt-important">{{attendanceReport.abnormalNum}}</text>天出勤异常，请及时关注</text>
+								<text v-else-if="attendanceReport.abnormalNum==-1">风雨无阻上学路,继续加油哦</text>
 								<text v-else>恭喜<text
 										class="txt-important">{{userInfo.userName}}</text>荣获全勤好学生，风雨无阻上学路</text>
 							</view>
@@ -139,8 +140,7 @@
 								</view>
 								<view class="pubTalk-report-context-card-one-context-txt">
 									<text>最喜欢和<text class="txt-important">{{pubTalkReport.talkText1}}</text>沟通，共通话<text
-											class="txt-important">{{pubTalkReport.talkText2}}次
-											{{pubTalkReport.talkText3}}分钟</text>，超过全校<text
+											class="txt-important">{{pubTalkReport.talkText2}}次{{pubTalkReport.talkText3}}分钟</text>，超过全校<text
 											class="txt-important">{{pubTalkReport.talkText4}}</text>的同学</text>
 								</view>
 							</view>
@@ -160,8 +160,7 @@
 								</view>
 								<view class="pubTalk-report-context-card-one-context-txt">
 									<text>跟<text class="txt-important">{{pubTalkReport.talkText5}}</text>沟通最少，共通话<text
-											class="txt-important">{{pubTalkReport.talkText6}}次
-											{{pubTalkReport.talkText7}}分钟</text>，超过全校<text
+											class="txt-important">{{pubTalkReport.talkText6}}次{{pubTalkReport.talkText7}}分钟</text>，超过全校<text
 											class="txt-important">{{pubTalkReport.talkText8}}</text>的同学</text>
 								</view>
 							</view>
@@ -190,7 +189,7 @@
 						<view class="school-report-context-card-two-conclusion">
 							<view class="school-report-context-card-two-conclusion-txt">
 								<text>本{{['月','周'][reportTypeIndex]}}共<text
-										class="abnormal-days">{{diningSituations.notRepastDay}}</text>天就餐异常</text>
+										class="abnormal-days">{{diningSituations.notRepastDay}}</text>天未就餐</text>
 							</view>
 							<view class="school-report-context-card-two-conclusion-logo">
 								<view class="school-report-context-card-two-conclusion-logo-item">
@@ -223,7 +222,8 @@
 											class="school-report-context-card-two-details-meal-img">
 											<image src="../../static/images/eatted.png" mode=""></image>
 										</view>
-										<view v-else-if="diningSituations.notRepastDetails.breakfastStatus==0" class="school-report-context-card-two-details-meal-noeat">
+										<view v-else-if="diningSituations.notRepastDetails.breakfastStatus==0"
+											class="school-report-context-card-two-details-meal-noeat">
 											<text>缺</text>
 										</view>
 									</view>
@@ -236,7 +236,8 @@
 											class="school-report-context-card-two-details-meal-img">
 											<image src="../../static/images/eatted.png" mode=""></image>
 										</view>
-										<view v-else-if="diningSituations.notRepastDetails.lunchStatus==0" class="school-report-context-card-two-details-meal-noeat">
+										<view v-else-if="diningSituations.notRepastDetails.lunchStatus==0"
+											class="school-report-context-card-two-details-meal-noeat">
 											<text>缺</text>
 										</view>
 									</view>
@@ -249,7 +250,8 @@
 											class="school-report-context-card-two-details-meal-img">
 											<image src="../../static/images/eatted.png" mode=""></image>
 										</view>
-										<view v-else-if="diningSituations.notRepastDetails.supperStatus==0" class="school-report-context-card-two-details-meal-noeat">
+										<view v-else-if="diningSituations.notRepastDetails.supperStatus==0"
+											class="school-report-context-card-two-details-meal-noeat">
 											<text>缺</text>
 										</view>
 									</view>
@@ -265,7 +267,7 @@
 						</view>
 						<view class="school-report-context-card-three-conclusion">
 							<view class="school-report-context-card-three-conclusion-item">
-								<text v-if="isEatLow">食堂消费占比<text
+								<text v-if="isEatLow">正餐消费占比<text
 										class="school-report-context-card-three-conclusion-item-describe">过低</text>,请及时调整饮食习惯</text>
 								<text v-else>饮食较<text
 										class="school-report-context-card-three-conclusion-item-describe">均衡</text>，继续保持哦</text>
@@ -277,12 +279,12 @@
 					<view v-if="tabIndex==1&&isOpen" class="school-report-context-card-four">
 						<view class="school-report-context-card-title">
 							<view class="school-report-context-card-title-img">
-								<text>消费总额</text>
+								<text>生活费额度</text>
 							</view>
 						</view>
 						<view class="school-report-context-card-four-conclusion">
 							<view class="school-report-context-card-four-conclusion-item">
-								<text>消费总额<text
+								<text>消费<text
 										class="consume-total">{{consumerAmountObj.consumerAmount}}</text>元，超过全校<text
 										class="consume-total">{{consumerAmountObj.exceedRate}}%</text>的同学<text
 										v-if="isReasonable">，请及时评估生活费是否合理</text></text>
@@ -355,7 +357,7 @@
 						</view>
 						<view class="attendance-report-context-card-two-conclusion">
 							<view class="attendance-report-context-card-two-conclusion-txt">
-								<text>本{{['月','周'][reportTypeIndex]}}共<text
+								<text v-if="attendanceReport.abnormalNum!=-1">本{{['月','周'][reportTypeIndex]}}共<text
 										class="abnormal-days">{{attendanceReport.abnormalNum}}</text>天出勤异常</text>
 							</view>
 							<view class="attendance-report-context-card-two-conclusion-logo">
@@ -609,7 +611,7 @@
 									<view class="consumer-num-img">
 									</view>
 									<view class="open-results-items-details-item-txt">
-										<text>消费总额分析</text>
+										<text>生活费额度分析</text>
 									</view>
 								</view>
 								<view class="open-results-items-details-item">
@@ -778,7 +780,7 @@
 				// 消费偏好
 				pieDatas: [],
 				isEatLow: false,
-				// 消费总额
+				// 生活费额度
 				consumerAmountObj: {},
 				isReasonable: false,
 				schoolAverageHeight: '',
@@ -1178,7 +1180,7 @@
 						})
 					}
 				} else if (this.tabIndex == 2) { // 门禁报告
-					if (this.attendanceReport.abnomalDateList.length) {
+					if (this.attendanceReport.abnomalDateList && this.attendanceReport.abnomalDateList.length) {
 						const abnomalList = this.attendanceReport.abnomalDateList.filter(e => e.abnomalType == 2 || e
 							.abnomalType == 3 || e.abnomalType == 5);
 						const leaveList = this.attendanceReport.abnomalDateList.filter(e => e.abnomalType == 4);
@@ -1748,7 +1750,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 					if (num) {
 						this.pieDatas = [
 							[{
-								name: '食堂',
+								name: '正餐',
 								value: tmpObj.canteenAmount
 							}, {
 								name: '超市',
@@ -1769,7 +1771,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 					})
 				}
 			},
-			// 查询消费总额
+			// 查询生活费额度
 			async queryConsumerTrend() {
 				try {
 					let data = await this.$http.get({