Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学

App.vue

@@ -73,7 +73,7 @@
 	/* 公共样式 */
 	@import '/common/styles/index.scss';
 
-	// 小米字体、思源黑体、苹果平方、数字字体、通用无衬线字体
+	// 小米字体、苹果平方、通用无衬线字体
 	body,
 	html,
 	#app {

common/styles/global/components.scss

@@ -137,24 +137,6 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 
 
 /***** 标题栏  *****/
-// 三个元素
-.ezy-navBar-box{
-	display: flex;align-items: center;justify-content: space-between;
-	padding: 0 20rpx 20rpx;box-sizing: border-box;position: relative;
-	.nav-bar-icon{
-		width: 24rpx;height: 38rpx;
-		background-image: url("@/static/images/common/navBar-return-btn.png");@include ezy-no-repeat-cover();
-	}
-	.nav-bar-title{font-size: 36rpx;color: #fff;}
-	// 考试数字
-	.nav-bar-other{
-		font-size: 30rpx;color: #fff;margin-right: 2%;
-		.key-note{color: #ffff01;}
-	}
-	// 文字按钮
-	.text-btn{font-size: 26rpx;color: #fff;padding-top: 4rpx;box-sizing: border-box;}
-}
-// 两个元素
 .icon-title-navBar-box{
 	display: flex;align-items: center;justify-content: center;
 	padding: calc(6rpx + var(--status-bar-height)) 20rpx 16rpx;box-sizing: border-box;position: relative;
@@ -175,6 +157,10 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		width: 100%;height: 356rpx;content: '';display: block;position: absolute;z-index: 0;top: 0;left: 0;
 		background-image: url("@/static/images/phone/common/page-header-bj.png");@include ezy-no-repeat-cover(top);
 	}
+	// 右侧文字按钮
+	.navBar-text-btn{font-size: 26rpx;color: #fff;padding-top: 4rpx;box-sizing: border-box;
+	position: absolute;right: 4%;}
+	
 	/*** pad ***/
 	@include mediaSmall() {
 		padding: calc(6rpx + var(--status-bar-height)) 20rpx 10rpx;
@@ -182,12 +168,14 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		.nav-bar-icon{width: 46rpx;height: 46rpx;top: calc(6rpx + var(--status-bar-height));}
 		.nav-bar-icon::before{width: 16rpx;height: 25rpx;margin-left: 20rpx;}
 		&::before{height: 160rpx;background-image: url("@/static/images/pad/common/page-header-bj.png");}
+		.navBar-text-btn{font-size: 20rpx;padding-top: 3rpx;right: 3%;}
 	}
 	@include mediaBig(){
 		.nav-bar-title{font-size: 66rpx;height: 180rpx;line-height: 180rpx;}
 		.nav-bar-icon{width: 180rpx;height: 180rpx;}
 		.nav-bar-icon::before{width: 38rpx;height: 61rpx;margin-left: 42rpx;}
 		&::before{height: 420rpx;}
+		.navBar-text-btn{font-size: 46rpx;padding-top: 6rpx;right: 3%;}
 	}
 }
 // 仅一个返回按钮
@@ -200,13 +188,12 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 
 	@include mediaSmall() {
 			width: 65rpx;height: 65rpx;
-			&::after {width: 16rpx;height: 25rpx;margin: 8rpx 21rpx 8rpx;}
-		}
-
-		@include mediaBig() {
-			width: 160rpx;height: 160rpx;
-			&::after {width: 38rpx;height: 61rpx;margin: 19rpx 51rpx 19rpx;}
-		}
+		&::after {width: 16rpx;height: 25rpx;margin: 8rpx 21rpx 8rpx;}
+	}
+	@include mediaBig() {
+		width: 160rpx;height: 160rpx;
+		&::after {width: 38rpx;height: 61rpx;margin: 19rpx 51rpx 19rpx;}
+	}
 }
 
 /***** 登录按钮 *****/

common/styles/global/pages.scss

@@ -382,29 +382,31 @@
 					margin-left: 16rpx;font-size: 22rpx;
 				}
 			}
-			.bd-btn{width: 671rpx;height: 53rpx;line-height: 53rpx;font-size: 22rpx;font-weight: normal;margin: 55rpx auto 0;}
+			.bd-btn{width: 672rpx;height: 53rpx;line-height: 53rpx;font-size: 22rpx;font-weight: normal;
+			margin: 55rpx auto 0;@include ezy-no-repeat-contain();}
 			.login-btn-normal.bd-btn{background-image: url("@/static/images/pad/common/btn-bj.png");}
