wangguoyu 1 month ago
parent
commit
f29c77ce19
2 changed files with 67 additions and 195 deletions
  1. 2 2
      api/chanpinneirong.js
  2. 65 193
      pages/chanpinneirong/index.vue

+ 2 - 2
api/chanpinneirong.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
-export function shuxueChanpinBanben(data = {}) {
+export function shuxueChanpinDanyuanInfo(data = {}) {
   return request({
   return request({
-    'url': '/app/shuxue/chanpin/banben/info',
+    'url': '/app/shuxue/chanpin/danyuan/info',
     headers: {
     headers: {
       isToken: true
       isToken: true
     },
     },

+ 65 - 193
pages/chanpinneirong/index.vue

@@ -1,58 +1,56 @@
 <template>
 <template>
 	<view class="container">
 	<view class="container">
-		<!-- 当前单元标题(吸顶效果) -->
-		<view class="sticky-title" v-if="currentUnitName">
-			 {{ showStickyTitle ? currentUnitName : "学习" }}
+		<view class="sticky-title">
+			学习
 		</view>
 		</view>
+		<view>
+			<view class="arrow-nav">
+				<view class="arrow" :class="{ 'disabled': currentIndex == 0 }" @click="prev">
+					左箭头
+				</view>
 
 
-		<!-- 返回顶部按钮 -->
-		<view class="back-top" v-if="showBackTop" @click="scrollToTop">
-			<text>↑</text>
+				<view class="arrow" :class="{ 'disabled': currentIndex == list.length - 1 }" @click="next">
+					右箭头
+				</view>
+			</view>
+			<!-- 显示内容 -->
+			<view class="current-content">
+				<text>{{ danyuanInfo.danyuanName }}</text>
+				<text>{{ danyuanInfo.danyuanIntro }}</text>
+			
+			</view>
 		</view>
 		</view>
-
+	
 		<scroll-view scroll-y class="scroll-view" :scroll-top="scrollTop" @scroll="onScroll">
 		<scroll-view scroll-y class="scroll-view" :scroll-top="scrollTop" @scroll="onScroll">
-			<view class="subject-info" v-if="subjectDetail">
-				<text class="course-name">{{ subjectDetail.chanpinName }}</text>
-				<text class="course-name">等级:{{ subjectDetail.dengjiName }}</text>
-				<text class="course-name">版本:{{ subjectDetail.dengjiName }}</text>
-				<text class="course-name">单元:{{ subjectDetail.curDanyuanName }}</text>
+			<view>
 				<progress :percent="20" class="exam-progress-box" stroke-width="10" backgroundColor="#3c7dfd"
 				<progress :percent="20" class="exam-progress-box" stroke-width="10" backgroundColor="#3c7dfd"
 					activeColor="#ffd11c" />
 					activeColor="#ffd11c" />
 				<text class="course-name" @click="handlePlay(subjectDetail,'jixu')">继续学习</text>
 				<text class="course-name" @click="handlePlay(subjectDetail,'jixu')">继续学习</text>
+				<view>单元大纲</view>
+				<view>单元目录</view>
 			</view>
 			</view>
-			<!-- 单元列表 -->
-			<view v-for="(unit, index) in danyuanList" :key="unit.danyuanId" :id="'unit-' + index" class="unit-item">
-				<!-- 单元标题 -->
-				<view class="unit-title" @click="handleClickDanyuan(unit)">
-					<text class="unit-name">{{ unit.danyuanName }}</text>
-					<text class="unit-intro">{{ unit.danyuanIntro }}</text>
+			<view v-for="section in dagangList" :key="section.jieId" class="section-item">
+				<view class="status" :class="section.wanchengFlag === 1 ? 'completed' : 'uncompleted'">
+					{{ section.wanchengFlag === 1 ? '已完成' : '未开始' }}
 				</view>
 				</view>
-				<text class="unit-name">{{ unit.danyuanName }}</text>
-				<!-- 节列表 -->
-				<view v-for="section in unit.jieList" :key="section.jieId" class="section-item">
-					<view class="status" :class="section.wanchengFlag === 1 ? 'completed' : 'uncompleted'">
-						{{ section.wanchengFlag === 1 ? '已完成' : '未开始' }}
-					</view>
-					<view class="section-left">
-						<image class="section-cover" :src="section.cover" mode="aspectFill"></image>
-						<view class="section-info">
-							<text class="section-name">{{ section.jieName }}</text>
-							<text class="section-desc">{{ section.jieIntro }}</text>
-						</view>
-					</view>
-					<view class="section-right">
-						<text class="section-number">第{{ section.number }}节</text>
-						<text @click="handlePlay(section,'play')">播放按钮</text>
+				<view class="section-left">
+					<image class="section-cover" :src="section.cover" mode="aspectFill"></image>
+					<view class="section-info">
+						<text class="section-name">{{ section.jieName }}</text>
+						<text class="section-desc">{{ section.jieIntro }}</text>
 					</view>
 					</view>
 				</view>
 				</view>
+				<view class="section-right">
+					<text class="section-number">第{{ section.number }}节</text>
+					<text @click="handlePlay(section,'play')">播放按钮</text>
+				</view>
 			</view>
 			</view>
-
 			<!-- 底部占位 -->
 			<!-- 底部占位 -->
-			<view style="height: 100px; text-align: center;">查看更多内容</view>
+			<view style="height: 100px; text-align: center;">学习下一单元</view>
 		</scroll-view>
 		</scroll-view>
-		
+
 		<danyuanInfoVue ref="dyRef" v-if="isShow" @close="isShow= false"></danyuanInfoVue>
 		<danyuanInfoVue ref="dyRef" v-if="isShow" @close="isShow= false"></danyuanInfoVue>
-		
+
 		<CustomTabBar :currentTabNumber="1"></CustomTabBar>
 		<CustomTabBar :currentTabNumber="1"></CustomTabBar>
 	</view>
 	</view>
 </template>
 </template>
@@ -60,22 +58,19 @@
 <script>
 <script>
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import {
 	import {
-		shuxueChanpinBanben
+		shuxueChanpinDanyuanInfo
 	} from "@/api/chanpinneirong.js"
 	} from "@/api/chanpinneirong.js"
 	import danyuanInfoVue from '@/pages/xinshuxue/components/danyuanInfo.vue';
 	import danyuanInfoVue from '@/pages/xinshuxue/components/danyuanInfo.vue';
-	
+
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
-				danyuanList: [],
+				dagangList: [],
 				currentUnitName: "",
 				currentUnitName: "",
-				subjectDetail: null,
-				showBackTop: false,
-				scrollTop: 0,
-				pageCacheKey: 'learn_page_scroll_cache',
-				hasRestoredScroll: false,
-				showStickyTitle: false,
-				isShow: true
+				isShow: true,
+				currentIndex: 0,
+				danyuanInfo:{}
+			
 			}
 			}
 		},
 		},
 		components: {
 		components: {
@@ -83,19 +78,11 @@
 			danyuanInfoVue,
 			danyuanInfoVue,
 		},
 		},
 		onShow() {
 		onShow() {
-
 			console.log('学习页面显示,尝试恢复滚动位置')
 			console.log('学习页面显示,尝试恢复滚动位置')
-			// 如果没有恢复过,从缓存恢复
-			if (!this.hasRestoredScroll) {
-				this.restoreScrollPosition()
-			}
 		},
 		},
-
-		// 新增:页面隐藏时保存滚动位置
 		onHide() {
 		onHide() {
 
 
 			console.log('学习页面隐藏,保存滚动位置')
 			console.log('学习页面隐藏,保存滚动位置')
-			this.saveScrollPosition()
 		},
 		},
 
 
 		onLoad() {
 		onLoad() {
@@ -103,16 +90,20 @@
 			this.loadDataFromApi()
 			this.loadDataFromApi()
 		},
 		},
 
 
-		onReady() {
+		methods: {
 
 
-			// 页面渲染完成后执行
-			setTimeout(() => {
-				this.getUnitPositions();
-			}, 300);
-		},
+			prev() {
+				if (this.currentIndex > 0) {
+					this.currentIndex--
+				}
+			},
+			next() {
+				if (this.currentIndex < this.list.length - 1) {
+					this.currentIndex++
+				}
+			},
 
 
-		methods: {
-			handlePlay(da,code) {
+			handlePlay(da, code) {
 				let jieId = null;
 				let jieId = null;
 				if (code == 'jixu') {
 				if (code == 'jixu') {
 					jieId = da.curJieId;
 					jieId = da.curJieId;
@@ -132,158 +123,39 @@
 					}
 					}
 				}
 				}
 			},
 			},
-			handleClickDanyuan(item){
+			handleClickDanyuan(item) {
 				console.log('item', item)
 				console.log('item', item)
 				this.isShow = true;
 				this.isShow = true;
 				setTimeout(() => {
 				setTimeout(() => {
 					this.$refs.dyRef.handleShow(item.danyuanId)
 					this.$refs.dyRef.handleShow(item.danyuanId)
-				},100)
+				}, 100)
 			},
 			},
 
 
 			loadDataFromApi() {
 			loadDataFromApi() {
 				const req = {
 				const req = {
-					banbenId: 7
+					banbenId: 7,
+					danyuanId:2
 				}
 				}
-				shuxueChanpinBanben(req).then(res => {
-					this.subjectDetail = res.data
-					this.danyuanList = res.data.danyuanList || []
+				shuxueChanpinDanyuanInfo(req).then(res => {
+					this.danyuanInfo = res.data
+					this.dagangList = res.data.dagangList || []
 					// 初始化当前单元
 					// 初始化当前单元
-					if (this.danyuanList.length > 0) {
-						this.currentUnitName = this.danyuanList[0].danyuanName
-					}
+					// if (this.danyuanList.length > 0) {
+					// 	this.currentUnitName = this.danyuanList[0].danyuanName
+					// }
 				})
 				})
 			},
 			},
 
 
-			// 保存滚动位置到缓存
-			saveScrollPosition() {
-				if (this.scrollTop > 0) {
-					const scrollData = {
-						scrollTop: this.scrollTop,
-						currentUnit: this.currentUnitName,
-						timestamp: Date.now()
-					}
-					uni.setStorageSync(this.pageCacheKey, scrollData)
-					console.log('保存滚动位置到缓存:', scrollData.scrollTop, '当前单元:', scrollData.currentUnit)
-				}
-			},
 
 
-			// 从缓存恢复滚动位置
-			restoreScrollPosition() {
-				try {
-					const saved = uni.getStorageSync(this.pageCacheKey)
-					if (saved && saved.scrollTop > 0) {
-						this.showStickyTitle = true
-						// 延迟执行滚动
-						setTimeout(() => {
-							this.scrollTop = saved.scrollTop
-
-							// 恢复当前单元名称
-							if (saved.currentUnit) {
-								this.currentUnitName = saved.currentUnit
-							}
-
-							this.hasRestoredScroll = true
-
-							// 再次延迟确保滚动生效
-							// setTimeout(() => {
-							// 	this.scrollTop = saved.scrollTop + 0.01
-							// }, 50)
-						}, 100)
-					} else {
-						this.showStickyTitle = false
-					}
-				} catch (e) {
-					console.error('读取缓存失败:', e)
-				}
-			},
 
 
-			// 获取每个单元的位置信息
-			getUnitPositions() {
-				const query = uni.createSelectorQuery().in(this);
 
 
-				this.danyuanList.forEach((unit, index) => {
-					query.select('#unit-' + index).boundingClientRect();
-				});
 
 
-				query.exec((res) => {
-					console.log('单元位置信息:', res);
-				});
-			},
 
 
 			// 滚动事件处理
 			// 滚动事件处理
 			onScroll(e) {
 			onScroll(e) {
 				const scrollTop = e.detail.scrollTop;
 				const scrollTop = e.detail.scrollTop;
-
 				// 更新滚动位置
 				// 更新滚动位置
 				this.scrollTop = scrollTop;
 				this.scrollTop = scrollTop;
-
-				// 实时保存到缓存
-				const saveData = {
-					scrollTop: scrollTop,
-					currentUnit: this.currentUnitName,
-					timestamp: Date.now()
-				}
-				uni.setStorageSync(this.pageCacheKey, saveData)
-
-				// 显示/隐藏返回顶部按钮
-				this.showBackTop = scrollTop > 400;
-
-				// 监听滚动,更新当前显示的单元
-				this.updateCurrentUnit(scrollTop);
-			},
-
-			// 更新当前显示的单元
-			updateCurrentUnit(scrollTop) {
-
-				const query = uni.createSelectorQuery().in(this);
-
-				for (let i = 0; i < this.danyuanList.length; i++) {
-					query.select('#unit-' + i).boundingClientRect();
-				}
-				query.exec((res) => {
-					// 添加一个偏移量,让切换更平滑
-					const offset = 80;
-					for (let i = 0; i < res.length; i++) {
-						const rect = res[i];
-						if (rect) {
-							// 计算单元在页面中的实际位置(考虑滚动)
-							const unitTop = rect.top + scrollTop;
-							if (scrollTop + offset >= unitTop) {
-								if (i == res.length - 1 || scrollTop + offset < (res[i + 1].top + scrollTop)) {
-									// 每次滚动都设置吸顶标题显示状态
-									this.showStickyTitle = i >= 1
-
-									if (this.currentUnitName !== this.danyuanList[i].danyuanName) {
-										this.currentUnitName = this.danyuanList[i].danyuanName;
-
-										// 单元变化时立即保存
-										const saveData = {
-											scrollTop: this.scrollTop,
-											currentUnit: this.currentUnitName,
-											timestamp: Date.now()
-										}
-										uni.setStorageSync(this.pageCacheKey, saveData)
-									}
-									break;
-								}
-							}
-						}
-					}
-				});
-			},
-
-			// 返回顶部
-			scrollToTop() {
-				// 清除缓存
-				uni.removeStorageSync(this.pageCacheKey)
-				this.hasRestoredScroll = false
-				this.showStickyTitle = false
-				// 回到顶部
-				this.scrollTop = this.scrollTop + 1; // 先改变值触发重新渲染
-				this.$nextTick(() => {
-					this.scrollTop = 0;
-					this.currentUnitName = this.danyuanList[0].danyuanName;
-				});
 			}
 			}
 		}
 		}
 	}
 	}