Merge branch '2025鹅状元数学' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025鹅状元数学

api/chanpinneirong.js

@@ -58,3 +58,15 @@ export function shuxueSave2(data = {}) {
     timeout: 20000
   })
 }
+
+export function yingyuPinduInfo(data = {}) {
+  return request({
+    'url': '/app/pindu/chanpin/danyuan/info',
+    headers: {
+      isToken: true
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}

pages/chanpinneirong/chanpin4.vue

@@ -0,0 +1,344 @@
+<template>
+	<view class="ezy-page-body xuexi-page-body">
+		<!-- 滚动区域 -->
+		<scroll-view v-if="existData" :scroll-with-animation="true" scroll-y :scroll-top="scrollTop"
+			@scroll="handleScroll">
+			<view class="xxjl-card-box-padding">
+				<view class="xxjl-card-box">
+					<!-- 显示内容 -->
+					<view class="card-body-box">
+						<img :src="neirongInfo.cover" />
+						<view class="body-right">
+							<view class="right-name">{{ neirongInfo.chanpinName }}</view>
+							<view class="right-item right-item-mini">等级：{{neirongInfo.dengjiName}}</view>
+							<view class="right-item">版本：{{neirongInfo.name}}</view>
+							<view>课程：{{neirongInfo.curKechengName}}</view>
+						</view>
+					</view>
+					<view class="card-progress-box">
+						<view class="xx-progress-box">
+							<view class="progress-title">学习进度</view>
+							<progress :percent="curProcess" class="xx-progress" stroke-width="20"
+								backgroundColor="#3c7dfd" activeColor="#ffd11c" />
+						</view>
+						<ezyActiveVue class="ezy-btn-active jxxx-btn" @aclick="handlePlay(neirongInfo,'jixu')">
+						</ezyActiveVue>
+					</view>
+				</view>
+			</view>
+
+			<view class="xx-item-list">
+				<view class="xx-item-title">— 以下为当前等级课程目录 —</view>
+
+				<view v-for="(item, index) in dagangList" :key="item.jieId">
+					<!-- 节列表 -->
+					<ezyActiveVue class="ezy-list-item-active xx-item-box" :class="item.lock?'xx-disabled-item-box':''"
+						@aclick="handlePlay(item,'play')">
+						<view class="xx-item-status"
+							:class="item.wanchengFlag == 1 ? 'completed-status' : 'uncompleted-status'"></view>
+						<img :src="item.cover" />
+						<view class="xx-text-box">
+							<view>{{ item.jieName }}</view>
+							<view>{{ item.jieIntro }}</view>
+						</view>
+						<view v-if="item.lock" class="xx-item-lock-btn"></view>
+						<view v-else class="xx-item-btn"></view>
+					</ezyActiveVue>
+				</view>
+
+				<view class="xx-item-title">本级别最后一单元啦~</view>
+				<view class="xx-more-btn" @click="moreBtn"></view>
+			</view>
+		</scroll-view>
+		<!-- 回到顶部 -->
+		<view v-show="showGoTop" class="go-top-btn" @click="goTopBtn"></view>
+
+		<!-- 无数据占位 -->
+		<view v-if="!existData" class="ezy-page-body">
+			<view class="ezy-no-sj">
+				<icon></icon>
+				<text>暂无数据</text>
+			</view>
+		</view>
+		<!-- 弹窗组件 -->
+		<danyuanInfoVue ref="dyRef" v-if="isShow" @close="isShow = false"></danyuanInfoVue>
+		<!-- 购买提示窗 -->
+		<tipSmallDialog ref="gmtRef" content="需要购买当前课程才能学习" @confirm-btn="handleConfirmBtn" qrBtnName="前往购买">
+		</tipSmallDialog>
+	</view>
+</template>
+
+<script>
+	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
+	import CustomTabBar from '@/components/custom-tabbar/index.vue';
+	import cacheManager from "@/utils/cacheManager.js";
+	import {
+		yingyuPinduInfo,
+		shuxueSave2
+	} from "@/api/chanpinneirong.js"
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from "@dcloudio/uni-app"
+	import danyuanInfoVue from '@/pages/xinshuxue/components/danyuanInfo.vue';
+	import {
+		toast
+	} from '../../utils/common';
+	import {
+		updateChanpin4Process
+	} from "./useNeirongChanpin4"
+	import tipSmallDialog from "@/components/dialog/tipSmallDialog.vue";
+	// 产品2 计算特训
+	export default {
+		data() {
+			return {
+				canExitApp: false,
+
+				dagangList: [],
+				neirongInfo: {},
+				banbenId: '',
+				jieId: '',
+				chanpinId: '',
+				dengjiId: '',
+				curProcess: '',
+				existData: false,
+				isShow: false,
+				danyuanId: '',
+				stickyHeight: 0, // 吸顶栏高度（px）
+				currentStickyTitle: '', // 初始为空，不显示吸顶
+				currentStickyIntro: '',
+				currentDanyuanId: '',
+				currentStickyDengjiId: '',
+				titlePositions: [],
+				scrollTop: 0,
+				showGoTop: false,
+				scrollThreshold: 300,
+			}
+		},
+		components: {
+			CustomTabBar,
+			danyuanInfoVue,
+			ezyActiveVue,
+			tipSmallDialog
+		},
+
+		onHide() {
+			console.log('学习页面隐藏')
+		},
+		onUnload() {
+			// 页面卸载无需特殊处理
+		},
+		methods: {
+			handleConfirmBtn() {
+				// 加锁视频需要购买
+				uni.navigateTo({
+					url: "/pages/chanpinShop/cp2/dingdan"
+				})
+			},
+			initData(data) {
+				console.log('4444444');
+				const cacheData = cacheManager.get('contentInfo');
+				if (cacheData) {
+					console.log('使用缓存数据');
+					this.updateFromCache();
+				} else {
+					console.log('重新请求数据');
+					this.initFromOptions(data);
+				}
+			},
+			goTopBtn() {
+				// 替换原来的 uni.pageScrollTo
+				this.scrollTop = Math.random(); // 先设置一个随机值
+				this.$nextTick(() => {
+					this.scrollTop = 0; // 再设置回0
+				});
+
+				this.showGoTop = false;
+			},
+			moreBtn() {
+				uni.switchTab({
+					url: '/pages/chanpinXuanze/index'
+				})
+			},
+
+			initFromOptions(data) {
+
+				this.loadDataFromApi(data);
+			},
+			// 从缓存更新数据方法
+			updateFromCache() {
+				console.log('12311');
+				updateChanpin4Process()
+				const cacheData = cacheManager.get('contentInfo');
+				console.log('cacheData 从缓存更新数据方法', cacheData);
+				if (cacheData) {
+					this.neirongInfo = {
+						...cacheData
+					};
+					this.curProcess = cacheData.curProcess;
+					this.dagangList = [...(cacheData.dagangList || [])];
+					console.log('dagangListdagangList', this.dagangList);
+					this.dengjiId = cacheData.dengjiId
+					this.danyuanId = cacheData.danyuanId
+					this.chanpinId = cacheData.chanpinId
+
+					if (this.dagangList.length == 0) {
+						this.existData = false
+					} else {
+						this.existData = true
+					}
+					// this.$nextTick(() => {
+					// 	this.updateTitlePositions();
+					// });
+				} else {
+					this.existData = false;
+				}
+			},
+
+			loadDataFromApi(data) {
+				console.log('data', data);
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.dengjiId = data.dengjiId
+				this.danyuanId = data.danyuanId
+				this.chanpinId = data.chanpinId
+				this.neirongInfo = {}
+				this.curProcess = ''
+				this.dagangList = []
+				const req = {
+					dengjiId: this.dengjiId,
+					danyuanId: this.danyuanId,
+
+				}
+				yingyuPinduInfo(req).then(res => {
+					if (res.code === 0) {
+
+						this.neirongInfo = res.data;
+						this.neirongInfo.jieId = res.data.curJieId;
+						this.curProcess = res.data.curProcess * 100;
+						this.dagangList = res.data.dagangList || [];
+						if (this.dagangList.length == 0) {
+							this.existData = false
+						} else {
+							this.existData = true
+						}
+						const cacheData = {
+							...res.data,
+							dengjiId: this.dengjiId,
+							chanpinId: this.chanpinId
+						};
+						cacheManager.set('contentInfo', cacheData);
+						uni.hideLoading();
+					}
+				}).catch(res => {
+					cacheManager.remove("contentInfo");
+					toast("加载失败，请重试");
+					uni.hideLoading();
+				});
+			},
+
+
+			handleScroll(e) {
+				const scrollTop = e.detail.scrollTop;
+				console.log('scrollTop', scrollTop);
+				this.showGoTop = scrollTop > this.scrollThreshold;
+			},
+
+			getJieAndDanyuan(data, jieId) {
+				for (let jie of data.dagangList) {
+					if (jie.jieId == jieId) {
+						return {
+							jie
+						}
+					}
+
+				}
+				return null;
+			},
+
+			async saveAndNavigate(jieId, da, code) {
+
+				if (code == 'jixu') {
+					if (!da.jieId) {
+						toast("jieId 丢失")
+						return false
+					}
+				}
+
+				let req = {
+					"dengjiId": da.dengjiId,
+					"jieId": da.jieId
+				}
+				console.log('req', req);
+				const res = await shuxueSave2(req);
+				if (res.code == 0) {
+					let curJieAndDanyuan = this.getJieAndDanyuan(this.neirongInfo, jieId);
+					console.log('curJieAndDanyuan', curJieAndDanyuan);
+
+					if (!curJieAndDanyuan) {
+						toast("未找到课程信息");
+						return false;
+					}
+
+					const cacheData = cacheManager.get('contentInfo') || {};
+					cacheData.curKechengName = curJieAndDanyuan.jie.jieIntro;
+					cacheData.jieId = curJieAndDanyuan.jie.jieId;
+					cacheData.curJieId = jieId;
+					cacheData.type = curJieAndDanyuan.jie.type;
+					cacheManager.set('contentInfo', cacheData);
+
+					uni.navigateTo({
+						url: `/pages/jisuantexun/lookShipin?jieId=${jieId}`
+					})
+				} else {
+					return false;
+				}
+			},
+			handlePlay(da, code) {
+				console.log('ddd', da)
+				if (da.lock && code == 'play') {
+
+					this.$refs.gmtRef.handleShow();
+
+					// 加锁视频需要购买
+					// uni.navigateTo({
+					// 	url: "/pages/chanpinShop/cp1/dingdan"
+					// })
+					return;
+				}
+				let jieId = code === 'jixu' ? da.curJieId : da.jieId;
+				if (!jieId) {
+					toast("无课程ID");
+					return;
+				}
+				this.saveAndNavigate(jieId, da, code);
+			},
+			handleClickDanyuan(jieId) {
+
+				if (!jieId) {
+					toast("jieId丢失")
+					return false
+				}
+				this.isShow = true;
+				setTimeout(() => {
+					// 更新为点击的动态单元Id [临时]
+					this.$refs.dyRef.handleShow(jieId)
+				}, 100)
+			},
+			handleBack() {
+				uni.navigateTo({
+					url: `/pages/chanpinXuanze/banben?dengjiId=` + this.dengjiId
+				})
+			},
+		},
+
+		// 计算吸顶栏下方的偏移（确保内容不被遮挡）
+		computed: {
+
+
+		}
+	}
+</script>

pages/chanpinneirong/index.vue

@@ -5,6 +5,7 @@
 		</view>
 		<chanpin1 v-if="chanpinId==1" ref="chanpin1Ref"></chanpin1>
 		<chanpin2 v-if="chanpinId==2" ref="chanpin2Ref"></chanpin2>
+		<chanpin4 v-if="chanpinId==4" ref="chanpin4Ref"></chanpin4>
 
 		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
 			:notClose="true" :content="tipContent"></tipMiddleDialog>
@@ -30,6 +31,7 @@
 	} from '../../utils/common';
 	import chanpin1 from './chanpin1'
 	import chanpin2 from './chanpin2'
+	import chanpin4 from './chanpin4'
 	import {
 		banbenImpinfo
 	} from "@/api/login.js"
@@ -68,6 +70,7 @@
 			CustomTabBar,
 			chanpin1,
 			chanpin2,
+			chanpin4,
 			tipMiddleDialog
 		},
 		onLoad(options) {
@@ -127,12 +130,17 @@
 						this.$nextTick(() => {
 							this.$refs.chanpin2Ref.initData()
 						})
+					case 4:
+						this.$nextTick(() => {
+							this.$refs.chanpin4Ref.initData()
+						})
 						break;
 					default:
 
 				}
 			},
 			switchGetNeiRongInfo(data) {
+				console.log('data', data);
 				switch (Number(data.chanpinId)) {
 					case 1:
 						const banbenId = data.banbenId
@@ -146,6 +154,11 @@
 							this.$refs.chanpin2Ref.initData(dengjiId)
 						})
 						break;
+					case 4:
+						this.$nextTick(() => {
+							this.$refs.chanpin4Ref.initData(data)
+						})
+						break;
 					default:
 
 				}

pages/chanpinneirong/useNeirongChanpin4.js

@@ -0,0 +1,12 @@
+import cacheManager from "@/utils/cacheManager.js";
+
+export function updateChanpin4Process() {
+	const cacheData = cacheManager.get('contentInfo');
+	console.log('cacheData44444', cacheData)
+	const list = cacheData.dagangList;
+	const defaultCurProcess = cacheData.curProcess;
+
+	const process = list.filter(item => item.wanchengFlag).length/list.length * 100 || 0;
+	cacheData.curProcess = defaultCurProcess > process ? defaultCurProcess: process;
+	cacheManager.set('contentInfo', cacheData);
+}