Merge branch 'V1.6.9_feature' 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">
@@ -676,7 +676,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);