+			.login-btn-disabled.bd-btn{background-image: url("@/static/images/pad/common/btn-bj-disabled.png");}
 		}
 
-		@include mediaBig() {
-			.bind-tel-body{padding: 58rpx;}
-			.tel-input{
-				width: 1800rpx;height: 160rpx;border-radius: 26rpx;
-				.phone-input {font-size: 54rpx;padding: 0 48rpx;}
-				.uni-input-placeholder {font-size: 54rpx;}
-				.close-btn{width: 67rpx;height: 67rpx;margin-right: 48rpx;}
-			}
-			.yzm-row{
-				width: 1800rpx;margin: 58rpx auto 0;
-				.yzm-btn{
-					width: 432rpx;height: 160rpx;line-height: 160rpx;
-					margin-left: 32rpx;font-size: 54rpx;
-				}
-			}
-			.bd-btn{
-				width: 1800rpx;height: 142rpx;line-height: 142rpx;font-size: 54rpx;margin: 134rpx auto 0;
+	@include mediaBig() {
+		.bind-tel-body{padding: 58rpx;}
+		.tel-input{
+			width: 1800rpx;height: 160rpx;border-radius: 26rpx;
+			.phone-input {font-size: 54rpx;padding: 0 48rpx;}
+			.uni-input-placeholder {font-size: 54rpx;}
+			.close-btn{width: 67rpx;height: 67rpx;margin-right: 48rpx;}
+		}
+		.yzm-row{
+			width: 1800rpx;margin: 58rpx auto 0;
+			.yzm-btn{
+				width: 432rpx;height: 160rpx;line-height: 160rpx;
+				margin-left: 32rpx;font-size: 54rpx;
 			}
 		}
+		.bd-btn{
+			width: 1800rpx;height: 142rpx;line-height: 142rpx;font-size: 54rpx;margin: 134rpx auto 0;
+		}
+	}
 
 }
 
@@ -685,7 +687,7 @@
 	}
 	.dagang-content-box::before{
 		content: '';width: 750rpx;height: 193rpx;display: block;@include ezy-no-repeat-cover;
-		background-image: url("@/static/images/common/xuexi/dagang-img.png");
+		background-image: url("@/static/images/phone/xuexi/dagang-img.png");
 		position: absolute;top: -138rpx;left: 0;z-index: 1;
 	}
 
@@ -727,7 +729,8 @@
 						}
 				}
 			}
-			.dagang-content-box::before{width: 749rpx;height: 192rpx;top: -140rpx;}
+			.dagang-content-box::before{width: 747rpx;height: 183rpx;top: -140rpx;
+			background-image: url("@/static/images/pad/xuexi/dagang-img.png");}
 		}
 
 		@include mediaBig() {
@@ -1429,7 +1432,8 @@
 			.answer-line{top: 10rpx;bottom: 10rpx;}
 		}
 		.answer-stjx-box{
-			.answer-rich-text{font-size: 21rpx;line-height: 1.8;}
+			font-size: 20rpx;
+			.answer-rich-text{font-size: 20rpx;line-height: 1.8;}
 		}
 		.answer-video-box{
 			margin-bottom: 16rpx;
@@ -1464,6 +1468,7 @@
 			.answer-line{top: 26rpx;bottom: 26rpx;}
 		}
 		.answer-stjx-box{
+			font-size: 46rpx;
 			.answer-rich-text{font-size: 46rpx;line-height: 1.8;}
 		}
 		.answer-video-box{
@@ -1485,9 +1490,10 @@
 		.head-content-box{font-size: 30rpx;}
 	}
 
-	.my-banner-img{
-		width: 730rpx;height: 413rpx;@include ezy-no-repeat-cover;margin: 0 auto;
-		background-image: url("@/static/images/phone/my/my-banner.png");border-radius: 16rpx;
+	.my-hyqy-swiper{
+		width: 710rpx;height: 402rpx;margin: 0 auto;border-radius: 12rpx;overflow: hidden;
+		.uni-swiper-dots-horizontal{bottom: 24rpx;}
+		.my-banner-img{max-width: 100%;}
 	}
 
 	// list
@@ -1520,8 +1526,7 @@
 			.head-img-box{width: 130rpx;height: 130rpx;margin: 0 16rpx 0 8rpx;}
 			.head-content-box{font-size: 28rpx;}
 		}
