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

pages/study/index.vue

@@ -5,15 +5,15 @@
 			<swiper-item v-for="(item,index) in zhangList" :key="index">
 				<shuxueZhangjie v-if="currentProduct ==1&&typeId==2" @clickGradeTerm="clickGradeTerm"
 					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
-					:options="item">
+					:options="item" :youkeImage="youkeImage">
 				</shuxueZhangjie>
 				<yingyuZhangjie v-if="currentProduct ==2&&typeId==2" @clickGradeTerm="clickGradeTerm"
 					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
-					:options="item">
+					:options="item" :youkeImage="youkeImage">
 				</yingyuZhangjie>
 				<shuxueNewZhangjie v-if="currentProduct ==1&&typeId==1" @clickGradeTerm="clickGradeTerm"
 					@handleCheckCatalogue="handleCheckCatalogue(item)" @listClick="listClick" :gradeTerm='gradeTerm'
-					:options="item">
+					:options="item" :youkeImage="youkeImage">
 				</shuxueNewZhangjie>
 			</swiper-item>
 		</swiper>
@@ -78,7 +78,7 @@
 	const YouKeContent = '您当前的身份是游客，想要体验完整内容需注册成用户!';
 	const tipFlag = ref(null) //游客使用
 	const catalogueRef = ref(null);
-	const youkeZhangInfoData = ref(null);
+	const youkeImage = ref(null);
 	const currentProduct = ref(null);
 	const localAuth = ref(null);
 	const levelId = ref(null);//游客使用
@@ -277,7 +277,7 @@
 		}
 		getCommonZhangInfo(req).then(res => {
 			translateData(res.data)
-			youkeZhangInfoData.value = res.data
+			youkeImage.value = res.data.icon
 			zhangList.value = res.data.zhangList
 			current.value = 0
 		})

pages/study/lookShipin.vue

