|
@@ -70,7 +70,7 @@
|
|
|
const nianji = ref(null); //游客使用
|
|
|
const cardId = ref(null); //游客使用
|
|
|
const tipFlag = ref(null) //游客使用
|
|
|
- const catalogueRef = ref(null);
|
|
|
+ const catalogueRef = ref(null);
|
|
|
const youkeZhangInfoData = ref(null);
|
|
|
const currentProduct = ref(null);
|
|
|
const selectZhang = ref(null);
|
|
@@ -162,15 +162,15 @@
|
|
|
tipFlag.value = '1';
|
|
|
}
|
|
|
}
|
|
|
- function onChangeTab(e) {
|
|
|
+ function onChangeTab(e) {
|
|
|
console.log('e',e);
|
|
|
- console.log(e.detail.current);
|
|
|
- if( cacheManager.get('auth')){
|
|
|
- infoData.zhangId = cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
|
|
|
- cacheManager.updateObject('auth', {
|
|
|
- currentZhang: e.detail.current,
|
|
|
- zhangId: infoData.zhangId
|
|
|
- })
|
|
|
+ console.log(e.detail.current);
|
|
|
+ if( cacheManager.get('auth')){
|
|
|
+ infoData.zhangId = cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
|
|
|
+ cacheManager.updateObject('auth', {
|
|
|
+ currentZhang: e.detail.current,
|
|
|
+ zhangId: infoData.zhangId
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -186,18 +186,18 @@
|
|
|
nextTick(() => {
|
|
|
eggDialogRef.value.eggShow();
|
|
|
})
|
|
|
- }
|
|
|
- // cacheManager.set('daoPageCache',{isCache:true})
|
|
|
- if(!cacheManager.get('daoPageCache').isCache){
|
|
|
- getZhangInfo()
|
|
|
-
|
|
|
- }else{
|
|
|
- console.log('shiyonghuancun');
|
|
|
- translateData(cacheManager.get('auth'))
|
|
|
- zhangList.value = cacheManager.get('zhangInfo').zhangList
|
|
|
- current.value = cacheManager.get('auth').currentZhang
|
|
|
- infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
|
|
|
- recordZhangJie()
|
|
|
+ }
|
|
|
+ // cacheManager.set('daoPageCache',{isCache:true})
|
|
|
+ if(!cacheManager.get('daoPageCache').isCache){
|
|
|
+ getZhangInfo()
|
|
|
+
|
|
|
+ }else{
|
|
|
+ console.log('shiyonghuancun');
|
|
|
+ translateData(cacheManager.get('auth'))
|
|
|
+ zhangList.value = cacheManager.get('zhangInfo').zhangList
|
|
|
+ current.value = cacheManager.get('auth').currentZhang
|
|
|
+ infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
|
|
|
+ recordZhangJie()
|
|
|
}
|
|
|
|
|
|
// 已登录付费未支付选择返回 -> 恢复弹窗
|
|
@@ -237,8 +237,8 @@
|
|
|
cacheManager.updateObject('auth', {
|
|
|
currentZhang: 0
|
|
|
})
|
|
|
- }
|
|
|
- cacheManager.set('daoPageCache',{isCache:true})
|
|
|
+ }
|
|
|
+ cacheManager.set('daoPageCache',{isCache:true})
|
|
|
|
|
|
nextTick(() => {
|
|
|
translateData(res.data)
|
|
@@ -258,10 +258,10 @@
|
|
|
cardId: data.cardId,
|
|
|
zhangId: data.zhangId,
|
|
|
}
|
|
|
- getCommonZhangInfo(req).then(res => {
|
|
|
- translateData(res.data)
|
|
|
+ getCommonZhangInfo(req).then(res => {
|
|
|
+ translateData(res.data)
|
|
|
youkeZhangInfoData.value = res.data
|
|
|
- zhangList.value = res.data.zhangList
|
|
|
+ zhangList.value = res.data.zhangList
|
|
|
current.value = 0
|
|
|
})
|
|
|
}
|
|
@@ -291,7 +291,8 @@
|
|
|
const authCode = getUserIdentity();
|
|
|
if (authCode !== 'Visitor') {
|
|
|
cacheManager.updateObject('auth', {
|
|
|
- zhangId: data.zhangId
|
|
|
+ zhangId: data.zhangId,
|
|
|
+ currentZhang: zhangList.value.findIndex(citem => citem.zhangId == item.zhangId),
|
|
|
})
|
|
|
}
|
|
|
currentDuration.value = 0
|
|
@@ -312,15 +313,15 @@
|
|
|
}
|
|
|
|
|
|
function goLookShipin(data) {
|
|
|
- if (!cacheManager.get('auth')) {
|
|
|
- console.log('zhangList.value[0].jieList[0]',zhangList.value[0].jieList);
|
|
|
- let youkeData = {
|
|
|
- cardId:cardId.value,
|
|
|
- nianji:nianji.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,
|
|
|
- tipFlag:tipFlag.value,
|
|
|
- jieList:zhangList.value[0].jieList,
|
|
|
- jieName:zhangList.value[0].jieList[0].jieName
|
|
|
+ tipFlag:tipFlag.value,
|
|
|
+ jieList:zhangList.value[0].jieList,
|
|
|
+ jieName:zhangList.value[0].jieList[0].jieName
|
|
|
}
|
|
|
uni.redirectTo({
|
|
|
url: '/pages/study/lookShipin?youkePageData=' + JSON.stringify(youkeData)
|
|
@@ -361,11 +362,11 @@
|
|
|
catalogueRef.value.showPopup(item);
|
|
|
}
|
|
|
|
|
|
- function clickGradeTerm() {
|
|
|
- // if(cacheManager.get('auth')){
|
|
|
- // cacheManager.updateObject('auth', {
|
|
|
- // currentZhang: 0
|
|
|
- // })
|
|
|
+ function clickGradeTerm() {
|
|
|
+ // if(cacheManager.get('auth')){
|
|
|
+ // cacheManager.updateObject('auth', {
|
|
|
+ // currentZhang: 0
|
|
|
+ // })
|
|
|
// }
|
|
|
uni.navigateTo({
|
|
|
url: `/pages/selectGradesTerms/index?tipFlag=${tipFlag.value}`,
|