Merge branch 'V1.6.9_feature' into develop

src/pages/SchoolReport/SchoolReport.vue

@@ -143,7 +143,7 @@
 						</view>
 						<view class="school-report-context-card-two-calendar">
 							<van-calendar :formatter="formatter" :min-date="minDate" :max-date="maxDate"
-								:default-date="minDate" :row-height="44" :show-title="false" :show-subtitle="false"
+								:default-date="minDate"  :show-title="false" :show-subtitle="false"
 								:show-mark="false" :poppable="false" :show-confirm="false" :style="{ height: '575rpx' }"
 								@select="dateSelect" />
 						</view>
@@ -450,15 +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{
-			// 	this.queryIsDredgeMember();
-			// }
-			this.queryIsDredgeMember();
+			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++) {
@@ -617,7 +617,7 @@
 			dateSelect(date) {
 				this.diningSituations.diningSituationsDate = this.formatDate(date);
 				var dateStr =
-					`${date.getFullYear()}-${date.getMonth()<9?'0'+(date.getMonth()+1):date.getMonth()+1}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`;;
+					`${date.getFullYear()}-${date.getMonth()<9?'0'+(date.getMonth()+1):date.getMonth()+1}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`;
 				this.queryNotRepastDetails(dateStr, dateStr, 1);
 			},
 			piechart: function() {
@@ -676,8 +676,8 @@
 			},
 			linechart: function(num) {
 				var mySize = document.getElementById('consumer-trend-line');
-				mySize.style.width = window.innerWidth - 20 + 'px';
-				mySize.style.height = window.innerHeight - 500 + 'px';
+				mySize.style.width = 360 + 'px';
+				mySize.style.height = 260 + 'px';
 				var myChart = echarts.init(mySize);
 				var xdata = this.lineDatas.map(v => v.name);
 				var year = this.dataRangeArr[this.dataRangeIndex].startDate.slice(0, 4);
@@ -1117,7 +1117,7 @@
 			},
 			equityPay: function() {
 				jWeixin.miniProgram.switchTab({
-					url: `/pages/UserMain/main`,
+					url: `/pages/Member/main`,
 					success: function success() {
 						console.log('skip success')
 					},
@@ -1157,17 +1157,25 @@
 					margin-left: 9rpx;
 
 					.user-name {
+						width: 200rpx;
 						font-size: 34rpx;
 						font-family: PingFangSC-Medium, PingFang SC;
 						font-weight: 500;
 						color: #1B1B1B;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
 					}
 
 					.class-name {
+						width: 200rpx;
 						font-size: 28rpx;
 						font-family: PingFangSC-Medium, PingFang SC;
 						font-weight: 500;
 						color: rgba(0, 0, 0, 0.25);
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
 					}
 				}
 
@@ -1290,7 +1298,7 @@
 				background: #E5F8F1;
 				padding: 0 30rpx;
 				position: absolute;
-				top: 654rpx;
+				top: 650rpx;
 				box-sizing: border-box;
 
 				.school-report-context-card-one {
@@ -1424,6 +1432,24 @@
 
 					.school-report-context-card-two-calendar {
 						height: 575rpx;
+						
+						/deep/ .van-calendar__weekdays{
+							background: #F7FAF8;
+						}
+						
+						/deep/ .van-calendar__weekday{
+							text-align: left;
+							padding-left: 30rpx;
+							box-sizing: border-box;
+						}
+						
+						/deep/ .van-calendar__weekday:first-of-type{
+							color: rgba(0, 0, 0, 0.25);
+						}
+						
+						/deep/ .van-calendar__weekday:last-of-type{
+							color: rgba(0, 0, 0, 0.25);
+						}
 
 						/deep/ .van-calendar__month-title {
 							display: none;
@@ -1435,11 +1461,17 @@
 
 						/deep/ .van-calendar__day {
 							margin: 0 0 8rpx;
+							border-radius: 22rpx;
 						}
 
 						/deep/ .van-calendar__selected-day {
 							background: rgba(0, 0, 0, .1);
 							color: #F9793F;
+							display: flex;
+							align-items: flex-end;
+							border-radius: 22rpx;
+							width: 88rpx;
+							height: 88rpx;
 						}
 
 						/deep/ .van-calendar__top-info {
@@ -1449,21 +1481,23 @@
 							font-weight: 400;
 							color: #F9793F;
 							line-height: 28rpx;
-							margin: 0 0 4rpx;
+							margin: 12rpx 0 4rpx;
 						}
 
 						/deep/ .notice-day {
 							color: #F9793F;
 							background: rgba(249, 121, 63, .1);
-							border-radius: 8rpx;
+							border-radius: 22rpx;
 							width: 88rpx;
 							height: 88rpx;
-							margin-left: 10rpx;
+							margin-right: 10rpx;
+							display: flex;
+							align-items: flex-end;
 						}
 					}
 
 					.school-report-context-card-two-details {
-						height: 128rpx;
+						height: 132rpx;
 						background: no-repeat center/100% url(../../static/images/diningSituations.png);
 						padding: 55rpx 42rpx 30rpx 29rpx;
 						box-sizing: border-box;
@@ -1476,10 +1510,12 @@
 							.school-report-context-card-two-details-date {
 								width: 130rpx;
 								height: 43rpx;
-								border-radius: 4rpx;
+								border-radius: 8rpx;
 								border: 1rpx solid #04B871;
 								font-size: 28rpx;
 								font-family: FontName;
+								font-weight: 600;
+								font-style: italic;
 								color: #04B871;
 								margin-right: 65rpx;
 								display: flex;
@@ -1710,7 +1746,6 @@
 					#consumer-trend-line {
 						position: absolute;
 						top: 120rpx;
-						left: 10rpx;
 						z-index:100;
 					}