@@ -122,27 +122,53 @@
 		},
 		methods: {
 			courseBjFun() {
-				switch (Number(cacheManager.get('auth').subjectId)) {
-					case 1:
-						return 'static/images/course/couse-shuxue-bj.png'
-						break;
-					case 2:
-						return 'static/images/course/course-yingyu-bj.png'
-						break;
-					default:
-						break;
+				if (!cacheManager.get('auth')) {
+					switch (Number(this.subjectId)) {
+						case 1:
+							return 'static/images/course/couse-shuxue-bj.png'
+							break;
+						case 2:
+							return 'static/images/course/course-yingyu-bj.png'
+							break;
+						default:
+							break;
+					}
+				} else {
+					switch (Number(cacheManager.get('auth').subjectId)) {
+						case 1:
+							return 'static/images/course/couse-shuxue-bj.png'
+							break;
+						case 2:
+							return 'static/images/course/course-yingyu-bj.png'
+							break;
+						default:
+							break;
+					}
 				}
 			},
 			courseIconFun() {
-				switch (Number(cacheManager.get('auth').subjectId)) {
-					case 1:
-						return 'static/images/course/shuxue-icon.png'
-						break;
-					case 2:
-						return 'static/images/course/yingyu-icon.png'
-						break;
-					default:
-						break;
+				if (!cacheManager.get('auth')) {
+					switch (Number(this.subjectId)) {
+						case 1:
+							return 'static/images/course/shuxue-icon.png'
+							break;
+						case 2:
+							return 'static/images/course/yingyu-icon.png'
+							break;
+						default:
+							break;
+					}
+				} else {
+					switch (Number(cacheManager.get('auth').subjectId)) {
+						case 1:
+							return 'static/images/course/shuxue-icon.png'
+							break;
+						case 2:
+							return 'static/images/course/yingyu-icon.png'
+							break;
+						default:
+							break;
+					}
 				}
 			},
 			init(options) {

pages/study/lookShipinNew.vue

@@ -4,22 +4,21 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">{{shipinTitle}}</text>
 		</view>
-			<view class="ezy-video-box course-video-box">
-				<view ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
-					:change:playAuth="renderScript.receiveMsg" :videoId="videoId"
-					:change:videoId="renderScript.videoIdFun" :hideFlag="hideFlag"
-					:change:hideFlag="renderScript.hideFlagFun" :progressMarkers="progressMarkers"
-					:change:progressMarkers="renderScript.progressMarkersMsg" :seekTime="seekTime"
-					:change:seekTime="renderScript.seekTimeFun" class="ezy-video">
-				</view>
+		<view class="ezy-video-box course-video-box">
+			<view ref="videoContent" id="wgy-player-test" :playAuth="playAuth"
+				:change:playAuth="renderScript.receiveMsg" :videoId="videoId" :change:videoId="renderScript.videoIdFun"
+				:hideFlag="hideFlag" :change:hideFlag="renderScript.hideFlagFun" :progressMarkers="progressMarkers"
+				:change:progressMarkers="renderScript.progressMarkersMsg" :seekTime="seekTime"
+				:change:seekTime="renderScript.seekTimeFun" class="ezy-video">
 			</view>
-			<view class="course-content-border">
+		</view>
+		<view class="course-content-border">
 			<view class="course-content-box">
 				<view v-for="(item,index) in progressMarkers" :key="index" @click="markersClick(item)">
 					<view class="title-play-box">
 						<icon class="course-icon" :style="{backgroundImage: 'url(' + courseIconFun() + ')'}"></icon>
 						<view class="course-title">{{item.title}}</view>
-					<!-- 	<view class="course-play-btn" @click="markersClick(item)">视频讲解</view> -->
+						<!-- 	<view class="course-play-btn" @click="markersClick(item)">视频讲解</view> -->
 					</view>
 					<rich-text :nodes="item.describe" class="course-content-item"></rich-text>
 				</view>
@@ -122,27 +121,54 @@
 		},
 		methods: {
 			courseBjFun() {
-				switch (Number(cacheManager.get('auth').subjectId)) {
-					case 1:
-						return 'static/images/course/couse-shuxue-bj.png'
-						break;
-					case 2:
-						return 'static/images/course/course-yingyu-bj.png'
-						break;
-					default:
-						break;
+				if (!cacheManager.get('auth')) {
+					switch (Number(this.subjectId)) {
+						case 1:
+							return 'static/images/course/couse-shuxue-bj.png'
+							break;
+						case 2:
+							return 'static/images/course/course-yingyu-bj.png'
+							break;
+						default:
+							break;
+					}
+				} else {
+
+					switch (Number(cacheManager.get('auth').subjectId)) {
+						case 1:
+							return 'static/images/course/couse-shuxue-bj.png'
+							break;
+						case 2:
+							return 'static/images/course/course-yingyu-bj.png'
+							break;
+						default:
+							break;
+					}
 				}
 			},
 			courseIconFun() {
-				switch (Number(cacheManager.get('auth').subjectId)) {
-					case 1:
-						return 'static/images/course/shuxue-icon.png'
-						break;
-					case 2:
-						return 'static/images/course/yingyu-icon.png'
-						break;
-					default:
-						break;
+				if (!cacheManager.get('auth')) {
+					switch (Number(this.subjectId)) {
+						case 1:
+							return 'static/images/course/shuxue-icon.png'
+							break;
+						case 2:
+							return 'static/images/course/yingyu-icon.png'
+							break;
+						default:
+							break;
+					}
+				} else {
+					switch (Number(cacheManager.get('auth').subjectId)) {
+						case 1:
+							return 'static/images/course/shuxue-icon.png'
+							break;
+						case 2:
+							return 'static/images/course/yingyu-icon.png'
+							break;
+						default:
+							break;
+					}
 				}
 			},
 			init(options) {

pages/study/product/shuxue.vue

@@ -71,19 +71,23 @@
 		onShow
 	} from '@dcloudio/uni-app';
 	const growthType = ref(null);
-	onShow(() => {
-		growthType.value = cacheManager.get('auth') ? cacheManager.get('auth').growthType : null
-	})
 
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue', 'listClick'])
 	const props = defineProps({
 		options: {
 			type: Object,
 		},
+		youkeImage: {
+			String: '',
+		},
 		gradeTerm: {
 			type: String,
 		},
 	})
+	onShow(() => {
+		growthType.value = cacheManager.get('auth') ? cacheManager.get('auth').growthType : props.youkeImage
+	})
+	
 	const isVip = getUserIdentity();
 	console.log('isVip', isVip);
 	const gradeMapping = {

pages/study/product/shuxueNew.vue

@@ -62,22 +62,24 @@
 	import {
 		onShow
 	} from '@dcloudio/uni-app';
-	const growthType = ref(null);
 	const growthImg = ref(null);
-	onShow(() => {
-		growthType.value = cacheManager.get('auth') ? cacheManager.get('auth').growthType : null;
-		growthImg.value = cacheManager.get('auth') ? cacheManager.get('zhangInfo').icon : null;
-	})
+
 
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue', 'listClick'])
 	const props = defineProps({
 		options: {
 			type: Object,
 		},
+		youkeImage: {
+			String: '',
+		},
 		gradeTerm: {
 			type: String,
 		},
 	})
+	onShow(() => {
+		growthImg.value = cacheManager.get('auth') ? cacheManager.get('zhangInfo').icon : props.youkeImage;
+	})
 	const isVip = getUserIdentity();
 	console.log('isVip', isVip);
 	const gradeMapping = {
@@ -123,18 +125,6 @@
 		}
 	}
 
-	function currentGrowth(data) {
-		if (growthType.value == 0) {
-			return 'animal-img dan-img'
-		} else if (growthType.value == 1) {
-			return 'animal-img xiao-e-img'
-		} else if (growthType.value == 2) {
-			return 'animal-img zhong-e-img'
-		} else {
-			return 'animal-img da-e-img'
-		}
-	}
-
 	// 章换行显示
 	function getZhangContent(data) {
 

pages/study/product/yingyu.vue

@@ -65,18 +65,22 @@
 		onShow
 	} from '@dcloudio/uni-app';
 	const growthType = ref(null);
-	onShow(() => {
-		growthType.value = cacheManager.get('auth')?cacheManager.get('auth').growthType:null
-	})
+
 	const $emit = defineEmits(['clickGradeTerm', 'onLeft', 'onRight', 'handleCheckCatalogue', 'listClick'])
 	const props = defineProps({
 		options: {
 			type: Object,
 		},
+		youkeImage: {
+			String: '',
+		},
 		gradeTerm: {
 			type: String,
 		},
 	})
+	onShow(() => {
+		growthType.value = cacheManager.get('auth')?cacheManager.get('auth').growthType:props.youkeImage
+	})
 	const isVip = getUserIdentity();
 	console.log('isVip',);
 	const gradeMapping = {