Merge branch 'V1.5.24_feature' into develop

src/pages.json

@@ -16,7 +16,7 @@
 		{
 			"path": "pages/ConsumptionReport/ConsumptionReport",
 			"style": {
-				"navigationBarTitleText": "消费报告",
+				"navigationBarTitleText": "周消费报告",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}

src/pages/ConsumptionReport/ConsumptionReport.vue

@@ -799,21 +799,28 @@
 
 	.consumption-report-container {
 		width: 100%;
-		height: 2616rpx;
+		height: 100%;
+		overflow: scroll;
 		background: #F6F6F6;
-		position: relative;
 
 		.consumption-report-header {
-			height: 330rpx;
+			height: 338rpx;
 			width: 100%;
 			background: url(../../static/images/headerbgm.png) no-repeat;
-			padding-top: 54rpx;
+			background-size: 100%;
+			box-sizing: border-box;
+			position: relative;
 
 			.consumption-report-header-item {
 				height: 48rpx;
+				width: 90%;
 				padding: 0 41rpx;
 				display: flex;
 				justify-content: space-between;
+				align-items: center;
+				position: absolute;
+				top:54rpx;
+				left: 0;
 
 				.consumption-report-info {
 					display: flex;
@@ -859,13 +866,13 @@
 				width: 710rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx;
-				position: absolute;
-				top: 122rpx;
 				padding: 47rpx 42rpx 38rpx 39rpx;
 				box-sizing: border-box;
 				display: flex;
 				justify-content: space-between;
 				flex-direction: column;
+				position: absolute;
+				top: 122rpx;
 
 				.consumption-report-card-one-item {
 					height: 110rpx;
@@ -990,14 +997,13 @@
 				width: 710rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx;
-				position: absolute;
-				top: 504rpx;
-				padding: 0 32rpx;
+				padding: 21rpx 32rpx 0;
+				margin-top: 165rpx;
 				box-sizing: border-box;
 
 				.consumption-report-card-two-title {
 					height: 60rpx;
-					margin: 21rpx 0 32rpx;
+					margin: 0 0 32rpx;
 					box-sizing: border-box;
 					display: flex;
 					align-items: center;
@@ -1048,6 +1054,7 @@
 
 						.average-daily-consumption-item-num {
 							font-size: 48rpx;
+							margin-left: 12rpx;
 						}
 
 						&.average-daily-consumption-item-orange {
@@ -1081,12 +1088,13 @@
 						}
 
 						.average-daily-consumption-student-tag {
-							height: 44rpx;
+							height: 45rpx;
 							font-size: 40rpx;
 							font-family: Arial-BoldItalicMT, Arial;
 							font-weight: normal;
 							color: #FFFFFF;
 							line-height: 45rpx;
+							margin-right: 3rpx;
 						}
 					}
 
@@ -1099,12 +1107,13 @@
 						align-items: center;
 
 						.average-daily-consumption-class-tag {
-							height: 44rpx;
+							height: 45rpx;
 							font-size: 40rpx;
 							font-family: Arial-BoldItalicMT, Arial;
 							font-weight: normal;
 							color: #FFFFFF;
 							line-height: 45rpx;
+							margin-left: 2rpx;
 						}
 
 						.average-daily-consumption-class-text {
@@ -1128,7 +1137,7 @@
 						justify-content: space-between;
 
 						.average-daily-consumption-chart-item {
-							width: 74rpx;
+							width: 80rpx;
 							height: 310rpx;
 							display: flex;
 							flex-direction: column;
@@ -1167,14 +1176,13 @@
 				height: 460rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx;
-				position: absolute;
-				top: 1148rpx;
-				padding: 0 32rpx;
+				padding: 21rpx 32rpx 0;
+				margin: 25rpx 0 0;
 				box-sizing: border-box;
 
 				.consumption-report-card-three-title {
 					height: 60rpx;
-					margin: 21rpx 0 35rpx;
+					margin: 0 0 35rpx;
 					box-sizing: border-box;
 					display: flex;
 					align-items: center;
@@ -1257,7 +1265,7 @@
 								}
 
 								.consumption-preferences-list-item-text-cash {
-									font-weight: 500;
+									font-weight: 600;
 									color: #333333;
 								}
 							}
@@ -1287,20 +1295,19 @@
 				width: 710rpx;
 				background: #FFFFFF;
 				border-radius: 24rpx;
-				position: absolute;
-				top: 1632rpx;
-				padding: 0 32rpx 48rpx;
+				padding: 21rpx 32rpx 48rpx;
+				margin: 25rpx 0 32rpx;
 				box-sizing: border-box;
 
 				.consumption-report-card-four-header {
 					width: 646rpx;
 					height: 60rpx;
-					margin: 21rpx 0 50rpx;
+					margin: 0 0 50rpx;
 					box-sizing: border-box;
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-
+					
 					.consumption-report-card-four-title {
 						display: flex;
 						align-items: center;
@@ -1336,10 +1343,10 @@
 					}
 
 					.noeatting-total {
-						width: 215rpx;
+						flex:1;
 						display: flex;
-						justify-content: space-between;
-
+						justify-content: flex-end;
+						
 						.noeatting-total-item {
 							height: 40rpx;
 							font-size: 28rpx;
@@ -1356,6 +1363,7 @@
 							font-weight: 500;
 							color: #000000;
 							line-height: 40rpx;
+							margin: 0 10rpx;
 						}
 					}
 				}
@@ -1377,14 +1385,14 @@
 							display: flex;
 							justify-content: center;
 							align-items: center;
-							width: 33%;
+							width: 25%;
 						}
 
 						.noeatting-details-header-meal {
 							display: flex;
-							justify-content: space-between;
+							justify-content: space-around;
 							align-items: center;
-							width: 34%;
+							width: 50%;
 						}
 					}
 
@@ -1404,7 +1412,7 @@
 								font-family: PingFangSC-Medium, PingFang SC;
 								font-weight: 500;
 								color: #333333;
-								width: 33%;
+								width: 25%;
 								display: flex;
 								justify-content: center;
 
@@ -1414,9 +1422,9 @@
 							}
 
 							.noeatting-details-list-meal {
-								width: 34%;
+								width: 50%;
 								display: flex;
-								justify-content: space-between;
+								justify-content: space-around;
 
 								.noeatting-details-list-meal-item {
 									width: 50rpx;