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

common/styles/global/components.scss

@@ -93,15 +93,15 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 // 两个元素
 .icon-title-navBar-box{
 	display: flex;align-items: center;justify-content: center;
-	padding: calc(36rpx + var(--status-bar-height)) 20rpx 36rpx;box-sizing: border-box;position: relative;
+	padding: calc(6rpx + var(--status-bar-height)) 20rpx 16rpx;box-sizing: border-box;position: relative;
 	
 	.nav-bar-title{
-		font-size: 36rpx;height: 63rpx;line-height: 63rpx;color: #fff;
+		font-size: 34rpx;height: 63rpx;line-height: 63rpx;color: #fff;
 		max-width: 70%;position: relative;z-index: 1;
 	}
 	.nav-bar-icon{
 		width: 100rpx;height: 100rpx;display: flex;align-items: center;
-		position: absolute;left: 0;top: calc(14rpx + var(--status-bar-height));z-index: 1;
+		position: absolute;left: 0;top: calc( var(--status-bar-height) - 12rpx);z-index: 1;
 	}
 	.nav-bar-icon::before{
 		width: 24rpx;height: 38rpx;content: '';display: block;margin-left: 24rpx;

pages/chanpinneirong/index.vue

@@ -5,43 +5,49 @@
 			<text class="nav-bar-title">学习</text>
 		</view>
 		<view class="ezy-page-body xuexi-page-body">
-			<view class="change-dy-box">
+			<view class="xxjl-card-box">
 				<!-- 显示内容 -->
-				<view class="change-dy-content">
-					<view>{{ banbenInfo.chanpinName }}</view>
-					<view>
-						<text>等级</text>
-						<text>{{banbenInfo.dengjiName}}</text>
-					</view>
-					<view>
-						<text>版本</text>
-						<text>{{banbenInfo.name}}</text>
-					</view>
-					<view>
-						<text>单元</text>
-						<text>{{banbenInfo.curDanyuanName}}</text>
-					</view>
-					<view>
-						<text>课程</text>
-						<text>{{banbenInfo.curKechengName}}</text>
-					</view>
-					<view>
-						<view class="xx-progress-box">
-							<view>当前学习进度</view>
-							<progress :percent="curProcess" class="xx-progress" stroke-width="10"
-								backgroundColor="#3c7dfd" activeColor="#ffd11c" />
+				<view class="card-body-box">
+					<img :src="banbenInfo.cover" />
+					<view class="body-right">
+						<view>{{ banbenInfo.chanpinName }}</view>
+						<view>
+							<text>等级</text>
+							<text>{{banbenInfo.dengjiName}}</text>
+						</view>
+						<view>
+							<text>版本</text>
+							<text>{{banbenInfo.name}}</text>
+						</view>
+						<view>
+							<text>单元</text>
+							<text>{{banbenInfo.curDanyuanName}}</text>
+						</view>
+						<view>
+							<text>课程</text>
+							<text>{{banbenInfo.curKechengName}}</text>
 						</view>
-						<view class="jxxx-btn" @click="handlePlay(banbenInfo,'jixu')">继续学习</view>
 					</view>
 				</view>
+				<view class="card-progress-box">
+					<view class="xx-progress-box">
+						<view>学习进度</view>
+						<progress :percent="curProcess" class="xx-progress" stroke-width="10"
+							backgroundColor="#3c7dfd" activeColor="#ffd11c" />
+					</view>
+					<view class="jxxx-btn" @click="handlePlay(banbenInfo,'jixu')">继续学习</view>
+				</view>
 			</view>
 			<view class="xx-scroll-body">
 				<view class="xx-item-list">
+					<view class="xx-item-title">— 以下为当前等级课程目录 —</view>
 					<view v-for="danyuanItem in danyuanList" :key="danyuanItem.danyuanId">
-						<view @click="handleClickDanyuan">
-							<view>L{{danyuanItem.danyuanId}}</view>
-							<view>{{danyuanItem.danyuanName}}</view>
-							<view>{{danyuanItem.danyuanIntro}}</view>
+						<view class="item-dy-box" @click="handleClickDanyuan">
+							<view class="dy-left-box">L{{danyuanItem.danyuanId}}</view>
+							<view class="dy-right-box">
+								<view class="dy-name">{{danyuanItem.danyuanName}}</view>
+								<view>{{danyuanItem.danyuanIntro}}</view>
+							</view>
 						</view>
 						<view class="xx-item-box" v-for="jieItem in danyuanItem.jieList" :key="jieItem.jieId"
 							@click="handlePlay(jieItem,'play')">

pages/xinshuxue/lookShipin.vue

@@ -4,45 +4,47 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{jieInfo.jieIntro}}</text>
 		</view>
-		<view class="ezy-page-body ksp-page-body">
+		<view class="ezy-page-body">
 			<view class="ksp-tab-box">
-				<view class="tab-item" @click="handleSelectHexinti">核心基础题</view>
-				<view class="tab-item" @click="handleSelectNengliTishengti">能力提升题</view>
+				<view class="tab-item" :class="{active: this.showA}" @click="handleSelectHexinti">核心基础题</view>
+				<view class="tab-item" :class="{active: this.showB}" @click="handleSelectNengliTishengti">能力提升题</view>
 			</view>
-			<!-- 核心基础题 -->
-			<videoPlayVue ref="c1" v-show="showA" :key="1" :videoId1="videoId" :progressMarkers1="progressMarkers"
-				:playAuth1="playAuth" :hideFlag1="hideFlag" :seek-time1="seekTime" class="ksp-video-box"
-				@playEnd="playEnd"></videoPlayVue>
-			<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList1" :key="index" v-show="showA">
-				<view class="list-head">
-					<view class="list-title">{{item.name}}</view>
-					<view class="list-btn" @click="markersClick(item)"></view>
-				</view>
-				<view class="ksp-item-box">
-					<!-- <view class="ksp-title">课程位置：{{item.time1}}-{{item.time2}}</view> -->
-					<rich-text :nodes="item.title"></rich-text>
-				</view>
-			</view>
-			<!-- 能力提升题 -->
-			<template v-if="!!videoId2">
-				<videoPlayVue2 ref="c2" v-show="showB" :key="2" :videoId1="videoId2"
-					:progressMarkers1="progressMarkers2" :playAuth1="playAuth2" :hideFlag1="hideFlag2"
-					:seek-time1="seekTime2" class="ksp-video-box" @playEnd="playEnd"></videoPlayVue2>
-				<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList2" :key="index" v-show="showB">
+			<view class="ksp-scroll-view">
+				<!-- 核心基础题 -->
+				<videoPlayVue ref="c1" v-show="showA" :key="1" :videoId1="videoId" :progressMarkers1="progressMarkers"
+					:playAuth1="playAuth" :hideFlag1="hideFlag" :seek-time1="seekTime" class="ksp-video-box"
+					@playEnd="playEnd"></videoPlayVue>
+				<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList1" :key="index" v-show="showA">
 					<view class="list-head">
 						<view class="list-title">{{item.name}}</view>
-						<view class="list-btn" @click="markersClick2(item)"></view>
+						<view class="list-btn" @click="markersClick(item)"></view>
 					</view>
-					<view class="ksp-item-box" >
+					<view class="list-body">
 						<!-- <view class="ksp-title">课程位置：{{item.time1}}-{{item.time2}}</view> -->
 						<rich-text :nodes="item.title"></rich-text>
 					</view>
 				</view>
-			</template>
-			<!-- 无数据 -->
-			<view class="ezy-no-sj" v-else>
-				<icon></icon>
-				<text>暂无数据</text>
+				<!-- 能力提升题 -->
+				<template v-if="!!videoId2">
+					<videoPlayVue2 ref="c2" v-show="showB" :key="2" :videoId1="videoId2"
+						:progressMarkers1="progressMarkers2" :playAuth1="playAuth2" :hideFlag1="hideFlag2"
+						:seek-time1="seekTime2" class="ksp-video-box" @playEnd="playEnd"></videoPlayVue2>
+					<view class="ksp-item-list" v-for="(item,index) in jieInfo.jiedianList2" :key="index" v-show="showB">
+						<view class="list-head">
+							<view class="list-title">{{item.name}}</view>
+							<view class="list-btn" @click="markersClick2(item)"></view>
+						</view>
+						<view class="list-body" >
+							<!-- <view class="ksp-title">课程位置：{{item.time1}}-{{item.time2}}</view> -->
+							<rich-text :nodes="item.title"></rich-text>
+						</view>
+					</view>
+				</template>
+				<!-- 无数据 -->
+				<view class="ezy-no-sj" v-else>
+					<icon></icon>
+					<text>暂无数据</text>
+				</view>
 			</view>
 		</view>
 		<!-- 弹窗 -->