Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

common/styles/global/pages.scss

@@ -567,6 +567,7 @@
 			}
 		// .collapse-item-box:last-child{border: 0;}
 	}
+	.ezy-catalogue-collapse-vip .collapse-item-box .uni-collapse-item__title-arrow{margin-right: 10rpx;}
 }
 
 // 考试页

components/catalogue/catalogue.vue

@@ -4,7 +4,7 @@
 		<view class="ezy-catalogue-dialog">
 			<uni-icons @click="handleClose" class="catalogue-close-btn"></uni-icons>
 			<!-- 目录区域 -->
-			<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse" accordion>
+			<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse" :class="{ 'ezy-catalogue-collapse-vip': AuthCode === 'VIP'}" accordion>
 				<uni-collapse-item title-border="none" :border="false" :name="index+''" v-for="(item,index) in list" 
 				class="collapse-item-box" :class="{ 'collapse-active': activeCollapse === index+''}">
 					<template v-slot:title>

pages/my/index.vue

@@ -72,7 +72,7 @@
 	let loginFlag = ref(false);
 	let telDialogFlag = ref(false);
 	let myInfoData = reactive({
-		userImg: 'static/images/my/head-unlogin-img.png',
+		userImg: '',
 		userName: '',
 		credit: '',
 		vipFlag: '',
@@ -153,7 +153,7 @@
 	// 获取用户数据
 	function getMyInfo(){
 		myInfo({}).then(res => {
-			getUserImg(res.data.growth)
+			getUserImg(res.data.growthType)
 			myInfoData.userName = res.data.userName;
 			myInfoData.credit = res.data.credit;
 		})

pages/my/telDialog.vue

@@ -3,7 +3,7 @@
 		<view class="my-tel-content">
 			<view class="tel-close" @click="telClose(AWSC)"></view>
 			<view class="tel-row">
-				<view class="my-tel-title">绑定新手机号</view>
+				<view class="my-tel-title">修改手机号</view>
 				<view class="my-input-box">
 					<input class="my-input" type="text" v-model="bindObj.telNumber" placeholder="请输入手机号" maxlength="11"
 						@input="changeTelInput" />

pages/study/index.vue

@@ -67,7 +67,8 @@
 	const zhangId = ref(null); //游客使用
 	const nianji = ref(null); //游客使用
 	const cardId = ref(null); //游客使用
-	const catalogueRef = ref(null);
+	const catalogueRef = ref(null);
+	const youkeZhangInfoData = ref(null);
 	const currentProduct = ref(null);
 	const selectZhang = ref(null);
 	const zhangList = ref(null);
@@ -83,12 +84,12 @@
 		numberStr: '',
 	});
 	const gradeMapping = {
-		1: '一年级',
-		2: '二年级',
-		3: '三年级',
-		4: '四年级',
-		5: '五年级',
-		6: '六年级'
+		1: 'L1',
+		2: 'L2',
+		3: 'L3',
+		4: 'L4',
+		5: 'L5',
+		6: 'L6'
 	};
 
 	const termMapping = {
@@ -171,8 +172,11 @@
 			cardId: data.cardId,
 			zhangId: data.zhangId,
 		}
-		getCommonZhangInfo(req).then(res => {
-			zhangList.value = res.data
+		getCommonZhangInfo(req).then(res => {
+			translateData(res.data)
+			youkeZhangInfoData.value =  res.data
+			zhangList.value = res.data.zhangList
+			current.value = 0
 			// infoData.haveFlag = res.data.haveFlag
 			// infoData.nianji = res.data.nianji
 			// infoData.number = res.data.number
@@ -242,15 +246,18 @@
 	}
 
 	function goLookShipin(data) {
-		if (!cacheManager.get('auth')) {
-			infoData.cardId = cardId.value
-			infoData.nianji = nianji.value
-			infoData.zhangId = zhangId.value
+		if (!cacheManager.get('auth')) {
+			console.log('zhangList.value[0].jieList[0]',zhangList.value[0].jieList);
+			let youkeData = {
+				cardId:cardId.value,
+				nianji:nianji.value,
+				zhangId:zhangId.value,
+				jieList:zhangList.value[0].jieList,
+				jieName:zhangList.value[0].jieList[0].jieName
+			}
 			uni.redirectTo({
-				url: '/pages/study/lookShipin?youkePageData=' + JSON.stringify(infoData)
-
+				url: '/pages/study/lookShipin?youkePageData=' + JSON.stringify(youkeData)
 			})
-			return;
 		} else {
 			uni.redirectTo({
 				url: '/pages/study/lookShipin?jieId=' + data.jieId
@@ -261,7 +268,7 @@
 	}
 
 	function translateData(data) {
-		gradeTerm.value = gradeMapping[data.nianji] + termMapping[data.cardId]
+		gradeTerm.value = termMapping[data.cardId] +' · '+ gradeMapping[data.nianji]
 	}
 
 	function listClick(data) {
@@ -288,10 +295,12 @@
 		catalogueRef.value.showPopup();
 	}
 
-	function clickGradeTerm() {
-		cacheManager.updateObject('auth', {
-			currentZhang: 0
-		})
+	function clickGradeTerm() {
+		if(cacheManager.get('auth')){
+			cacheManager.updateObject('auth', {
+				currentZhang: 0
+			})
+		}
 		uni.navigateTo({
 			url: `/pages/selectGradesTerms/index`,
 		})

pages/study/lookShipin.vue

@@ -96,7 +96,7 @@
 				this.zhangId = youkeData.zhangId
 				this.cardId = youkeData.cardId
 				this.shipinTitle = youkeData.jieName
-				this.progressMarkers = youkeData.jieList[0].jiedianList
+				this.progressMarkers = youkeData.jieList[0].jiedianList||[]
 				this.getLiveYk(); //获取播放凭证
 			} else {
 				this.init(options)