Преглед изворни кода

岛页面的提示,游客只提示一次,重新登录后会再次提示

tanxue пре 4 месеци
родитељ
комит
d97f8a5ca6

+ 4 - 2
components/custom-tabbar/custom-tabbar.vue

@@ -66,6 +66,9 @@
 			currentTabNumber: {
 				type: Number,
 			},
+			tipFlag: {
+				type: String,
+			},
 
 		},
 		methods: {
@@ -87,8 +90,7 @@
 					}
 					uni.redirectTo({
 						url: path + '?nianji=' + this.nianji + '&cardId=' + this.cardId + '&zhangId=' +
-							this
-							.zhangId
+							this.zhangId+ '&tipFlag=' + this.tipFlag
 					});
 				} else {
 					if (path === '/pages/game/index') {

+ 7 - 5
pages/my/aboutPage.vue

@@ -23,7 +23,7 @@
 				</view>
 			</view>
 		</view>
-		<CustomTabBar :cardId="cardId" :nianji="nianji" :zhangId="zhangId"></CustomTabBar>
+		<CustomTabBar :cardId="cardId" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag"></CustomTabBar>
 	</view>
 </template>
 
@@ -32,9 +32,10 @@
 	import {ref} from "vue";
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import cacheManager from '@/utils/cacheManager.js';
-	const zhangId = ref(null);
-	const nianji = ref(null);
-	const cardId = ref(null);
+	const zhangId = ref(null);//游客使用
+	const nianji = ref(null);//游客使用
+	const cardId = ref(null);//游客使用
+	const tipFlag = ref(null); //游客使用
 	let routerOpt  = ref(false);
 	
 	// 关于我们
@@ -47,7 +48,7 @@
 		}else{
 			// 游客
 			uni.redirectTo({
-				url: `/pages/my/index?nianji=${routerOpt.nianji}&cardId=${routerOpt.cardId}&zhangId=${routerOpt.zhangId}`
+				url: `/pages/my/index?nianji=${routerOpt.nianji}&cardId=${routerOpt.cardId}&zhangId=${routerOpt.zhangId}&tipFlag=${routerOpt.tipFlag}`
 			});
 		}
 		
@@ -59,6 +60,7 @@
 			zhangId.value = options.zhangId
 			nianji.value = options.nianji
 			cardId.value = options.cardId
+			tipFlag.value = options.tipFlag
 		}
 	})
 </script>

+ 7 - 5
pages/my/index.vue

@@ -39,7 +39,7 @@
 				<text>退出登录</text>
 			</view>
 		</view>
-		<CustomTabBar :cardId="cardId" :currentTabNumber="2" :nianji="nianji" :zhangId="zhangId"></CustomTabBar>
+		<CustomTabBar :cardId="cardId" :currentTabNumber="2" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag"></CustomTabBar>
 		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
 		<tip-middle-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :content="MESSAGE_VISITER_TO_LOGIN"></tip-middle-dialog>
 		<tel-dialog @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
@@ -72,9 +72,10 @@
 	})
 	
 	
-	const zhangId = ref(null);
-	const nianji = ref(null);
-	const cardId = ref(null);
+	const zhangId = ref(null); //游客使用
+	const nianji = ref(null); //游客使用
+	const cardId = ref(null); //游客使用
+	const tipFlag = ref(null); //游客使用
 	const tipContent = '你确定要执行这个操作吗?';
 	let hyqyData = reactive({
 			indicatorDots: true,
@@ -153,7 +154,7 @@
 			});
 		}else{
 			uni.redirectTo({
-				url: `/pages/my/aboutPage?nianji=${routerOpt.nianji}&cardId=${routerOpt.cardId}&zhangId=${routerOpt.zhangId}`
+				url: `/pages/my/aboutPage?nianji=${routerOpt.nianji}&cardId=${routerOpt.cardId}&zhangId=${routerOpt.zhangId}&tipFlag=${routerOpt.tipFlag}`
 			});
 		}
 	}
@@ -230,6 +231,7 @@
 		zhangId.value = routerOpt.zhangId
 		nianji.value = routerOpt.nianji
 		cardId.value = routerOpt.cardId
+		tipFlag.value = routerOpt.tipFlag
 		// my游客
 		loginFlag.value = false;
 		myInfoData.userName = '游客';

+ 4 - 2
pages/selectGradesTerms/index.vue

