1

pages/study/index.vue

@@ -312,16 +312,18 @@
 		})
 	}
 
-	function goLookShipin(data) {
+	function goLookShipin(data,index) {
 		if (!cacheManager.get('auth')) {
-			console.log('zhangList.value[0].jieList[0]',zhangList.value[0].jieList);
+			console.log('zhangList.value[0].jieList',zhangList.value[0].jieList);
+			console.log('zhangList.value[0].jieList.index',zhangList.value[0].jieList[index]);
+		
 			let youkeData = {
 				cardId:cardId.value,
 				nianji:nianji.value,
 				zhangId:zhangId.value,
 				tipFlag:tipFlag.value,
-				jieList:zhangList.value[0].jieList,
-				jieName:zhangList.value[0].jieList[0].jieName
+				jieList:zhangList.value[0].jieList[index],
+				jieName:zhangList.value[0].jieList[index].jieName
 			}
 			uni.redirectTo({
 				url: '/pages/study/lookShipin?youkePageData=' + JSON.stringify(youkeData)
@@ -331,30 +333,32 @@
 				url: '/pages/study/lookShipin?jieId=' + data.jieId
 			})
 		}
-
-
 	}
 
 	function translateData(data) {
 		gradeTerm.value = termMapping[data.cardId] +' · '+ gradeMapping[data.nianji]
 	}
 
-	function listClick(data) {
-		if (!cacheManager.get('auth') && data.firstFlag != 1) {
+	function listClick(data,data2,index) {
+		
+		console.log('data',data);
+		console.log('data2',data2);
+		if (!cacheManager.get('auth') && data2.number != 1) {
 			youkeDialogRef.value.handleShow();
 			return;
 		}
 		const authCode = getUserIdentity();
 		console.log('authCode', authCode);
-		if (!(authCode == 'VIP' || data.firstFlag == 1)) {
+		if (!(authCode == 'VIP' || data2.number == 1)) {
+			debugger
 			goPayDialogRef.value.handleShow();
 			return false
 		}
 		if (data.type == 2) {
 			// 最后一项
-			goKaoshi(data)
+			goKaoshi(data,index)
 		} else {
-			goLookShipin(data)
+			goLookShipin(data,index)
 		}
 	}
 

pages/study/lookShipin.vue

@@ -94,13 +94,13 @@
 			if (!cacheManager.get('auth')) {
 				const youkeData = JSON.parse(options.youkePageData)
 				// 游客
-				this.videoId = youkeData.jieList[0].videoId
+				this.videoId = youkeData.jieList.videoId
 				this.nianji = youkeData.nianji
 				this.zhangId = youkeData.zhangId
 				this.cardId = youkeData.cardId
 				this.tipFlag=youkeData.tipFlag
 				this.shipinTitle = youkeData.jieName
-				this.progressMarkers = youkeData.jieList[0].jiedianList || []
+				this.progressMarkers = youkeData.jieList.jiedianList || []
 				this.getLiveYk(); //获取播放凭证
 			} else {
 				this.init(options)

pages/study/product/shuxue.vue

@@ -11,7 +11,7 @@
 			<view>
 				<!-- 小岛 -->
 				<view class="brand-item" v-for="(item, index) in options.jieList" :key="item.jieId"
-					@click="listClick(item, index)" :class="getClass(options.jieList,index,isVip)">
+					@click="listClick(item, index,options)" :class="getClass(options,index,isVip)">
 					<view v-if="isVip === 'VIP'">
 						<!-- 序号 -->
 						<view class="brand-icon" v-if="item.studyFlag===0">{{ item.number }}</view>
@@ -24,7 +24,7 @@
 					</view>
 					<view v-if="isVip !== 'VIP'">
 						<!-- 序号或锁 -->
-						<view v-if="options.number ==1 && item.firstFlag ==1" class="brand-icon">{{ item.number }}
+						<view v-if="options.number ==1" class="brand-icon">{{ item.number }}
 						</view>
 						<!-- 锁 -->
 						<view v-else class="brand-lock"></view>
@@ -96,13 +96,13 @@
 		$emit('clickGradeTerm');
 	}
 
-	function listClick(data, index) {
+	function listClick(data, index,data2) {
 		data.daeFlag = true
 		nextTick(() => {
 			animalNum.value = index
 		})
 		setTimeout(() => {
-			$emit('listClick', data);
+			$emit('listClick', data,data2,index);
 		}, 300)
 
 	}
@@ -155,17 +155,18 @@
 
 	// 获取节class
 	function getClass(data, index, isVip) {
+		console.log('data',data);
 		let brandActive = '';
 		if (isVip === 'VIP') {
 			brandActive = 'brand-active';
-		} else if (data[index].firstFlag == 1) {
+		} else if (data.number == 1) {
 			brandActive = 'brand-active';
 		} else {
 			brandActive = '';
 		}
-		let indexLast = data.length - 1;
+		let indexLast = data.jieList.length - 1;
 		// 判断最后一个为名称是否为单元测试，是单元测试则返回ceshi-jie
-		if (index === indexLast && data[data.length - 1].jieName == '单元测试') {
+		if (index === indexLast && data.jieList[data.jieList.length - 1].jieName == '单元测试') {
 			return 'ceshi-brand-item' + ' ' + brandActive;
 		} else {
 			return getJieClass(data, index, brandActive)
@@ -173,7 +174,7 @@
 	}
 	// 根据获取节字数获取class
 	function getJieClass(data, index, active) {
-		let itemJieName = data[index].jieName.length;
+		let itemJieName = data.jieList[index].jieName.length;
 		if (itemJieName > 7) {
 			return 'big-brand-item' + ' ' + active;
 		} else {

pages/study/product/yingyu.vue

@@ -8,7 +8,7 @@
 			<view>
 				<!-- 小岛 -->
 				<view class="brand-item" v-for="(item, index) in options.jieList" :key="item.jieId"
-					@click="listClick(item, index)" :class="getClass(options.jieList,index,isVip)">
+					@click="listClick(item, index,options)" :class="getClass(options,index,isVip)">
 					<view v-if="isVip === 'VIP'">
 						<!-- 序号 -->
 						<view class="brand-icon">{{ item.number }}</view>
@@ -23,7 +23,7 @@
 						<!-- 序号 -->
 						<view class="brand-icon">{{ item.number }}</view>
 						<!-- 锁 -->
-						<view v-if="item.firstFlag !='1'"  class="brand-lock"></view>
+						<view v-if="options.number !='1'"  class="brand-lock"></view>
 						<!-- 箭头 -->
 						<view v-if="item.daeFlag  &&  animalNum == index && isVip != 'Visitor'" class="brand-arrow"></view>
 						<!-- 节名称 -->
@@ -91,13 +91,13 @@
 		$emit('clickGradeTerm');
 	}
 
-	function listClick(data,index) {
+	function listClick(data,index,data2) {
 		data.daeFlag = true
 		nextTick(() => {
 			animalNum.value = index
 		})
 		setTimeout(() => {
-			$emit('listClick', data);
+			$emit('listClick', data,data2,index);
 		}, 300)
 		
 	}
@@ -132,14 +132,14 @@
 		let brandActive = '';
 		if (isVip === 'VIP') {
 			brandActive = 'brand-active';
-		} else if (data[index].firstFlag == 1) {
+		} else if (data.number == 1) {
 			brandActive = 'brand-active';
 		} else {
 			brandActive = '';
 		}
-		let indexLast = data.length - 1;
+		let indexLast = data.jieList.length - 1;
 		// 判断最后一个为名称是否为单元测试，是单元测试则返回ceshi-jie
-		if (index === indexLast && data[data.length - 1].jieName == 'Testing') {
+		if (index === indexLast && data.jieList[data.jieList.length - 1].jieName == 'Testing') {
 			return 'ceshi-brand-item' + ' ' + brandActive;
 		} else {
 			return brandActive;