谢杰标 2 年之前
父節點
當前提交
f65f3b9738
共有 2 個文件被更改,包括 15 次插入7 次删除
  1. 7 6
      pages/questionBank/index.vue
  2. 8 1
      utils/authority.js

+ 7 - 6
pages/questionBank/index.vue

@@ -148,9 +148,6 @@ export default {
   async onLoad(options) {
     uni.hideTabBar();
     this.options = options;
-    if (this.options.skipPort) {
-      await this.$method.skipLogin(this.options.skipPort);
-    }
     if (this.options.isAct && !this.$method.isLogin()) {
       uni.navigateTo({
         url: "/pages4/login/login?isBack=" + true + "&isAct=1",
@@ -159,11 +156,15 @@ export default {
     }
   },
   async onShow() {
+    let { skipPort, sign } = this.options;
+    if (skipPort) {
+      this.options.skipPort = undefined;
+      this.options.sign = undefined;
+      await this.$method.skipLogin(skipPort);
+    }
     this.param.pageNum = 1;
     this.questionLists = [];
-    this.isGetOtherQuetion = this.options.sign
-      ? true
-      : await this.getIsHaveOtherQuetion();
+    this.isGetOtherQuetion = sign || (await this.getIsHaveOtherQuetion());
     this.getBankList();
   },
   onPullDownRefresh() {

+ 8 - 1
utils/authority.js

@@ -106,7 +106,14 @@ export async function isCanDoExam(examLimitClient) {
   }
   let { data } = await checkOpenidIsUser();
   if (!data) {
-    modalComfirm("该题库只允许同一用户学习");
+    modalComfirm({
+      content: "该题库只允许同一用户学习",
+      scb: () => {
+        uni.switchTab({
+          url: "/pages/questionBank/index",
+        });
+      },
+    });
     throw new Error("data:" + data);
   }
   return false;