Browse Source

样式修改

tanxue 1 month ago
parent
commit
c8ce340876

+ 4 - 13
common/styles/global/components.scss

@@ -343,11 +343,13 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		icon{width: 42rpx;height: 42rpx;@include ezy-no-repeat-cover;margin-right: 8rpx;}
 		.wx-icon{background-image: url("@/static/images/pay/svip-wx-icon.png");}
 		.zfb-icon{background-image: url("@/static/images/pay/svip-zfb-icon.png");}
+		.apple-icon{background-image: url("@/static/images/common/apple-icon.svg");}
 	}
 	.pay-status-box::after{
 		content:'';width: 24rpx;height: 24rpx;margin-left: 4rpx;
 		@include ezy-no-repeat-cover;background-image: url("@/static/images/common/qiehuan-icon.svg");
 	}
+	.apple-status-box::after{display: none;}
 	.pay-btn{
 		width: 200rpx;height: 80rpx;font-size: 28rpx;line-height: 80rpx;text-align: center;color: #fff;
 		@include ezy-no-repeat-cover;background-image: url("@/static/images/mall/mall-btn.png");
@@ -395,25 +397,14 @@ position: absolute;left: 0;top: -4rpx;opacity: 0.4;}
 	.detail-item-box{
 		display: flex;align-items: center;margin-top: 10rpx;border-bottom: 1px dashed #ccc;
 		box-sizing: border-box;padding-bottom:32rpx;margin-bottom: 32rpx;
-		.mall-image{width: 200rpx;height: 200rpx;margin-right: 16rpx;flex-shrink: 0;}
+		.mall-image{width: 220rpx;height: 220rpx;margin-right: 16rpx;flex-shrink: 0;}
 		.content-body-box{display: flex;flex-direction: column;justify-content: space-between;}
 		.content-name{
 			font-size: 36rpx;color: #000;margin-bottom: 12rpx;display: flex;align-items: center;
 			.name-text{@include single-line-ellipsis;max-width: 320rpx;margin-right: 10rpx;}
 			icon{width:70rpx;height:32rpx;@include ezy-no-repeat-cover;background-image: url("@/static/images/mall/new-icon.png");}
 		}
-		.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(2);line-height: 1.6;}
-		.content-row{
-			display: flex;justify-content: space-between;align-items: center;margin-top: 10rpx;
-			.shop-car-box{
-				width: 70rpx;height: 70rpx;position: relative;
-				@include ezy-no-repeat-cover;background-image: url("@/static/images/mall/shop-car-icon.png");
-			}
-			.car-change{
-				width: 32rpx;height: 30rpx;position: absolute;right: -4rpx;top: -8rpx;
-				@include ezy-no-repeat-cover;background-image: url("@/static/images/mall/change-icon.png");
-			}
-		}
+		.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(3);line-height: 1.6;}
 	}
 	.detail-bottom-box{
 		width: 100%;display: flex;justify-content: space-between;color: #666;padding: 10rpx 0;

+ 3 - 3
common/styles/global/pages.scss

@@ -1554,16 +1554,16 @@
 		margin: 0 3% 10rpx;border-radius: 8rpx;
 		.mall-content-box{
 			display: flex;margin-top: 10rpx;border-bottom: 1px dashed #fff;
-			box-sizing: border-box;padding-bottom:24rpx;margin-bottom: 24rpx;
+			box-sizing: border-box;padding-bottom:10rpx;margin-bottom: 16rpx;
 			.mall-image{width: 220rpx;height: 220rpx;margin-right: 16rpx;flex-shrink: 0;}
 			.content-body-box{display: flex;flex-direction: column;justify-content: space-between;}
 			.content-name{
 				font-size: 36rpx;color: #000;margin-bottom: 12rpx;display: flex;align-items: center;
 				.name-text{@include single-line-ellipsis;max-width: 320rpx;margin-right: 10rpx;}
 			}
-			.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(2);line-height: 1.6;}
+			.content-text{font-size: 24rpx;color: #666;@include multi-line-ellipsis(3);line-height: 1.4;}
 			.content-row{
-				display: flex;justify-content: space-between;align-items: center;margin-top: 10rpx;
+				display: flex;justify-content: space-between;align-items: center;
 				.content-yuanjia{font-size: 36rpx;color: #ff0101;text-decoration: line-through;}
 				.shop-car-box{
 					width: 70rpx;height: 70rpx;position: relative;

+ 3 - 0
pages/mall/mallPage.vue

@@ -35,6 +35,7 @@
 										</view>
 									</view>
 									<view class="mall-bottom-row">
+										<!-- 组合课程显示课程包明细按钮 wgy -->
 										<view class="kcb-btn" @click="productBtn">课程包明细<icon></icon></view>
 										<view class="hdj-text">活动价:¥29.9</view>
 									</view>
@@ -68,6 +69,8 @@
 			<view class="pay-status-box" v-if="showPayWay" @click="switchPayWay"><icon class="wx-icon"></icon>微信</view>
 			<!-- 支付宝 -->
 			<view class="pay-status-box" v-if="!showPayWay" @click="switchPayWay"><icon class="zfb-icon"></icon>支付宝</view>
+			<!-- 苹果 -->
+			<view class="pay-status-box apple-status-box" v-if="false"><icon class="apple-icon"></icon>apple</view>
 			<view class="pay-btn">立即支付</view>
 		</view>
 		

+ 0 - 3
pages/mall/productDialog.vue

@@ -14,9 +14,6 @@
 			 				<view class="name-text">数学暑假进阶L1</view>
 			 			</view>
 			 			<view class="content-text">适用于L1和学前,介绍介绍,适用于L1和学前,介绍介绍适用于L1和学前,介绍介绍</view>
-			 			<view class="content-row">
-			 				<view class="content-yuanjia">¥39.9</view>
-			 			</view>
 			 		</view>
 			 	</view>
 			 </view>

+ 1 - 0
static/images/common/apple-icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1747121174245" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3584" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M791.488 544.095c-1.28-129.695 105.76-191.871 110.528-194.975-60.16-88.032-153.856-100.064-187.232-101.472-79.744-8.064-155.584 46.944-196.064 46.944-40.352 0-102.816-45.76-168.96-44.544-86.912 1.28-167.072 50.528-211.808 128.384-90.304 156.703-23.136 388.831 64.896 515.935 43.008 62.208 94.304 132.064 161.632 129.568 64.832-2.592 89.376-41.952 167.744-41.952s100.416 41.952 169.056 40.672c69.76-1.312 113.984-63.392 156.704-125.792 49.376-72.16 69.728-142.048 70.912-145.632-1.536-0.704-136.064-52.224-137.408-207.136zM662.56 163.52C698.304 120.16 722.432 60 715.84 0c-51.488 2.112-113.888 34.304-150.816 77.536-33.152 38.368-62.144 99.616-54.368 158.432 57.472 4.48 116.128-29.216 151.904-72.448z" p-id="3585"></path></svg>

+ 1 - 0
static/images/common/jt-up-white-icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1746776764261" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2616" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M966.4 668.8l-435.2-432c-9.6-9.6-25.6-9.6-35.2 0l-441.6 432c-9.6 9.6-9.6 25.6 0 35.2 9.6 9.6 25.6 9.6 35.2 0l425.6-416 416 416c9.6 9.6 25.6 9.6 35.2 0S976 678.4 966.4 668.8z" p-id="2617" fill="#fff"></path></svg>