-		.my-banner-img{width: 712rpx;height: 300rpx;border-radius: 10rpx;
-		background-image: url("@/static/images/pad/my/my-banner.png");}
+		.my-hyqy-swiper{width: 712rpx;height: 300rpx;border-radius: 10rpx;}
 		.my-list-box{
 			width: 712rpx;margin: 16rpx auto;padding: 30rpx 4rpx 0;border-radius: 16rpx;
 			justify-content: space-around;
@@ -1543,7 +1548,7 @@
 			.head-img-box{width: 350rpx;height: 350rpx;margin: 0 38rpx 0 19rpx;}
 			.head-content-box{font-size: 66rpx;}
 		}
-		.my-banner-img{width: 1940rpx;height: 818rpx;border-radius: 26rpx;}
+		.my-hyqy-swiper{width: 1940rpx;height: 818rpx;border-radius: 26rpx;}
 		.my-list-box{
 			width: 1940rpx;margin: 38rpx auto;padding: 75rpx 10rpx 0;border-radius: 26rpx;
 			.list-item{font-size: 45rpx;margin-bottom: 75rpx;}

pages/chanpinMy/my.vue

@@ -14,8 +14,26 @@
 					</view> -->
 				</view>
 			</view>
-			<!-- 图 -->
-			<view class="my-banner-img"></view>
+			<!-- 手机banner图 -->
+			<swiper class="my-hyqy-swiper ezy-hidden-pad" circular :indicator-dots="hyqyData.indicatorDots" :autoplay="hyqyData.autoplay"
+				:interval="hyqyData.interval" :duration="hyqyData.duration" indicator-color="#5195d3"
+				indicator-active-color="#83d9ff" v-if="bannerArr">
+				<!-- 1.数学 2.英语-->
+				<swiper-item v-for="(item, index) in bannerArr" :key="index" class="hyqy-box" @click="hyqyBtn(item)">
+					<img :src="item.addCover" class="my-banner-img" />
+				</swiper-item>
+			</swiper>
+			<!-- padbanner图 -->
+			<swiper class="my-hyqy-swiper ezy-hidden-phone" circular :indicator-dots="hyqyData.indicatorDots" :autoplay="hyqyData.autoplay"
+				:interval="hyqyData.interval" :duration="hyqyData.duration" indicator-color="#5195d3"
+				indicator-active-color="#83d9ff" v-if="bannerArr">
+				<!-- 1.数学 2.英语-->
+				<swiper-item v-for="(item, index) in bannerPadArr" :key="index" class="hyqy-box" @click="hyqyBtn(item)">
+					<img :src="item.addCover" class="my-banner-img" />
+				</swiper-item>
+			</swiper>
+			
+			<!-- <view class="my-banner-img"></view> -->
 
 			<!-- 设置 -->
 			<view class="my-list-box">
@@ -96,6 +114,21 @@
 	let pageFrom = ref(null)
   const goLoRef = ref(null)
   let tishiTxt = ref('您现在是游客身份，请先登录再进行兑换操作！')
+  // banner
+  let hyqyData = reactive({
+  	indicatorDots: true,
+  	autoplay: true,
+  	interval: 10000,
+  	duration: 500
+  });
+  const bannerArr = ref([
+    { addCover: 'static/images/phone/my/my-banner1.png' }, // 替换为实际图片路径
+    { addCover: 'static/images/phone/my/my-banner2.png' }  // 替换为实际图片路径
+  ]);
+  const bannerPadArr = ref([
+    { addCover: 'static/images/pad/my/my-banner1.png' }, // 替换为实际图片路径
+    { addCover: 'static/images/pad/my/my-banner2.png' }  // 替换为实际图片路径
+  ]);
 
 	onShow(() => {
 		console.log('pageFrom.value', pageFrom.value);

pages/xinshuxue/lookShipin.vue

@@ -147,6 +147,15 @@
 			},
 			handleSelectNengliTishengti() {
 				if (this.showB) return;
+				
+				if (!this.jieInfo.jiedianList2 || this.jieInfo.jiedianList2.length === 0) {
+					toast("本节无能力提升题");
+					// tab回核心基础题状态
+					this.showB = false;
+					this.showA = true;
+					return; 
+				}
+				
 				this.showB = true;
 				this.showA = false;
 				this.$refs.c1 && this.$refs.c1.handleStop()