Merge pull request #215 from eleliauk/main

merge
MuxiKeStack · Dec 22, 2024 · a48524e · a48524e
2 parents 6f3d2b2 + 5dc7100
commit a48524e
Show file tree

Hide file tree

Showing 13 changed files with 200 additions and 112 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -13,16 +13,22 @@ const interceptor: Taro.interceptor = function (chain: Taro.Chain) {
   return chain.proceed(requestParams).then((res) => {
     console.log(Taro.getStorageSync('shortToken'));
 
-    if (res.statusCode === 401 && Taro.getStorageSync('visitor') !== false) {
-      void Taro.reLaunch({ url: '/pages/login/index' });
-      Taro.showToast({
-        title: '登录过期,请重新登录',
-        icon: 'none',
+    if (res.statusCode === 401 && Taro.getStorageSync('visitor') !== true) {
+      console.log(res, Taro.getStorageSync('visitor'));
+
+      void Taro.reLaunch({ url: '/pages/login/index' }).then(() => {
+        Taro.showToast({
+          title: '登录过期,请重新登录',
+          icon: 'none',
+        });
       });
     }
     return res;
   }) as Taro.Chain;
 };
+Taro.onAppShow(() => {
+  Taro.setStorageSync('visitor', false);
+});
 Taro.addInterceptor(interceptor);
 class App extends Component<PropsWithChildren> {
   //TODO 写成加interceptor 但是我还没写明白 别急

diff --git a/src/common/components/AnswerToStudent/index.tsx b/src/common/components/AnswerToStudent/index.tsx
@@ -6,13 +6,14 @@ interface Question {
   content: string;
   preview_answers: Array<Answerv1Answer>;
 }
-
 const AnswerToStudent: React.FC<Question> = (props) => {
   const { content, preview_answers } = props;
   return (
     <View className="m-auto flex h-[4vh] w-[80vw] items-center justify-center gap-2">
       <Image src={Ask as string} className="h-6 w-6" />
-      <View className="text-base font-medium text-gray-800">{content}</View>
+      <View className="w-[50vw] overflow-hidden text-ellipsis whitespace-nowrap text-base font-medium text-gray-800">
+        {content}
+      </View>
       <View className="ml-auto text-sm text-gray-500">
         {preview_answers?.length ?? 0} 个回答
       </View>

diff --git a/src/common/components/Comment/index.tsx b/src/common/components/Comment/index.tsx
@@ -63,7 +63,7 @@ const CommentHeader: React.FC<CommentProps> = memo((props) => {
     <>
       {!course_info ? (
         <>
-          <View className="classTitle">pending</View>
+          <View className="italic text-gray-400">加载中 ...</View>
         </>
       ) : (
         <>
@@ -75,7 +75,7 @@ const CommentHeader: React.FC<CommentProps> = memo((props) => {
       <View className="comment">
         {!publisher_info ? (
           <>
-            <View>pending</View>
+            <View className="italic text-gray-400">加载中 ...</View>
           </>
         ) : (
           <>

diff --git a/src/common/utils/fetch.ts b/src/common/utils/fetch.ts
@@ -12,15 +12,15 @@ const header = {
 const getToken = async () => {
   const res = await Taro.getStorage({ key: 'shortToken' });
   if (res.data) return res.data;
-  void Taro.navigateTo({ url: '/pages/login/index' });
+  void Taro.reLaunch({ url: '/pages/login/index' });
   throw new Error(`没token: ${res.errMsg as unknown as string}`);
 };
 
 const refreshToken = async () => {
   try {
     const longToken = await Taro.getStorage({ key: 'longToken' });
     if (!longToken.data) {
-      void Taro.navigateTo({ url: '/pages/login/index' });
+      void Taro.reLaunch({ url: '/pages/login/index' });
       throw new Error('没longToken');
     }
 
@@ -42,11 +42,13 @@ const refreshToken = async () => {
     }
     throw new Error('刷新token失败');
   } catch (error) {
-    void Taro.showToast({
-      title: '登录过期 请刷新小程序重新登录',
-      icon: 'error',
+    if (Taro.getStorageSync('visitor') === true) return;
+    void Taro.reLaunch({ url: '/pages/login/index' }).then(() => {
+      void Taro.showToast({
+        title: '登录过期 请刷新小程序重新登录',
+        icon: 'none',
+      });
     });
-    void Taro.navigateTo({ url: '/pages/login/index' });
     throw error;
   }
 };

diff --git a/src/modules/notification/components/Notification.tsx b/src/modules/notification/components/Notification.tsx
@@ -22,7 +22,14 @@ const Notification: React.FC = memo(() => {
   const [supportMessage, setSupportMessage] = useState<MessageType[]>([]);
   const [loading, setLoading] = useState<boolean>(false);
   const currentMessage = useMemo(() => {
-    return tab === '提问' ? commentMessage : tab === '点赞' ? supportMessage : [];
+    const msg = tab === '提问' ? commentMessage : tab === '点赞' ? supportMessage : [];
+    if (!msg || !msg.length) {
+      void Taro.showToast({
+        title: '暂时没有消息',
+        icon: 'none',
+      });
+    }
+    return msg;
   }, [tab, commentMessage, supportMessage]);
   const [ctime, setCtime] = useState<number>(0);
   const [end, setEnd] = useState(false);
@@ -43,8 +50,9 @@ const Notification: React.FC = memo(() => {
             if (itemType === 'Comment') {
               detailRes = await get(`/comments/${item.Ext.commentId}/detail`);
               parentRes = await get(
-                `/comments/${detailRes.data.parent_comment_id}/detail`
+                `/comments/${detailRes.data?.parent_comment_id ?? 0}/detail`
               );
+              console.log('tag');
               user = await getUserInfo(item.Ext.commentator);
             } else if (itemType === 'Support') {
               detailRes =
@@ -164,7 +172,14 @@ const Notification: React.FC = memo(() => {
     </View>
   ) : (
     <View className="flex h-screen w-full flex-col items-center gap-4 overflow-y-scroll pb-[13vh]">
-      <TabBar tab={tab} setTab={setTab} />
+      <TabBar
+        tab={tab}
+        //eslint-disable-next-line @typescript-eslint/no-shadow
+        setTab={(tab) => {
+          setTab(tab);
+          setCtime(0);
+        }}
+      />
       <VirtualList
         height="70%"
         width="100%"

diff --git a/src/pages/classInfo/index.tsx b/src/pages/classInfo/index.tsx
@@ -3,7 +3,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable import/first */
 import { Image, Text, View } from '@tarojs/components';
-import Taro from '@tarojs/taro';
+
+import Taro, { useDidShow } from '@tarojs/taro';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { AtIcon } from 'taro-ui';
 
@@ -96,7 +97,7 @@ export default function Index() {
     getParams();
   }, []);
   //获取问题个数
-  useEffect(() => {
+  const initData = () => {
     // eslint-disable-next-line @typescript-eslint/require-await
     const getCourseData = async () => {
       try {
@@ -127,52 +128,66 @@ export default function Index() {
     };
 
     if (courseId) void getCommentData();
+  };
+  const fetchAnswer = () => {
+    try {
+      void get(
+        `/questions/list?biz=Course&biz_id=${courseId}&cur_question_id=${0}&limit=${3}`
+      ).then((res) => {
+        console.log(res);
+
+        console.log('questionlist1', res.data);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
+        const questionsWithAnswers = res.data.map((item) => ({
+          ...item,
+          preview_answers: item.preview_answers || [],
+        }));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        setQuestionlist(res.data);
+        Taro.hideLoading();
+      });
+    } catch (e) {
+      console.error('Failed to fetch course data:', e);
+    }
+  };
+  const fetchGrades = async () => {
+    try {
+      await get(`/grades/courses/${courseId}`).then((res) => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        setGrade(res.data); // 设置 grade 数据
+        !res.data && bailout();
+        Taro.hideLoading();
+      });
+    } catch (err) {
+      console.error('Failed to fetch grades data', err);
+    }
+  };
+  const getNumData = () => {
+    try {
+      void get(`/questions/count?biz=Course&biz_id=${courseId}`).then((res) => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        setQuestionNum(res.data);
+        Taro.hideLoading();
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  };
+  useEffect(() => {
+    initData();
   }, [courseId]);
+  useDidShow(() => {
+    initData();
+    if (courseId) {
+      void Taro.showLoading({
+        title: '加载中',
+      });
+      void fetchGrades();
+      void getNumData();
+      void fetchAnswer();
+    }
+  });
   useEffect(() => {
-    const fetchGrades = async () => {
-      try {
-        await get(`/grades/courses/${courseId}`).then((res) => {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          setGrade(res.data); // 设置 grade 数据
-          !res.data && bailout();
-          Taro.hideLoading();
-        });
-      } catch (err) {
-        console.error('Failed to fetch grades data', err);
-      }
-    };
-    const getNumData = () => {
-      try {
-        void get(`/questions/count?biz=Course&biz_id=${courseId}`).then((res) => {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          setQuestionNum(res.data);
-          Taro.hideLoading();
-        });
-      } catch (e) {
-        console.error(e);
-      }
-    };
-    const fetchAnswer = () => {
-      try {
-        void get(
-          `/questions/list?biz=Course&biz_id=${courseId}&cur_question_id=${0}&limit=${3}`
-        ).then((res) => {
-          console.log(res);
-
-          console.log('questionlist1', res.data);
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
-          const questionsWithAnswers = res.data.map((item) => ({
-            ...item,
-            preview_answers: item.preview_answers || [],
-          }));
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          setQuestionlist(res.data);
-          Taro.hideLoading();
-        });
-      } catch (e) {
-        console.error('Failed to fetch course data:', e);
-      }
-    };
     if (courseId) {
       void Taro.showLoading({
         title: '加载中',

diff --git a/src/pages/evaluate/evaluate.tsx b/src/pages/evaluate/evaluate.tsx
@@ -134,6 +134,9 @@ export default function evaluate() {
       });
       return;
     }
+    void Taro.showLoading({
+      title: '提交中',
+    });
     const evaluationobj = {
       star_rating: selectedStarIndex,
       content: comment,
@@ -145,16 +148,34 @@ export default function evaluate() {
       is_anonymous: isAnonymous,
     };
     console.log(evaluationobj);
+    if (!comment) {
+      void Taro.showToast({
+        title: '内容不能为空',
+        icon: 'none',
+      });
+      return;
+    }
     post(`/evaluations/save`, evaluationobj)
       .then((res) => {
         if (res.code === 0) {
-          void Taro.switchTab({
-            url: '/pages/main/index', // 页面路径
+          void Taro.navigateBack().then(() => {
+            void Taro.showToast({
+              title: '课评发布成功',
+              icon: 'none',
+            });
+          });
+        } else {
+          void Taro.showToast({
+            title: res.msg,
+            icon: 'none',
           });
         }
       })
       .catch((error) => {
         console.error('发布课评请求失败:', error);
+      })
+      .finally(() => {
+        void Taro.hideLoading();
       });
   };
   const [selectedStarIndex, setSelectedStarIndex] = useState(-1);

diff --git a/src/pages/main/index.tsx b/src/pages/main/index.tsx
@@ -1,7 +1,8 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 /* eslint-disable import/first */
 import { Image, ScrollView, Text, View } from '@tarojs/components';
-import Taro from '@tarojs/taro';
+
+import Taro, { useDidShow } from '@tarojs/taro';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import './index.scss';
@@ -16,9 +17,9 @@ import { useCourseStore } from './store/store';
 import { COURSE_TYPE } from './store/types';
 
 const COURSE_NAME_MAP = {
+  [COURSE_TYPE.ANY]: '全部',
   [COURSE_TYPE.MAJOR]: '专业',
-  [COURSE_TYPE.GENERAL_ELECT]: '通选',
-  [COURSE_TYPE.GENERAL_REQUIRED]: '通必',
+  [COURSE_TYPE.GENERAL_ELECT]: '个性',
   [COURSE_TYPE.GENERAL_CORE]: '通核',
 };
 
@@ -67,6 +68,19 @@ export default function Index() {
     }
   }, [classType]);
 
+  useDidShow(() => {
+    void Taro.showLoading({ title: '加载中' });
+    void dispatch
+      .refershComments()
+      .then(() => {
+        Taro.hideLoading();
+      })
+      .catch(() => {
+        Taro.hideLoading();
+        void Taro.showToast({ title: '加载失败', icon: 'none' });
+      });
+  });
+
   const handleSearch = (searchText: string) => {
     console.log('搜索文本:', searchText);
   };
@@ -77,7 +91,6 @@ export default function Index() {
         const res = (await postBool('/checkStatus', {
           name: 'kestack',
         })) as StatusResponse;
-
         setTest(res.data.status);
       } catch (error) {
         console.error('Error fetching status:', error);

diff --git a/src/pages/main/store/commentInfoSlice.ts b/src/pages/main/store/commentInfoSlice.ts
@@ -16,13 +16,13 @@ export const CreateCommentInfo: StateCreator<
   comments: {
     CoursePropertyGeneralCore: [],
     CoursePropertyGeneralElective: [],
-    CoursePropertyGeneralRequired: [],
+    CoursePropertyAny: [],
     CoursePropertyMajorCore: [],
   },
   currentId: 0,
   pageSize: 10,
   loading: true,
-  classType: COURSE_TYPE.GENERAL_CORE,
+  classType: COURSE_TYPE.ANY,
   async refershComments() {
     return await get().updateComments(0);
   },