|
@@ -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}`,
|
|
|
})
|
|
|
}
|
|
|
// 游客弹窗---确定
|