跳转

pages/newEnglish/index.vue

@@ -13,10 +13,10 @@
 		</view>
 		<view>
 			底部
-			<view>收藏</view>
+			<view v-if="userCode != 'Visitor'" @click="handleShouCang">收藏</view>
 			<view @click="prevWord" v-if="!isFirst">上一词</view>
 			<view @click="nextWord" v-if="!isLast">下一词</view>
-			<view v-if="isLast">完成</view>
+			<view v-if="isLast" @click="handleComplete">返回</view>
 		</view>
 	</view>
 </template>
@@ -33,6 +33,8 @@
 	} from "@dcloudio/uni-app";
 	import * as httpApi from "@/api/word.js"
 
+	const userCode = getUserIdentity();
+
 	function courseBjFun() {
 		return 'static/images/course/couse-shuxue-bj.png'
 	}
@@ -45,28 +47,38 @@
 		return result;
 	}
 
-	function handleBack() {}
-
 	const data = reactive({
 		jieId: null, // 节/单元ID
 		activeId: null, // 当前单词
-		subjectId: null, // 学科ID
-		levelId: null, // 等级
-		jieName: '', // 节/单元名称
-		title: '', // 版本+年级+学期
-		studyCount: 0, // 已学习总数
 		wordList: [], // 单词列表
 		arrayList: [], // 整合数据
 		activeWord: null, // 单词详情数据
 		collectFlag: 0, // 收藏状态
+		subjectId: null, // 学科ID
+		levelId: null, // 等级
+		typeId: null, // 类型
+		tipFlag: null, // 提示
+		zhangId: null, // 章ID
 	})
 
 	onLoad(({
 		jieId,
-		wordId
+		wordId,
+		subjectId,
+		levelId,
+		typeId,
+		tipFlag,
+		zhangId
 	}) => {
 		data.jieId = jieId;
 		data.activeId = wordId;
+
+		data.subjectId = subjectId;
+		data.levelId = levelId;
+		data.typeId = typeId;
+		data.tipFlag = tipFlag;
+		data.zhangId = zhangId;
+
 		// 获取单词列表数据
 		initWordInfo();
 	})
@@ -96,7 +108,7 @@
 		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 }`
+				url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index + 1].id }`
 			})
 		}
 	}
@@ -105,11 +117,53 @@
 		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 }`
+				url: `/pages/newEnglish/index?jieId=${data.jieId}&wordId=${data.wordList[index - 1].id }`
 			})
 		}
 	}
 
+	function handleBack() {
+		data.subjectId = subjectId;
+		data.levelId = levelId;
+		data.typeId = typeId;
+		data.tipFlag = tipFlag;
+		data.zhangId = zhangId;
+
+		// 返回单词列表
+		if (userCode !== 'Visitor') {
+			uni.redirectTo({
+				url: `/pages/wordList/wordList`
+			})
+		} else {
+			const youkePageData = JSON.stringify({
+				subjectId: data.subjectId,
+				levelId: data.levelId,
+				typeId: data.typeId,
+				tipFlag: data.tipFlag,
+				youkeZhangId: data.zhangId,
+				jieId: data.jieId
+			})
+			uni.redirectTo({
+				url: `/pages/wordList/wordList?youkePageData=${youkePageData}`
+			})
+		}
+	}
+
+	function handleComplete() {
+		// 返回岛
+		if (userCode !== 'Visitor') {
+			uni.redirectTo({
+				url: '/pages/study/index'
+			})
+		} else {
+			uni.redirectTo({
+				url: `/pages/study/index?levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.tipFlag}&youkeZhangId=${data.zhangId}&jieId=${data.jieId}`
+			})
+		}
+	}
+
+	function handleShouCang() {}
+
 	function initWordInfo() {
 		httpApi.getWordInfo({
 			jieId: data.jieId,

pages/selectVersion/selectVersion.vue

@@ -153,7 +153,7 @@
 		} else {
 			// 新英语岛
 			uni.redirectTo({
-				url: `/pages/study/index?levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.activeTipFlag}&zhangId=${data.shangxiaVersionId}`
+				url: `/pages/study/index?levelId=${data.levelId}&typeId=${data.typeId}&subjectId=${data.subjectId}&tipFlag=${data.activeTipFlag}&youkeZhangId=${data.shangxiaVersionId}`
 			})
 		}