|
@@ -35,6 +35,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+ <tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
@@ -44,6 +45,7 @@ import {toast} from "@/utils/common";
|
|
|
import {onLoad} from "@dcloudio/uni-app";
|
|
|
import {getWordList,getWordListYk} from "@/api/word.js";
|
|
|
import cacheManager from '@/utils/cacheManager.js';
|
|
|
+import tipBigDialog from '@/components/dialog/tipBigDialog.vue';
|
|
|
|
|
|
const listData = reactive({
|
|
|
count: 0, // 总数,默认值设为 0
|
|
@@ -56,6 +58,7 @@ const listData = reactive({
|
|
|
let wordJieId = ref(null);
|
|
|
let routerOpt = ref(false);
|
|
|
let wordLeft = ref(0);
|
|
|
+const youkeDialogRef = ref(null);
|
|
|
|
|
|
onLoad((options) => {
|
|
|
routerOpt = options;
|
|
@@ -71,6 +74,14 @@ onLoad((options) => {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
+// 游客弹窗---确定
|
|
|
+
|
|
|
+ function ykConfirm() {
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages/login/index'
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
// 返回
|
|
|
function goBack(){
|
|
|
if (!cacheManager.get('auth')) {
|
|
@@ -89,11 +100,12 @@ function goBack(){
|
|
|
}
|
|
|
|
|
|
function handleTitleClick(item){
|
|
|
- wordJieId = item.jieId;
|
|
|
+
|
|
|
if (!cacheManager.get('auth')) {
|
|
|
- getWordListDataYk();
|
|
|
+ youkeDialogRef.value.handleShow();
|
|
|
}else {
|
|
|
// 非游客
|
|
|
+ wordJieId = item.jieId;
|
|
|
getWordListData();
|
|
|
}
|
|
|
}
|
|
@@ -144,12 +156,12 @@ function toWord(data){
|
|
|
// 游客
|
|
|
const youkeData = JSON.parse(routerOpt.youkePageData)
|
|
|
uni.redirectTo({
|
|
|
- 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}`
|
|
|
+ url: `/pages/newEnglish/index?jieId=${wordJieId}&wordId=${data.id}&levelId=${youkeData.levelId}&typeId=${youkeData.typeId}&subjectId=${youkeData.subjectId}&tipFlag=${youkeData.tipFlag}&youkeZhangId=${youkeData.youkeZhangId}`
|
|
|
})
|
|
|
} else {
|
|
|
// 非游客
|
|
|
uni.redirectTo({
|
|
|
- url: `/pages/newEnglish/index?jieId=${routerOpt.jieId}&wordId=${data.id}`
|
|
|
+ url: `/pages/newEnglish/index?jieId=${wordJieId}&wordId=${data.id}`
|
|
|
})
|
|
|
}
|
|
|
}
|