@@ -44,9 +44,10 @@
 		const data = reactive({
 			activeNianji: null, // 当前年级
 			activeXueke: null, // 当前学期
+			activeTipFlag: null, // 当前学期
 		});
 
-		onLoad(({nianji,cardId}) => {
+		onLoad(({nianji,cardId,tipFlag}) => {
 			if (userCode !== 'Visitor') {
 				const {
 					nianji: nianji_,
@@ -57,6 +58,7 @@
 			} else {
 				data.activeNianji = nianji;
 				data.activeXueke = cardId;
+				data.activeTipFlag = tipFlag || '0';
 			}
 	
 		});
@@ -99,7 +101,7 @@
 			} else {
 				// 数序
 				uni.redirectTo({
-					url: `/pages/study/index?nianji=${data.activeNianji}&cardId=${data.activeXueke}&zhangId=0`
+					url: `/pages/study/index?nianji=${data.activeNianji}&cardId=${data.activeXueke}&zhangId=0&tipFlag=${data.activeTipFlag}`
 				})
 			}
 

+ 23 - 7
pages/study/index.vue

@@ -14,7 +14,7 @@
 	<!-- 蛋 -->
 	<egg-dialog ref="eggDialogRef" @eggBtn="eggBtn"></egg-dialog>
 	<catalogue ref="catalogueRef" :list=zhangList @change-zhang="handleChangeZhang"></catalogue>
-	<CustomTabBar :cardId="cardId" :currentTabNumber="0" :nianji="nianji" :zhangId="zhangId"></CustomTabBar>
+	<CustomTabBar :cardId="cardId" :currentTabNumber="0" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag"></CustomTabBar>
 	<tip-small-dialog ref="goPayDialogRef" @confirm-btn="goPayPage" :content="tipContent"></tip-small-dialog>
 	<tip-middle-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :content="YouKeContent"></tip-middle-dialog>
 	<dao-tip-dialog ref="daoTipDialogRef" v-if="showDaoTip" :productTip="productTipImg" @dao-tip-close="daoTipClose"></dao-tip-dialog>
@@ -67,6 +67,7 @@
 	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);
@@ -117,10 +118,20 @@
 	}
 	function getBj(data){
 		let bjType =cacheManager.get('dao-tip')[data];
-		if(bjType!=='has'){
-			nextTick(() => {
-				daoTipDialogRef.value.handleShow();
-			})
+		if(cacheManager.get('auth')){
+			// 非游客
+			if(bjType!=='has'){
+				nextTick(() => {
+					daoTipDialogRef.value.handleShow();
+				})
+			}
+		}else{
+			// 游客
+			if(tipFlag.value==='0'){
+				nextTick(() => {
+					daoTipDialogRef.value.handleShow();
+				})
+			}
 		}
 	}
 	function daoTipClose(){
@@ -133,6 +144,9 @@
 				// 英语
 				cacheManager.updateObject('dao-tip',{yingyu:'has'})
 			}
+		}else{
+			//游客
+			tipFlag.value = '1';
 		}
 	}
 	function onChangeTab(e) {
@@ -176,6 +190,7 @@
 			zhangId.value = options.zhangId
 			nianji.value = options.nianji
 			cardId.value = options.cardId
+			tipFlag.value = options.tipFlag;
 			currentProduct.value = options.cardId
 			// 未登录 游客 
 			getCommonZhang(options)
@@ -281,7 +296,8 @@
 			let youkeData = {
 				cardId:cardId.value,
 				nianji:nianji.value,
-				zhangId:zhangId.value,
+				zhangId:zhangId.value,
+				tipFlag:tipFlag.value,
 				jieList:zhangList.value[0].jieList,
 				jieName:zhangList.value[0].jieList[0].jieName
 			}
@@ -332,7 +348,7 @@
 			})
 		}
 		uni.navigateTo({
-			url: `/pages/selectGradesTerms/index`,
+			url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}`,
 		})
 	}
 	// 游客弹窗---确定

+ 2 - 1
pages/study/lookShipin.vue

@@ -98,6 +98,7 @@
 				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.getLiveYk(); //获取播放凭证
@@ -270,7 +271,7 @@
 				if (!cacheManager.get('auth')) {
 					uni.redirectTo({
 						url: '/pages/study/index?cardId=' + this.cardId + '&nianji=' + this.nianji + '&zhangId=' +
-							this.zhangId
+							this.zhangId+ '&tipFlag=' + this.tipFlag
 					})
 				} else {
 					uni.redirectTo({