pad样式修改

common/styles/global/pages.scss

@@ -196,7 +196,7 @@
 				}
 			}
 		}
-	
+
 		/***** 输入验证码页面*****/
 		.yzm-show{width: 430rpx;font-size: 20rpx;margin: 0 0 16rpx 8rpx;}
 		.yzm-btn{margin-top: 27rpx;}
@@ -240,7 +240,7 @@
 				}
 			}
 		}
-	
+
 		/***** 输入验证码页面*****/
 		.yzm-show{width: 1059rpx;font-size: 48rpx;margin: 0 0 38rpx 19rpx;}
 		.yzm-btn{margin-top: 67rpx;}
@@ -491,7 +491,7 @@
 			}
 		}
 	}
-	
+
 	@include mediaSmall() {
 			.xbb-list-box{
 				padding-bottom: 21rpx;
@@ -507,7 +507,7 @@
 				}
 			}
 		}
-	
+
 		@include mediaBig() {
 			.xbb-list-box{
 				padding-bottom: 51rpx;
@@ -606,17 +606,17 @@
 		.dy-left-box{
 			width: 174rpx;height: 127rpx;@include ezy-no-repeat-cover;font-size: 64rpx;
 			display: flex;align-items: center;box-sizing: border-box;padding:0 24rpx;
-			background-image: url("@/static/images/xuexi/xx-ml-left.png");
+			background-image: url("@/static/images/phone/xuexi/xx-ml-left.png");
 		}
 		.dy-left-box::after{
 			content: '';width: 32rpx;height: 34rpx;@include ezy-no-repeat-cover;margin-left: auto;
-			background-image: url("@/static/images/xuexi/xx-ml-jt.png");display: block;
+			background-image: url("@/static/images/common/xuexi/xx-ml-jt.png");display: block;
 		}
 		.dy-right-box{
 			width: 518rpx;height: 127rpx;@include ezy-no-repeat-cover;
 			display: flex;align-items: flex-start;flex-direction: column;justify-content: center;
 			box-sizing: border-box;padding:0 24rpx;font-size: 28rpx;
-			background-image: url("@/static/images/xuexi/xx-ml-right.png");
+			background-image: url("@/static/images/phone/xuexi/xx-ml-right.png");
 			.right-content{width: 100%;height: 90rpx;overflow: hidden;}
 			.dy-name{font-size: 34rpx;margin-bottom: 6rpx;}
 		}
@@ -633,11 +633,11 @@
 		background-color: #5795f6;border-radius: 16rpx;position: relative;
 		.card-body-box{
 			display: flex;
-			img{width: 190rpx;height: 242rpx;border-radius: 16rpx;border: 1rpx solid #a8c3e9;}
+			img{width: 190rpx;height: 242rpx;border-radius: 16rpx;}
 			.body-right{
-				color: #c8e4f8;margin-left: 24rpx;font-size: 30rpx;
+				width: 100%;color: #c8e4f8;margin-left: 24rpx;font-size: 30rpx;
 				view{margin: 8rpx 0;}
-				.right-name{font-size: 34rpx;color: #fff;}
+				.right-name{font-size: 34rpx;color: #fff;margin-top: 2rpx;}
 				}
 		}
 		.card-progress-box{
@@ -646,13 +646,13 @@
 			.xx-progress{border-radius: 40rpx;overflow: hidden;margin-top: 10rpx;}
 			.jxxx-btn{
 				width: 177rpx;height: 89rpx;@include ezy-no-repeat-cover;margin-right: 24rpx;
-				background-image: url("@/static/images/xuexi/jx-xx-btn.png");
+				background-image: url("@/static/images/common/xuexi/jx-xx-btn.png");
 			}
 		}
 	}
 	.xxjl-card-box::before{
 		content: '学习记录';width: 289rpx;height: 77rpx;line-height: 77rpx;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/xuexi/xx-jl-bj.png");display: block;
+		background-image: url("@/static/images/common/xuexi/xx-jl-bj.png");display: block;
 		position: absolute;top: -28rpx;text-align: center;color: #fff;font-size: 34rpx;
 	}
 
@@ -701,58 +701,25 @@
 			background-image: url("@/static/images/xuexi/more-btn.png");
 		}
 
-		/* 动画类 */
-		/* .item-dy-box.item-active {
-			animation: scalePulse 1s ease-in-out;
-			.right-content{
-				animation: opacityPulse 1s ease-in-out;
-			}
-		} */
-		/* 定义放大动画 */
-		@keyframes scalePulse {
-		  0% {
-		    transform: scale(1);
-		  }
-		  50% {
-		    transform: scale(1.05);
-		  }
-		  100% {
-		    transform: scale(1);
-		  }
-		}
-
-		/* 定义显隐动画 */
-		@keyframes opacityPulse {
-		  0% {
-		    opacity: 1;
-		  }
-		  90% {
-		    opacity: 0.2;
-		  }
-		  100% {
-		    opacity: 1;
-		  }
-		}
-
 		.xx-item-box{
 			width: 691rpx;height: 172rpx;
 			display: flex;align-items: center;justify-content: space-between;color: #4b4b4b;;
 			margin: 0 auto 24rpx;box-sizing: border-box;padding: 20rpx;border-radius: 12rpx;
 			line-height: 1.5;font-size: 32rpx;position: relative;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/xuexi/xx-ml-bj.png");
+			background-image: url("@/static/images/common/xuexi/xx-ml-bj.png");
 			img{width: 120rpx;height: 120rpx;border-radius: 12rpx;margin-right: 24rpx;}
 			.xx-item-status{
 				width: 89rpx;height: 87rpx;@include ezy-no-repeat-cover;
 				position: absolute;top:2rpx;left: 0;
 			}
-			.completed-status{background-image: url("@/static/images/xuexi/xw-status.png");}
+			.completed-status{background-image: url("@/static/images/common/xuexi/xw-status.png");}
 			.xx-text-box{flex: 1;}
 			.xx-item-btn,.xx-item-lock-btn{width: 77rpx;height: 77rpx;@include ezy-no-repeat-cover;}
-			.xx-item-btn{background-image: url("@/static/images/xuexi/xx-ml-play-icon.png");}
-			.xx-item-lock-btn{background-image: url("@/static/images/xuexi/xx-ml-lock-icon.png");}
+			.xx-item-btn{background-image: url("@/static/images/common/xuexi/xx-ml-play-icon.png");}
+			.xx-item-lock-btn{background-image: url("@/static/images/common/xuexi/xx-ml-lock-icon.png");}
 		}
 		.xx-disabled-item-box{
-			background-image: url("@/static/images/xuexi/xx-ml-disabled-bj.png");
+			background-image: url("@/static/images/common/xuexi/xx-ml-disabled-bj.png");
 		}
 	}
 
@@ -768,43 +735,135 @@
 		background-image: url("@/static/images/xuexi/go-top-btn.png");
 		position: fixed;z-index: 9;bottom: 300rpx;right:10rpx;
 	}
-}
 
