Merge branch 'v_req_8.2' into develop

src/pages/ApplyConsumption/campusReport/campusReport.vue

@@ -397,24 +397,27 @@
 			console.log(this.currentDate, 'currentDate1111111111111', this.shareDate, 'this.homeDataInfo', this
 				.homeDataInfo)
 		},
-		async mounted() {
+		mounted() {
 			console.log(this.dataRangeArr, 'dataRangeArr')
 			this.homeDataInfo = JSON.parse(sessionStorage.getItem('HomeDataInfo'))
+			this.getCampusConsumerReport()
 			if (this.homeDataInfo.vipStatus === 1) {
 				this.isVip = true;
 				this.vipExpiredDt = moment(this.homeDataInfo.vipExpiredDt).format('YYYY年MM月DD日')
 				console.log(this.vipExpiredDt, 'this.vipExpiredDt')
+				this.initPieCharts()
+				this.getCateringAbnormalTypeGroupList()
 			}
 			console.log(this.isVip, 'isVip')
 			this.columns = this.dataRangeArr.map(x => x.month)
 			console.log(this.columns, 'columns')
-			// await this.CloudGatewayToken()
-			await this.getCampusConsumerReport()
-			await this.initPieCharts()
-			await this.getCateringAbnormalTypeGroupList()
-			// await this.getUserDealReportListAndSum()
 		},
 		methods: {
+			async init(){
+				// await this.getCampusConsumerReport()
+				// await this.initPieCharts()
+				// await this.getCateringAbnormalTypeGroupList()
+			},
 			shareHandler: function() {
 				let htmlCanvasImg = document.getElementsByClassName("htmlCanvasImg")[0];
 				if (htmlCanvasImg) {