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

src/pages/SchoolReport/SchoolReport.vue

@@ -44,12 +44,12 @@
 						<view class="school-report-context-tab-item-one active">
 							<text>消费报告</text>
 						</view>
-						<view class="school-report-context-tab-item-one">
+						<!-- <view class="school-report-context-tab-item-one">
 							<text>门禁报告</text>
 						</view>
 						<view class="school-report-context-tab-item-one">
 							<text>公话报告</text>
-						</view>
+						</view> -->
 					</view>
 					<view class="school-report-context-tab-item-two">
 						<view class="share-button" @tap="shareHandler">
@@ -450,14 +450,15 @@
 			}
 		},
 		mounted() {
-			if(new Date().getTime()<=new Date('2022/06/30').getTime()){
-				this.isOpen=true;
-				this.memberInfo.invalidDateStr='2022年6月30日';
-				this.memberInfo.differDay=dayjs('2022/06/30').diff(dayjs(),'day');
-				this.containerHeight = 4200;
-			}else{
+			// if(new Date().getTime()<=new Date('2022/06/30').getTime()){
+			// 	this.isOpen=true;
+			// 	this.memberInfo.invalidDateStr='2022年6月30日';
+			// 	this.memberInfo.differDay=dayjs('2022/06/30').diff(dayjs(),'day');
+			// 	this.containerHeight = 4200;
+			// }else{
+			// 	this.queryIsDredgeMember();
+			// }
 			this.queryIsDredgeMember();
-			}
 			let tmpArr = []
 			// 获取时间
 			for (let i = 0; i <= 11; i++) {
@@ -676,7 +677,7 @@
 			linechart: function(num) {
 				var mySize = document.getElementById('consumer-trend-line');
 				mySize.style.width = window.innerWidth - 20 + 'px';
-				mySize.style.height = window.innerHeight - 580 + 'px';
+				mySize.style.height = window.innerHeight - 500 + 'px';
 				var myChart = echarts.init(mySize);
 				var xdata = this.lineDatas.map(v => v.name);
 				var year = this.dataRangeArr[this.dataRangeIndex].startDate.slice(0, 4);
@@ -894,7 +895,7 @@
 						return
 					}
 					const tmpObj = data.obj;
-					this.isEatLow = tmpObj.canteenAmount / tmpObj.grossAmount > 0.5 ? true : false;
+					this.isEatLow = tmpObj.canteenAmount / tmpObj.grossAmount < 0.5 ? true : false;
 					if (num) {
 						this.pieDatas = [
 							[{