-// 单元目录
-.xuexi-dyml-page{
-	width: 100%;height: 92vh;border-radius: 16rpx 16rpx 0 0;
-	background-color: #fff;box-shadow: 0 0rpx 4rpx rgba(100, 159, 241, 0.2);
-	display: flex;flex-direction: column;
-	box-sizing: border-box;padding: 36rpx 0 0;
-	.xuexi-dyml-body{overflow-y: auto;padding: 24rpx 0 0;}
-	.dyml-title{
-		width: 80%;line-height: 1.5;margin: 24rpx auto 0;
-		text-align: center;font-size: 36rpx;color: #000;position: relative;
-		icon{
-			width: 100rpx;height: 100rpx;display: flex;align-items: center;justify-content: center;
-			position: absolute;right: -13%;top: -60rpx;
+
+	@include mediaSmall() {
+		.xuexi-page-body{padding:0 0 65rpx;}
+		.xxjl-card-box-padding{padding-top: 42rpx;}
+		.item-dy-box{margin-bottom: 16rpx;
+			.dy-left-box{width: 135rpx;height: 71rpx;font-size: 42rpx;padding:0 16rpx;
+			background-image: url("@/static/images/pad/xuexi/xx-ml-left.png");}
+			.dy-left-box::after{width: 21rpx;height: 22rpx;}
+			.dy-right-box{
+				width: 580rpx;height: 71rpx;padding:0 16rpx;font-size: 18rpx;
+				background-image: url("@/static/images/pad/xuexi/xx-ml-right.png");
+				.right-content{height: 59rpx;}
+				.dy-name{font-size: 22rpx;margin-bottom: 4rpx;}
+			}
 		}
-		icon::after{
-			content: '';width: 52rpx;height: 52rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/common/close-icon.png");
+		.item-fixed{padding: 16rpx 0;border-radius: 10rpx 10rpx 0 0;}
+		.xxjl-card-box{
+			width: 715rpx;margin: 0 auto 16rpx;padding: 47rpx 16rpx 16rpx 16rpx;
+			border-radius: 10rpx;position: relative;
+			.card-body-box{
+				img{width: 124rpx;height: 157rpx;border-radius: 10rpx;}
+				.body-right{
+					margin-left: 16rpx;font-size: 20rpx;view{margin: 5rpx 0;}
+					.right-name{font-size: 22rpx;}
+					.right-item{width: 50%;display: inline-block;vertical-align: middle;}
+					.right-item-mini{width: 40%;}
+				}
+			}
+			.card-progress-box{
+				position: absolute;bottom: 12rpx;left:140rpx;right: 10rpx;
+				.xx-progress-box{margin-right: 42rpx;font-size: 18rpx;}
+				.xx-progress{margin-top: 0;}
+				.progress-title{display: none;}
+				.jxxx-btn{width: 104rpx;height: 50rpx;margin-right: 16rpx;}
+			}
+		}
+		.xxjl-card-box::before{width: 188rpx;height: 50rpx;line-height: 50rpx;top: -18rpx;font-size: 22rpx;}
+		.xx-jd-box{border-radius: 10rpx;margin: 0 16rpx 21rpx;padding: 21rpx;
+			.xx-progress-box{font-size: 21rpx;margin-right: 27rpx;
+			.xx-progress{margin-top: 10rpx;}}
+			.jxxx-btn{width: 141rpx;height: 55rpx;}
+			.jd-item-box{margin-top: 21rpx;padding-top: 21rpx;
+				icon{width: 35rpx;height: 35rpx;margin-right: 34rpx;}
+				icon::before{height: 46rpx;right: -16rpx;top: -7rpx;}
+				.jd-item-btn{border-radius: 10rpx;padding: 16rpx;}
+				.jd-item-btn:first-child{margin-right: 16rpx;}
+			}
 		}
+		.xx-item-list{
+			padding-bottom: 16rpx;
+			.xx-item-title{margin: 20rpx 0;font-size: 20rpx;}
+			.xx-more-btn{width: 410rpx;height: 58rpx;margin: 0 auto 21rpx;}
+			.xx-item-box{width: 715rpx;height: 92rpx;margin: 0 auto 16rpx;padding: 10rpx;border-radius: 12rpx;font-size: 21rpx;
+				img{width: 72rpx;height: 72rpx;border-radius: 8rpx;margin-right: 16rpx;}
+				.xx-item-status{width: 58rpx;height: 57rpx;top:1rpx;}
+				.xx-item-btn,.xx-item-lock-btn{width: 50rpx;height: 50rpx;margin-right: 12rpx;}
+			}
+		}
+		.xx-next-btn{width: 426rpx;height: 60rpx;line-height: 60rpx;margin: 21rpx auto;font-size: 21rpx;}
+		.xx-xw-text{font-size: 21rpx;margin: 21rpx auto;}
+		.go-top-btn{width: 50rpx;height: 50rpx;bottom: 195rpx;right:7rpx;}
 	}
 
-	.dyml-item-box{
-		width: 670rpx;height: 97rpx;line-height: 97rpx;font-size: 32rpx;color: #333;
-		@include ezy-no-repeat-cover;margin: 24rpx auto;position: relative;
-		display: flex;
-		.dy-num{width: 180rpx;padding-left: 24rpx;box-sizing: border-box;flex-shrink: 0;}
-		.dy-title{margin: 0 84rpx 0 16rpx;@include single-line-ellipsis;}
-		icon{width: 100rpx;height: 97rpx;display: flex;align-items: center;justify-content: center;
-		position: absolute;right: 0;z-index: 3;top: 0;}
-		icon::after{
-			content: '';width: 37rpx;height: 39rpx;@include ezy-no-repeat-cover;
-			background-image: url("@/static/images/xuexi/dyml-item-btn.png");
+	@include mediaBig() {
+		.xuexi-page-body{padding:0 0 160rpx;}
+		.xxjl-card-box-padding{padding-top: 102rpx;}
+		.item-dy-box{
+			margin-bottom: 38rpx;
+			.dy-left-box{width: 363rpx;height: 194rpx;font-size: 102rpx;padding:0 38rpx;}
+			.dy-left-box::after{width: 51rpx;height: 54rpx;}
+			.dy-right-box{
+				width: 1577rpx;height: 194rpx;padding:0 38rpx;font-size: 46rpx;
+				.right-content{height: 144rpx;}
+				.dy-name{font-size: 54rpx;margin-bottom: 10rpx;}
+			}
+		}
+		.item-fixed{padding: 38rpx 0;border-radius: 26rpx 26rpx 0 0;}
+		.xxjl-card-box{
+			width: 1940rpx;margin: 0 auto 38rpx;padding: 115rpx 38rpx 38rpx 38rpx;
+			border-radius: 26rpx;position: relative;
+			.card-body-box{
+				img{width: 304rpx;height: 387rpx;border-radius: 26rpx;}
+				.body-right{
+					margin-left: 38rpx;font-size: 46rpx;view{margin: 13rpx 0;}
+					.right-name{font-size: 54rpx;}
+					.right-item{width: 50%;display: inline-block;vertical-align: middle;}
+					.right-item-mini{width: 40%;}
+				}
+			}
+			.card-progress-box{
+				position: absolute;bottom: 36rpx;left:360rpx;right: 16rpx;
+				.xx-progress-box{margin-right: 102rpx;font-size: 45rpx;}
+				.xx-progress{margin-top: 0;}
+				.progress-title{display: none;}
+				.jxxx-btn{width: 263rpx;height: 122rpx;margin-right: 38rpx;}
+			}
+		}
+		.xxjl-card-box::before{width: 462rpx;height: 123rpx;line-height: 123rpx;top: -45rpx;font-size: 54rpx;}
+		.xx-jd-box{
+			border-radius: 26rpx;margin: 0 38rpx 51rpx;padding: 51rpx;
+			.xx-progress-box{
+				margin-right: 67rpx;
+				.xx-progress{margin-top: 26rpx;}
+			}
+			.jxxx-btn{width: 347rpx;height: 136rpx;}
+			.jd-item-box{
+				margin-top: 51rpx;padding-top: 51rpx;
+				icon{width: 86rpx;height: 86rpx;margin-right: 83rpx;}
+				icon::before{height: 112rpx;right: -38rpx;top: -16rpx;}
+				.jd-item-btn{border-radius: 26rpx;padding: 38rpx;}
+				.jd-item-btn:first-child{margin-right: 38rpx;}
+			}
+		}
+		.xx-item-list{
+			padding-bottom: 38rpx;
+			.xx-item-title{margin: 51rpx 0;font-size: 46rpx;}
+			.xx-more-btn{width: 1008rpx;height: 142rpx;margin: 0 auto 51rpx;}
+			.xx-item-box{width: 1940rpx;height: 220rpx;margin: 0 auto 38rpx;padding: 32rpx;border-radius: 19rpx;font-size: 46rpx;
+			img{width: 192rpx;height: 192rpx;border-radius: 19rpx;margin-right: 38rpx;}
+			.xx-item-status{width: 142rpx;height: 139rpx;top:3rpx;}
+			.xx-item-btn,.xx-item-lock-btn{width: 123rpx;height: 123rpx;margin-right: 19rpx;}
+			}
 		}
+		.xx-next-btn{width: 1048rpx;height: 147rpx;line-height: 147rpx;margin: 51rpx auto;font-size: 51rpx;}
+		.xx-xw-text{font-size: 51rpx;margin: 51rpx auto;}
+		.go-top-btn{width: 123rpx;height: 123rpx;bottom: 480rpx;right:16rpx;}
 	}
-	.dyml-item-box:nth-child(odd){background-image: url("@/static/images/xuexi/dy-item-bj1.png");}
-	.dyml-item-box:nth-child(even){background-image: url("@/static/images/xuexi/dy-item-bj2.png");}
+
 }
 
 // 答案解析
@@ -1066,7 +1125,7 @@
 		.not-confirm-btn{display: none;}
 		.confirm-btn{margin: 24rpx auto;}
 	}
-	
+
 	@include mediaSmall() {
 		.my-title-navBar-box{
 			padding-top: 12rpx;
@@ -1132,6 +1191,7 @@
 	}
 	.yysz-img-box{width: 72rpx;height: 72rpx;border-radius: 50%;@include ezy-no-repeat-cover}
 	@include mediaSmall() {
+		min-height: 1000rpx;
 		.yysz-row-box{margin: 10rpx auto 0;font-size: 22rpx;}
 		.yysz-item{padding: 26rpx 42rpx 26rpx 0;margin: 0 21rpx 0 21rpx;}
 		.border-item{border-bottom: 1rpx dashed #f2f2f2;}
@@ -1139,7 +1199,7 @@
 		.yysz-item::after{width: 10rpx;height: 20rpx;}
 		.yysz-img-box{width: 76rpx;height: 76rpx;}
 	}
-	
+
 	@include mediaBig() {
 		.yysz-row-box{border-radius: 26rpx;margin: 26rpx auto 0;font-size: 54rpx;}
 		.yysz-item{padding: 51rpx 82rpx 51rpx 0;margin: 0 51rpx 0 51rpx;}
@@ -1213,7 +1273,7 @@
 			.jstx-card-title{padding: 21rpx 16rpx 27rpx;font-size: 22rpx;}
 		}
 	}
-	
+
 	@include mediaBig() {
 		padding-bottom: 180rpx;
 		.zl-card-list{padding: 42rpx 0 0;}
@@ -1272,7 +1332,7 @@
 
 		}
 	}
-	
+
 	@include mediaSmall() {
 		.jstx-body{
 			margin-top: 31rpx;padding: 0 16rpx;
@@ -1336,13 +1396,13 @@
 		min-height: 260rpx;text-align: justify;border-bottom: 1px dashed #70cbf4;
 		margin-bottom: 30rpx;color: #666;font-size: 32rpx;padding-bottom: 32rpx;
 		border-bottom: 1px dashed #70cbf4;line-height: 1.8;}
-		
+
 	@include mediaSmall() {
 			.tip-title{font-size: 24rpx;margin-bottom: 16rpx;}
 			.tip-content-box{width: 406rpx;height: 382rpx;padding: 27rpx 31rpx;}
 			.tip-content{min-height: 169rpx;margin-bottom: 20rpx;font-size: 20rpx;padding-bottom: 20rpx;}
 		}
-	
+
 		@include mediaBig() {
 			.tip-title{font-size: 54rpx;margin-bottom: 38rpx;}
 			.tip-content-box{width: 1000rpx;height: 939rpx;padding: 67rpx 77rpx;}
@@ -1392,7 +1452,7 @@
 			.card-price{font-size: 34rpx;color: #ff0202;font-weight: bolder;}
 		}
 	}
-	
+
 	@include mediaSmall() {
 		.shop-card-list{padding: 4rpx 0 0;}
 		.shop-card-box{
@@ -1562,7 +1622,7 @@
 			.kjdl-btn{width: 322rpx;height: 57rpx;line-height: 57rpx;font-size: 22rpx;margin: 21rpx 0;}
 			.ykkt-text{font-size: 20rpx;}
 		}
-	
+
 		@include mediaBig() {
 			.kjdl-btn{width: 794rpx;height: 141rpx;line-height: 141rpx;font-size: 54rpx;margin: 51rpx 0;}
 			.ykkt-text{font-size: 46rpx;}
@@ -1604,7 +1664,7 @@
 			background-image: url("@/static/images/login/login-btn-bj.png");color:#fff;
 		}
 	}
-	
+
 	@include mediaSmall() {
 		.dhm-body{
 			margin: 13rpx auto 0;padding: 23rpx;

pages/chanpinneirong/chanpin1.vue

@@ -10,15 +10,15 @@
 						<img :src="banbenInfo.cover" />
 						<view class="body-right">
 							<view class="right-name">{{ banbenInfo.chanpinName }}</view>
-							<view>等级：{{banbenInfo.dengjiName}}</view>
-							<view>版本：{{banbenInfo.name}}</view>
-							<view>单元：{{banbenInfo.curDanyuanName}}</view>
-							<view>课程：{{banbenInfo.curKechengName}}</view>
+							<view class="right-item right-item-mini">等级：{{banbenInfo.dengjiName}}</view>
+							<view class="right-item">版本：{{banbenInfo.name}}</view>
+							<view class="right-item right-item-mini">单元：{{banbenInfo.curDanyuanName}}</view>
+							<view class="right-item">课程：{{banbenInfo.curKechengName}}</view>
 						</view>
 					</view>
 					<view class="card-progress-box">
 						<view class="xx-progress-box">
-							<view>学习进度</view>
+							<view class="progress-title">学习进度</view>
 							<progress :percent="curProcess" class="xx-progress" stroke-width="20"
 								backgroundColor="#3c7dfd" activeColor="#ffd11c" />
 						</view>

pages/chanpinneirong/chanpin2.vue

@@ -10,14 +10,14 @@
 						<img :src="neirongInfo.cover" />
 						<view class="body-right">
 							<view class="right-name">{{ neirongInfo.chanpinName }}</view>
-							<view>等级：{{neirongInfo.dengjiName}}</view>
-							<view>版本：{{neirongInfo.name}}</view>
+							<view class="right-item right-item-mini">等级：{{neirongInfo.dengjiName}}</view>
+							<view class="right-item">版本：{{neirongInfo.name}}</view>
 							<view>课程：{{neirongInfo.curKechengName}}</view>
 						</view>
 					</view>
 					<view class="card-progress-box">
 						<view class="xx-progress-box">
-							<view>学习进度</view>
+							<view class="progress-title">学习进度</view>
 							<progress :percent="curProcess" class="xx-progress" stroke-width="20"
 								backgroundColor="#3c7dfd" activeColor="#ffd11c" />
 						</view>