生活费额度三图形高度调整提交更新

src/pages/SchoolReport/SchoolReport.vue

@@ -103,7 +103,8 @@
 									</view>
 								</view>
 								<view class="school-report-context-card-one-context-txt">
-									消费 <text class="txt-important">{{consumerAmountObj.consumergrossamount}}</text>元,超过全校
+									消费 <text
+										class="txt-important">{{consumerAmountObj.consumergrossamount}}</text>元,超过全校
 									<text class="txt-important">{{consumerAmountObj.gtgraderate}}%</text>
 									的同学<text v-if="isReasonable">,请及时评估生活费是否合理</text>
 								</view>
@@ -844,10 +845,10 @@
 			}
 		},
 		mounted() {
-			// if (this.isPeakPeriod()) {
-			// 	this.showReport = false;
-			// 	return
-			// }
+			if (this.isPeakPeriod()) {
+				this.showReport = false;
+				return
+			}
 			this.showReport = true;
 			// 有无消费报告入口
 			if (new Date().getTime() <= new Date('2022/06/30').getTime()) {
@@ -1688,23 +1689,24 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 					})
 				}
 			},
-			// 三数排序
+			// 三对象排序
 			numsort(obj1, obj2, obj3) {
-				obj1.num < obj2.num && (
-					obj1.num = obj1.num ^ obj2.num,
-					obj2.num = obj2.num ^ obj1.num,
-					obj1.num = obj1.num ^ obj2.num
-				);
-				obj2.num < obj3.num && (
-					obj2.num = obj2.num ^ obj3.num,
-					obj3.num = obj3.num ^ obj2.num,
-					obj2.num = obj2.num ^ obj3.num
-				);
-				obj1.num < obj2.num && (
-					obj1.num = obj1.num ^ obj2.num,
-					obj2.num = obj2.num ^ obj1.num,
-					obj1.num = obj1.num ^ obj2.num
-				);
+				var temp;
+				if(obj1.num>obj2.num){
+					temp=JSON.parse(JSON.stringify(obj1));
+					obj1=JSON.parse(JSON.stringify(obj2));
+					obj2.num=JSON.parse(JSON.stringify(temp));
+				}
+				if(obj2.num>obj3.num){
+					temp=JSON.parse(JSON.stringify(obj2));
+					obj2=JSON.parse(JSON.stringify(obj3));
+					obj3=JSON.parse(JSON.stringify(temp));
+				}
+				if(obj1.num>obj2.num){
+					temp=JSON.parse(JSON.stringify(obj1));
+					obj1=JSON.parse(JSON.stringify(obj2));
+					obj2=JSON.parse(JSON.stringify(temp));
+				}
 				return [{
 					name: obj1.name,
 					value: obj1.num,
@@ -1784,7 +1786,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 							name: 'gradeAverageHeight',
 							num: this.consumerAmountObj.gradeavgamount
 						});
-						const tempArr = [this.consumerAmountObj.schoolavgamount, this.consumerAmountObj.consumergrossamount,
+						const tempArr = [this.consumerAmountObj.schoolavgamount, this.consumerAmountObj
+							.consumergrossamount,
 							this.consumerAmountObj.gradeavgamount
 						];
 						const heightArr = Object.keys(this.counterArray(tempArr)).length == 1 ? [139, 139, 139] : (
@@ -3357,13 +3360,12 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 					#consumer-trend-line {
 						position: absolute;
 						top: 120rpx;
-						left: 10rpx;
 						z-index: 100;
 					}
 
 					.consumer-trend-line-icon {
 						position: absolute;
-						top: 547rpx;
+						top: 558rpx;
 						left: 271rpx;
 						height: 40rpx;