Explorar o código

登录跳转问题

liushengqiang %!s(int64=2) %!d(string=hai) anos
pai
achega
2d3f76f480

+ 3 - 5
src/views/courseware-list/api.ts

@@ -24,9 +24,7 @@ export const api_lessonCoursewareFavoriteRemove = (params: any): Promise<any> =>
     data: params
   });
 };
-/** 教材收藏取消 */
-export const api_lessonCoursewareQueryStudentLessonDetail = (params: any): Promise<any> => {
-  return request.post('/edu-app/lessonCourseware/queryStudentLessonDetail', {
-    data: params
-  });
+/** 教材详情 */
+export const api_lessonCoursewareDetail = (params: string | number): Promise<any> => {
+  return request.post(`/edu-app/lessonCourseware/detail/${params}`);
 };

+ 3 - 5
src/views/courseware-list/index.tsx

@@ -14,7 +14,7 @@ import {
   api_lessonCoursewareFavoriteSave,
   api_lessonCoursewareFavoriteage,
   api_lessonCoursewarePage,
-  api_lessonCoursewareQueryStudentLessonDetail
+  api_lessonCoursewareDetail
 } from './api';
 import { NImage } from 'naive-ui';
 import { state } from '@/state';
@@ -121,7 +121,7 @@ export default defineComponent({
       getData();
     };
     onMounted(() => {
-      getData();
+    //   getData();
     });
 
     const handleFavorite = async (item: any) => {
@@ -146,9 +146,7 @@ export default defineComponent({
 
     /** 学生端根据教材编号获取关联的单元、章节 */
     const getDetail = async (item: any) => {
-      const res = await api_lessonCoursewareQueryStudentLessonDetail({
-        lessonCoursewareId: item.id
-      });
+      const res = await api_lessonCoursewareDetail(item.id);
       if (res?.code == 200) {
         data.details = res.data;
       }

+ 1 - 1
src/views/layout/auth.tsx

@@ -37,7 +37,7 @@ export default defineComponent({
   methods: {
     async setAuth() {
       const { query } = this.$route;
-      const token = query.userInfo || query.Authorization || storage.get(ACCESS_TOKEN);
+      const token = query.userInfo || query.Authorization;
 
       if (token) {
         storage.set(ACCESS_TOKEN, token);

+ 2 - 2
src/views/layout/code.tsx

@@ -91,9 +91,9 @@ export default defineComponent({
           initRequest: true // 初始化接口
         });
         setLogin(userCash.data);
-        router.back();
+        // router.back();
 
-        emit('confirm');
+        emit('close', true);
       } catch {
         //
       }

+ 11 - 1
src/views/layout/login.tsx

@@ -39,6 +39,7 @@ export default defineComponent({
       if (state.user.status === 'login' || state.user.status === 'error') {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { returnUrl, isRegister, ...rest } = this.$route.query;
+        console.log("🚀 ~ this.$route.query:", this.$route.query)
         this.$router.replace({
           path: returnUrl as any,
           query: {
@@ -198,7 +199,16 @@ export default defineComponent({
           <Code
             phone={this.username}
             isRegister={this.isRegister}
-            onClose={() => (this.imgCodeStatus = false)}
+            onClose={(val) => {
+              this.imgCodeStatus = false
+              if (val) {
+                requestAnimationFrame(() => {
+                  requestAnimationFrame(() => {
+                    this.directNext()
+                  })
+                })
+              }
+            }}
             onConfirm={this.directNext}
           />
         </MPopup>