消费报告

src/pages/SchoolReport/SchoolReport.vue

@@ -1638,7 +1638,7 @@
 				<image :src="ImgUrl+'SchoolReport/costReportIMG4.png'" class="costReportIMG4"></image>
 				<image :src="ImgUrl+'SchoolReport/costReportIMG5.png'" class="costReportIMG5"></image>
 				<view v-if="from == 'wechat'&&weixinOpenFlag==1" class="openBox">
-					<view class="imgWrapper" style="margin: 137rpx auto 0;">
+					<!-- <view class="imgWrapper" style="margin: 137rpx auto 0;">
 						<view class="item" v-for="(item,index) in ScsApplicationList1" :key="item.id">
 							<image :src="item.icon" class="icon"></image>
 							<view class="line1">{{item.appname}}</view>
@@ -1655,6 +1655,30 @@
 					</view>
 					<view class="openBtnWrapper">
 						<view class="openBtn" @tap="openXzfMenber">开通消费服务，解锁完整服务</view>
+					</view> -->
+					<image :src="ImgUrl+'user/openDialogHeader_home.png'" class="headerImg"></image>
+					<view class="imgBlock">
+						<view class="imgWrapper" v-for="(item) in ScsApplicationList1" :key="item.id">
+							<view class="item">
+								<view class="iconBlock"><image :src="item.icon" class="icon"></image></view>
+								<view class="line1">{{item.appname}}</view>
+								<view class="line2">{{item.shortdesc}}</view>
+							</view>
+						</view>
+						<view class="imgWrapper" style="margin-bottom:57rpx" v-for="(item2) in ScsApplicationList2" :key="item2.id">
+							<view class="item">
+								<view class="iconBlock">
+									<image :src="item2.icon" class="icon" style="max-width: 64rpx;max-height: 64rpx"></image>
+									<image :src="ImgUrl+'user/giveFor-icon-home.png'" class="give" v-if="item2.tag == '赠'"></image>
+								</view>
+								<view class="line1" style="margin-top: -10rpx">{{item2.appname}}</view>
+								<view class="line2">{{item2.shortdesc}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="openBtnWrapper">
+						<image :src="ImgUrl+'user/giveTip-home.png'" class="giveTip"></image> 
+						<view class="openBtn" @click.stop="open">立即开通</view>
 					</view>
 				</view>
 				<image :src="ImgUrl+'SchoolReport/costReportIMG6.png'" class="costReportIMG6" @tap="openAzMenber"
@@ -4835,55 +4859,117 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 			bottom: 0;
 			left: 0;
 			right: 0;
+			.headerImg {
+				width: 750rpx;
+				height: 220rpx;
+				// background-color: white;
+			}
+
+			.imgBlock {
+				// margin-top: 163rpx;
+				background-color: white;
+				width: calc(100% - 83rpx);
+				padding: 0 35rpx 0 48rpx;
 			
-			.imgWrapper {
-				width: 647rpx;
-				margin: 18rpx auto 0;
 				display: flex;
-				justify-content: space-around;
+				flex-wrap: wrap;
+				justify-content: space-between;
+			
+				.imgWrapper {
+					// margin-top: -24rpx;
 			
 					.item {
 						width: 150rpx;
-					height: 100%;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
 						text-align: center;
+						// margin-bottom: 50rpx;
 						position: relative;
 			
+						// .give {
+						// 	width: 30rpx;
+						// 	height: 30rpx;
+						// 	position: absolute;
+						// 	right: 20rpx;
+						// 	top: 0;
+						// }
+						.iconBlock{
+							width: 96rpx;
+							height: 96rpx;
+							margin: 0 auto;
+							display: flex;
+							justify-content: center;
+							position: relative;
 							.give {
 								width: 30rpx;
 								height: 30rpx;
 								position: absolute;
-						right: 20rpx;
 								top: 0;
+								right: -4rpx;
+							}
 						}
-
 						.icon {
-						width: 96rpx;
-						height: 96rpx;
-						margin: 0 auto;
+							max-width: 96rpx;
+							max-height: 96rpx;
+							align-self: center;
 						}
 			
 						.line1 {
-						height: 37rpx;
 							font-family: PingFangSC, PingFang SC;
 							font-weight: 500;
 							font-size: 26rpx;
-						color: #774200;
-						white-space: nowrap;
+							color: rgba(0,0,0,0.85);
 							line-height: 37rpx;
+							white-space: nowrap;
+							margin-top: 5rpx;
 						}
 			
 						.line2 {
-						height: 30rpx;
 							font-family: PingFangSC, PingFang SC;
 							font-weight: 300;
 							font-size: 22rpx;
-						color: rgba(119, 66, 0, 0.6);
+							color: rgba(0,0,0,0.5);
 							line-height: 30rpx;
 						}
 					}
 				}
 			}
 			
+			.openBtnWrapper {
+				width: 100%;
+				background: #ffffff;
+				position: relative;
+				// margin-top: 57rpx;
+				padding-bottom: 97rpx;
+				.giveTip {
+					position: absolute;
+					top: -35rpx;
+					left: 50%;
+					right: 0;
+					width: 598rpx;
+					margin-left: -302rpx;
+					height: 58rpx;
+				}
+			}
+			
+			.openBtn {
+				width: 622rpx;
+				height: 96rpx;
+				line-height: 96rpx;
+				text-align: center;
+				background: #04B871;
+				border-radius: 52rpx;
+				margin: 0 auto;
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 500;
+				font-size: 34rpx;
+				color: #FFFFFF;
+			}
+			
+			
+		}
+
 		.openBtnWrapper {
 			width: 100%;
 			background: #ffffff;