|
@@ -65,9 +65,10 @@ onLoad((options) => {
|
|
|
// 返回
|
|
|
function goBack(){
|
|
|
if (!cacheManager.get('auth')) {
|
|
|
+ const youkeData = JSON.parse(routerOpt.youkePageData)
|
|
|
// 游客
|
|
|
uni.redirectTo({
|
|
|
- url: `/pages/study/index?levelId=${routerOpt.levelId}&typeId=${routerOpt.typeId}&subjectId=${routerOpt.subjectId}&tipFlag=${routerOpt.tipFlag}&youkeZhangId=${routerOpt.youkeZhangId}&jieId=${routerOpt.jieId}`
|
|
|
+ url: `/pages/study/index?levelId=${youkeData.levelId}&typeId=${youkeData.typeId}&subjectId=${youkeData.subjectId}&tipFlag=${youkeData.tipFlag}&youkeZhangId=${youkeData.youkeZhangId}&jieId=${youkeData.jieId}`
|
|
|
})
|
|
|
} else {
|
|
|
// 非游客
|
|
@@ -97,7 +98,6 @@ function getWordListData() {
|
|
|
|
|
|
function getWordListDataYk() {
|
|
|
const youkeData = JSON.parse(routerOpt.youkePageData)
|
|
|
- console.log(youkeData,'routerOpt.youkePageData.jieId');
|
|
|
const opt = {
|
|
|
jieId: youkeData.jieId
|
|
|
};
|
|
@@ -118,8 +118,9 @@ function getWordListDataYk() {
|
|
|
function toWord(data){
|
|
|
if (!cacheManager.get('auth')) {
|
|
|
// 游客
|
|
|
+ const youkeData = JSON.parse(routerOpt.youkePageData)
|
|
|
uni.redirectTo({
|
|
|
- url: `/pages/newEnglish/index?jieId=${routerOpt.jieId}&wordId=${data.id}&levelId=${routerOpt.levelId}&typeId=${routerOpt.typeId}&subjectId=${routerOpt.subjectId}&tipFlag=${routerOpt.tipFlag}&youkeZhangId=${routerOpt.youkeZhangId}&jieId=${routerOpt.jieId}`
|
|
|
+ url: `/pages/newEnglish/index?jieId=${youkeData.jieId}&wordId=${data.id}&levelId=${youkeData.levelId}&typeId=${youkeData.typeId}&subjectId=${youkeData.subjectId}&tipFlag=${youkeData.tipFlag}&youkeZhangId=${youkeData.youkeZhangId}`
|
|
|
})
|
|
|
} else {
|
|
|
// 非游客
|