|
@@ -163,18 +163,30 @@
|
|
|
function nextWord() {
|
|
|
const index = data.wordList.findIndex(item => item.id == data.activeId);
|
|
|
if (index < data.wordList.length - 1) {
|
|
|
- uni.redirectTo({
|
|
|
- url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index + 1].id }`
|
|
|
- })
|
|
|
+ if (userCode !== 'Visitor') {
|
|
|
+ uni.redirectTo({
|
|
|
+ url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index + 1].id }`
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ uni.redirectTo({
|
|
|
+ url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index + 1].id }&levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.tipFlag}&youkeZhangId=${data.youkeZhangId}`
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
function prevWord() {
|
|
|
const index = data.wordList.findIndex(item => item.id == data.activeId);
|
|
|
if (index > 0) {
|
|
|
- uni.redirectTo({
|
|
|
- url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index - 1].id }`
|
|
|
- })
|
|
|
+ if (userCode !== 'Visitor') {
|
|
|
+ uni.redirectTo({
|
|
|
+ url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index - 1].id }`
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ uni.redirectTo({
|
|
|
+ url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index - 1].id }&levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.tipFlag}&youkeZhangId=${data.youkeZhangId}`
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -183,7 +195,7 @@
|
|
|
if (userCode !== 'Visitor') {
|
|
|
if (data.jieId == 0) {
|
|
|
uni.redirectTo({
|
|
|
- url: `/pages/my/learnRecord?jieId=${data.jieId}&isLearnStatus=${data.isLearnStatus}`
|
|
|
+ url: `/pages/my/learnRecord?jieId=${data.jieId}&isLearnStatus=${data.isLearnStatus}&levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.tipFlag}&youkeZhangId=${data.youkeZhangId}`
|
|
|
})
|
|
|
} else {
|
|
|
uni.redirectTo({
|