1

components/custom-tabbar/custom-tabbar.vue

@@ -62,13 +62,13 @@
 			};
 		},
 		props: {
-			nianji: {
+			levelId: {
 				type: String,
 			},
-			cardId: {
+			typeId: {
 				type: String,
 			},
-			zhangId: {
+			subjectId: {
 				type: String,
 			},
 			currentTabNumber: {
@@ -102,8 +102,8 @@
 						return;
 					}
 					uni.redirectTo({
-						url: path + '?nianji=' + this.nianji + '&cardId=' + this.cardId + '&zhangId=' +
-							this.zhangId + '&tipFlag=' + this.tipFlag
+						url: path + '?levelId=' + this.levelId + '&typeId=' + this.typeId + '&subjectId=' +
+							this.subjectId + '&tipFlag=' + this.tipFlag
 					});
 				} else {
 					/* if (path === '/pages/game/index') {

pages/my/index.vue

@@ -60,7 +60,7 @@
 				<text>退出登录</text>
 			</view>
 		</view>
-		<CustomTabBar :cardId="cardId" :currentTabNumber="3" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag">
+		<CustomTabBar :levelId="levelId" :currentTabNumber="3" :typeId="typeId" :subjectId="subjectId" :tipFlag="tipFlag">
 		</CustomTabBar>
 		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
 		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
@@ -120,9 +120,9 @@
 	})
 	const agreeType = ref(null);
 	const agreeContentDialogRef = ref(null);
-	const zhangId = ref(null); //游客使用
-	const nianji = ref(null); //游客使用
-	const cardId = ref(null); //游客使用
+	const subjectId = ref(null); //游客使用
+	const levelId = ref(null); //游客使用
+	const typeId = ref(null); //游客使用
 	const tipFlag = ref(null); //游客使用
 	const tipContent = '你确定要执行这个操作吗？';
 	const zhuxiaoContent = '你确定要执行这个操作吗？';
@@ -255,7 +255,7 @@
 			});
 		} else {
 			uni.redirectTo({
-				url: `/pages/my/aboutPage?nianji=${routerOpt.nianji}&cardId=${routerOpt.cardId}&zhangId=${routerOpt.zhangId}&tipFlag=${routerOpt.tipFlag}`
+				url: `/pages/my/aboutPage?levelId=${routerOpt.levelId}&typeId=${routerOpt.typeId}&subjectId=${routerOpt.subjectId}&tipFlag=${routerOpt.tipFlag}`
 			});
 		}
 	}
@@ -343,9 +343,9 @@
 	function youkeFun() {
 		// 获取广告
 		getCommonCardList();
-		zhangId.value = routerOpt.zhangId
-		nianji.value = routerOpt.nianji
-		cardId.value = routerOpt.cardId
+		levelId.value = routerOpt.levelId
+		typeId.value = routerOpt.typeId
+		subjectId.value = routerOpt.subjectId
 		tipFlag.value = routerOpt.tipFlag
 		// my游客
 		loginFlag.value = false;

pages/selectGradesTerms/index.vue

@@ -49,7 +49,7 @@
 
 	function useSelectGrade() {
 		const userCode = getUserIdentity();
-
+		console.log('userCode',userCode);
 		const data = reactive({
 			activeProduct: null, // 当前年级
 			activeXueke: 1, // 当前学期

pages/study/index.vue

@@ -21,7 +21,7 @@
 		<egg-dialog ref="eggDialogRef" @eggBtn="eggBtn"></egg-dialog>
 		<catalogue ref="catalogueRef" :list=zhangList @change-zhang="handleChangeZhang"
 			@listSelectJieClick="listSelectJieClick"></catalogue>
-		<CustomTabBar :cardId="cardId" :currentTabNumber="0" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag">
+		<CustomTabBar :levelId="levelId" :currentTabNumber="0" :subjectId="subjectId" :typeId="typeId" :tipFlag="tipFlag">
 		</CustomTabBar>
 		<tip-small-dialog ref="goPayDialogRef" @confirm-btn="goPayPage" :content="tipContent"></tip-small-dialog>
 		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
@@ -76,24 +76,20 @@
 	const current = ref(0);
 	const currentDuration = ref(500)
 	const YouKeContent = '您当前的身份是游客，想要体验完整内容需注册成用户!';
-	const zhangId = ref(null); //游客使用
-	const nianji = ref(null); //游客使用
-	const cardId = ref(null); //游客使用
 	const tipFlag = ref(null) //游客使用
 	const catalogueRef = ref(null);
 	const youkeZhangInfoData = ref(null);
 	const currentProduct = ref(null);
 	const localAuth = ref(null);
-	const levelId = ref(null);
+	const levelId = ref(null);//游客使用
+	const subjectId = ref(null);//游客使用
 	const typeId = ref(null);
 	const zhangList = ref(null);
 	const gradeTerm = ref(null);
 	let infoData = reactive({
 		jieList: [],
 		haveFlag: '',
-		nianji: '',
 		number: '',
-		cardId: '',
 		zhangId: '',
 		zhangName: '',
 		numberStr: '',
@@ -230,11 +226,11 @@
 				})
 			}
 		} else {
-			zhangId.value = options.zhangId
-			nianji.value = options.nianji
-			cardId.value = options.cardId
+			subjectId.value = options.subjectId
+			typeId.value = options.typeId
+			levelId.value = options.levelId
 			tipFlag.value = options.tipFlag;
-			currentProduct.value = options.cardId
+			currentProduct.value = options.typeId
 			// 未登录 游客 
 			getCommonZhang(options)
 			getProjectImg()
@@ -277,9 +273,7 @@
 	function getCommonZhang(data) {
 
 		let req = {
-			nianji: data.nianji,
-			cardId: data.cardId,
-			zhangId: data.zhangId,
+			levelId: data.levelId,
 		}
 		getCommonZhangInfo(req).then(res => {
 			translateData(res.data)
@@ -416,10 +410,11 @@
 		// 	cacheManager.updateObject('auth', {
 		// 		currentZhang: 0
 		// 	})
-		// }
-		uni.navigateTo({
-			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}&from='daoPage'`,
-		})
+		// }
+		uni.navigateTo({
+		  url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}&from=daoPage&productId=${levelId.value}&xuekeId=${subjectId.value}`
+		})
+
 	}
 	// 游客弹窗---确定
 	function ykConfirm() {

pages/zhuanti/index.vue

@@ -9,7 +9,7 @@
 			<view v-for="(item,index) in biaoqingList" :key="index" @click="goZhuantiInfo(item)"
 				class="biaoqing-item-box"></view>
 		</view>
-		<CustomTabBar :currentTabNumber="1" :cardId="cardId"  :nianji="nianji" :zhangId="zhangId" :tipFlag='tipFlag' ></CustomTabBar>
+		<CustomTabBar :currentTabNumber="1" :levelId="levelId"  :typeId="typeId" :subjectId="subjectId" :tipFlag='tipFlag' ></CustomTabBar>
 		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
 	</view>
 
@@ -37,9 +37,9 @@
 	const youkeFlag = ref(null);
 	const yhName = ref(null);
 	const youkeDialogRef = ref(null);
-	const zhangId = ref(null); //游客使用
-	const nianji = ref(null); //游客使用
-	const cardId = ref(null); //游客使用
+	const subjectId = ref(null); //游客使用
+	const typeId = ref(null); //游客使用
+	const levelId = ref(null); //游客使用
 	const tipFlag = ref(null); //游客使用
 	let routerOpt = ref(false);
 	const biaoqingList = ref(
@@ -85,9 +85,9 @@
 		} else {
 			// 游客
 			routerOpt = options;
-			zhangId.value = routerOpt.zhangId
-			nianji.value = routerOpt.nianji
-			cardId.value = routerOpt.cardId
+			levelId.value = routerOpt.levelId
+			typeId.value = routerOpt.typeId
+			subjectId.value = routerOpt.subjectId
 			tipFlag.value = routerOpt.tipFlag
 			youkeFlag.value = false
 		}