Ver Fonte

修改注册伴学和管理老师账号体验

1、去掉进页面的loading动画;
2、把判断code码的逻辑放到setup上面
lex há 2 anos atrás
pai
commit
15800a86b9

+ 2 - 2
src/router/index.ts

@@ -40,9 +40,9 @@ const router: Router = createRouter({
   }
 })
 
-const whitePath = ['/coursewarePlay', '/lessonCourseware', '/courseList']
+const whitePath = ['/coursewarePlay', '/lessonCourseware', '/courseList', '/companion-teacher-register', '/manage-teacher-register']
 router.beforeEach((to, from, next) => {
-  if (!whitePath.includes(to.path)){
+  if (!whitePath.includes(to.path)) {
     baseEvent.emit('toastShow')
   }
   // console.log(to, from)

+ 23 - 19
src/school/companion-teacher/companion-teacher-register.tsx

@@ -202,28 +202,9 @@ export default defineComponent({
         showToast('信息获取失败,请联系伴学指导')
       }
 
-      // 判断是否是微信,只能微信中打开
       if (!browser().weixin) {
         state.showPopup = true
         return
-      } else {
-        //授权
-        const code = getUrlCode()
-        if (!code) {
-          const newUrl =
-            window.location.origin +
-            window.location.pathname +
-            '#' +
-            route.path +
-            '?' +
-            qs.stringify({
-              ...route.query
-            })
-          getAppIdAndCode(newUrl)
-          return
-        } else {
-          state.code = code
-        }
       }
 
       // t: route.query.t, // 过期时间
@@ -420,6 +401,29 @@ export default defineComponent({
       }
     }
 
+    // 判断是否是微信,只能微信中打开
+    if (!browser().weixin) {
+      state.showPopup = true
+      // return
+    } else {
+      //授权
+      const code = getUrlCode()
+      if (!code) {
+        const newUrl =
+          window.location.origin +
+          window.location.pathname +
+          '#' +
+          route.path +
+          '?' +
+          qs.stringify({
+            ...route.query
+          })
+        getAppIdAndCode(newUrl)
+        return ''
+      } else {
+        state.code = code
+      }
+    }
     return () => (
       <div class={styles.register}>
         <div class={styles.title}>

+ 23 - 18
src/school/manage-teacher/manage-teacher-register.tsx

@@ -136,24 +136,6 @@ export default defineComponent({
       if (!browser().weixin) {
         state.showPopup = true
         return
-      } else {
-        //授权
-        const code = getUrlCode()
-        if (!code) {
-          const newUrl =
-            window.location.origin +
-            window.location.pathname +
-            '#' +
-            route.path +
-            '?' +
-            qs.stringify({
-              ...route.query
-            })
-          getAppIdAndCode(newUrl)
-          return
-        } else {
-          state.code = code
-        }
       }
 
       // t: route.query.t, // 过期时间
@@ -274,6 +256,29 @@ export default defineComponent({
       }
     }
 
+    // 判断是否是微信,只能微信中打开
+    if (!browser().weixin) {
+      state.showPopup = true
+    } else {
+      //授权
+      const code = getUrlCode()
+      if (!code) {
+        const newUrl =
+          window.location.origin +
+          window.location.pathname +
+          '#' +
+          route.path +
+          '?' +
+          qs.stringify({
+            ...route.query
+          })
+        getAppIdAndCode(newUrl)
+        return
+      } else {
+        state.code = code
+      }
+    }
+
     return () => (
       <div class={styles.register}>
         <div class={styles.title}>