2 Commits 7f2f649bbe ... dc383cda0f

Tác giả SHA1 Thông báo Ngày
  tanxue dc383cda0f 样式修改 2 ngày trước cách đây
  tanxue cdff347fdd 样式修改 2 ngày trước cách đây

+ 24 - 23
common/styles/global/pages.scss

@@ -640,11 +640,13 @@
 		@include ezy-no-repeat-cover;margin-top:62rpx;font-weight: bold;word-wrap: break-word;
 	}
 	// brand-content
-	.brand-content{width: 225rpx;height: 48rpx;line-height: 48rpx;color: #fff;margin: 0 auto;
-	text-align: center;@include single-line-ellipsis;font-size: 18rpx;box-sizing: border-box;padding: 0 4rpx;}
+	.brand-content{width: 225rpx;height: 48rpx;line-height: 48rpx;color: #fff;margin: 132rpx auto 0;
+	text-align: center;@include single-line-ellipsis;font-size: 18rpx;box-sizing: border-box;padding: 0 4rpx;
+	@include ezy-no-repeat-cover;background-image: url("@/static/images/study/cjdc/dao-item-disabled.png");}
+	
 	.brand-lock,.brand-finish-icon{
 		width: 70rpx;height: 70rpx;@include ezy-no-repeat-cover;
-		position: absolute;transform: translateX(-50%);top: -102rpx;right: 40rpx;}
+		position: absolute;transform: translateX(-50%);top: 28rpx;right: 56rpx;}
 	.brand-lock{background-image: url("@/static/images/study/lock-bj.png");display: flex;justify-content: center;}
 	.brand-lock::before{
 		content: '';width: 38rpx;height: 45rpx;display: block;@include ezy-no-repeat-cover;
@@ -652,20 +654,17 @@
 	}
 	.brand-finish-icon{background-image: url("@/static/images/study/dao-finish-icon.png");}
 	.brand-arrow{
-		width: 58rpx;height: 58rpx;left: 38%;top: -85%;position: absolute;
+		width: 58rpx;height: 58rpx;left: 38%;top: 50%;position: absolute;
 		@include ezy-no-repeat-cover;background-image: url("@/static/images/study/brand-arrow.gif");
 		}
 	// brand-item 
-	.brand-item{
-		width: 225rpx;height: 48rpx;position: absolute;
-		@include ezy-no-repeat-cover;background-image: url("@/static/images/study/cjdc/dao-item-disabled.png");
-		}
-	.brand-active{background-image: url("@/static/images/study/cjdc/dao-item-active.png");}
+	.brand-item{width: 252rpx;height: 180rpx;position: absolute;}
+	.brand-active .brand-content{background-image: url("@/static/images/study/cjdc/dao-item-active.png");}
 	
-	.brand-item:nth-child(1){top:650rpx;right:42rpx;}
-	.brand-item:nth-child(2){top:780rpx;left:86rpx;}
-	.brand-item:nth-child(3){top:960rpx;right:70rpx;}
-	.brand-item:nth-child(4){top:1100rpx;left:68rpx;}
+	.brand-item:nth-child(1){top:505rpx;right:25rpx;}
+	.brand-item:nth-child(2){top:650rpx;left:75rpx;}
+	.brand-item:nth-child(3){top:820rpx;right:55rpx;}
+	.brand-item:nth-child(4):not([class*="ceshi-brand-item"]){top:980rpx;left:55rpx;}
 	.brand-item.ceshi-brand-item{
 		width: 281rpx;height: 281rpx;top:1100rpx;
 		left: unset;right:45rpx;@include ezy-no-repeat-cover;
@@ -686,30 +685,32 @@
 	}
 	@media (max-height: 750px) {
 		//0.9
-		.ezy-study-wrap{width:600rpx;height:924rpx;top:var(--status-bar-height);left:50%;transform: translateX(-50%);}
+		.ezy-study-wrap{width:600rpx;height:924rpx;top:calc(var(--status-bar-height) + 6%);left:50%;transform: translateX(-50%);}
 		.animal-img{right: 35rpx;top: 190rpx;}
 		.study-name-img{width: 80rpx;height: 80rpx;position: absolute;top: 85rpx;left: 234rpx;}
-		.study-book-img{width: 92rpx;height: 119rpx;top: 100rpx;right:142rpx;}
-		.brand-lock,.brand-finish-icon{width: 55rpx;height: 55rpx;top: -95rpx;right: 54rpx;}
+		.study-book-img{width: 130rpx;height: 179rpx;top: 100rpx;right:125rpx;}
+		.brand-lock,.brand-finish-icon{width: 55rpx;height: 55rpx;top: 12rpx;right: 45rpx;}
+		.brand-content{width: 200rpx;height: 40rpx;line-height: 40rpx;margin: 100rpx auto 0;font-size: 16rpx;}
 		.brand-lock::before{width: 30rpx;height: 36rpx;margin-top: 6rpx;}
-		.brand-arrow{width: 46rpx;height: 46rpx;left: 41%;top: -85%;}
-		.brand-item:nth-child(1){top:530rpx;right:13rpx;}
-		.brand-item:nth-child(2){top:630rpx;left:46rpx;}
-		.brand-item:nth-child(3){top:775rpx;right:35rpx;}
-		.brand-item:nth-child(4){top:890rpx;left:30rpx;}
+		.brand-arrow{width: 46rpx;height: 46rpx;left: 38%;top: 46%;}
+		.brand-item{width: 200rpx;height: 140rpx;}
+		.brand-item:nth-child(1){top:420rpx;right:22rpx;}
+		.brand-item:nth-child(2){top:530rpx;left:60rpx;}
+		.brand-item:nth-child(3){top:660rpx;right:45rpx;}
+		.brand-item:nth-child(4):not([class*="ceshi-brand-item"]){top:780rpx;left:45rpx;}
 		.brand-item.ceshi-brand-item{width: 240rpx;height: 240rpx;top:880rpx;right:40rpx;}
 	}
 	@media (max-height: 700px) {
 		//0.88
 		min-height:1300rpx;
-		.ezy-study-wrap{top:calc(var(--status-bar-height) + -2%);}
+		.ezy-study-wrap{top:calc(var(--status-bar-height) + 4%);}
 		.brand-item.ceshi-brand-item{
 			width: 220rpx;height: 220rpx;top:880rpx;right:40rpx;
 			.brand-lock,.brand-finish-icon{top: 145rpx;right: 58rpx;}
 			}
 	}
 	@media (max-height: 650px){
-		.ezy-study-wrap{top:calc(var(--status-bar-height) + -3%);}
+		.ezy-study-wrap{top:calc(var(--status-bar-height) + 3%);}
 		.brand-item.ceshi-brand-item{
 			width: 200rpx;height: 200rpx;top:860rpx;right:40rpx;
 			.brand-lock,.brand-finish-icon{top: 130rpx;right: 45rpx;}

+ 1 - 1
pages/study/index.vue

@@ -212,7 +212,7 @@
 			getBj('shuxueNew');
 		} else if (currentProduct.value == 2 && typeId.value == 1) {
 			// 英语新(超级单词)
-			productTipImg.value = 'static/images/study/jstx/yingyu-tip.gif'
+			productTipImg.value = 'static/images/study/cjdc/new-yingyu-tip.gif'
 			getBj('yingyuNew');
 		}
 	}

BIN
static/images/catalog/catalog-newyYingyu-bj.png


BIN
static/images/catalog/catalog-newyYingyu-bj2.png


BIN
static/images/study/cjdc/new-yingyu-tip.gif