Merge pull request #182 from eleliauk/main

🔧 chore：新增审核大法！

src/common/components/Comment/index.tsx

@@ -9,6 +9,7 @@ import './style.scss';
 import { useCourseStore } from '@/pages/main/store/store';
 
 import IconFont from '@/common/components/iconfont';
+import { formatIsoDate } from '@/common/utils';
 import { CourseDetailsType, PublisherDetailsType } from '@/pages/main/store/types';
 import ShowStar from '../showStar/showStar';
 
@@ -72,7 +73,10 @@ const CommentHeader: React.FC<CommentProps> = memo((props) => {
               style={`background-image: url(${publisher_info?.avatar});`}
             ></View>
             <View className="userName">{publisher_info?.nickname}</View>
-            <View className="time">{new Date(ctime as number).toLocaleString()}</View>
+            <View className="time">
+              {' '}
+              {formatIsoDate(new Date(ctime as number).toISOString())}
+            </View>
             <View className="stars">
               <ShowStar score={star_rating}></ShowStar>
             </View>

src/common/components/CommentComponent/CommentComponent.tsx

@@ -4,14 +4,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable import/first */
+
 // Comment.tsx
 import { Image, Text, View } from '@tarojs/components';
 import React, { useEffect, useState } from 'react';
 
 import './index.scss';
 
-import { get } from '@/common/utils';
+// eslint-disable-next-line import/first
+import { formatIsoDate, get } from '@/common/utils';
+// eslint-disable-next-line import/first
 import { useCourseStore } from '@/pages/main/store/store';
 
 interface CommentProps {
@@ -72,10 +74,11 @@ const CommentComponent: React.FC<CommentProps> = ({ comments, onCommentClick })
     void fetchAllReplies();
   }, []);
 
-  const ctimeToString = (ctime: number) => {
-    const ctimeDate = new Date(ctime);
-    return <Text className="time">{ctimeDate.toLocaleString()}</Text>;
-  };
+  // const ctimeToString = (ctime: number) => {
+  //   return (
+  //     <Text className="time">formatIsoDate(new Date(ctime as number).toISOString())</Text>
+  //   );
+  // };
 
   // 辅助函数：获取回复者的昵称
   const getReplyToNickname = (replyToUid: number): string => {
@@ -103,7 +106,9 @@ const CommentComponent: React.FC<CommentProps> = ({ comments, onCommentClick })
           <View className="comment-header">
             <Image src={comment.user?.avatar ?? ''} className="avatar" />
             <Text className="nickname">{comment.user?.nickname}</Text>
-            {ctimeToString(comment.ctime)}
+            <View className="time">
+              {formatIsoDate(new Date(comment.ctime).toISOString())}
+            </View>
           </View>
           <View className="comment-content">
             <Text>{comment.content}</Text>
@@ -128,7 +133,9 @@ const CommentComponent: React.FC<CommentProps> = ({ comments, onCommentClick })
                       </Text>
                     ) : null}
                   </Text>
-                  {ctimeToString(reply.ctime)}
+                  <View className="time">
+                    {formatIsoDate(new Date(comment.ctime).toISOString())}
+                  </View>
                 </View>
                 <View className="reply-content">
                   <Text>{reply.content}</Text>

src/common/components/SearchInput/SearchInput.tsx

@@ -26,20 +26,6 @@ const SearchInput: React.FC<SearchInputProps> = ({
   // const [isSearchActive, setIsSearchActive] = useState(true);
   const [searchText, setSearchText] = useState(''); // 添加状态来存储搜索文本
 
-  // const handleClick = () => {
-  //   // if (!isSearchActive) {
-  //     // setIsSearchActive(true);
-  //     onSearchToggle();
-  //   // }
-  // };
-
-  // const handleBlur = () => {
-  //   // if (isSearchActive) {
-  //   //   setIsSearchActive(false);
-  //     onSearchToggle();
-  //   // }
-  // };
-
   // 添加点击图片时的搜索逻辑
   const handleImageClick = (e: any) => {
     // 阻止事件冒泡

src/common/utils/checkToken.ts

@@ -2,7 +2,11 @@ import Taro from '@tarojs/taro';
 
 const checkToken = () => {
   const token: string = Taro.getStorageSync('shortToken');
-
+  const accountInfo = Taro.getAccountInfoSync();
+  void Taro.setStorage({
+    key: 'accountInfo',
+    data: accountInfo,
+  });
   if (token) {
     void Taro.switchTab({ url: '/pages/main/index' });
   } else {

src/pages/classInfo/index.tsx

@@ -202,7 +202,7 @@ export default function Index() {
           </View>
         )}
         {questionlist.length === 0 && (
-          <Text className="mr-auto flex items-center justify-center">
+          <Text className="mb-2 mr-auto mt-2 flex items-center justify-center">
             暂无内容敬请期待
           </Text>
         )}

src/pages/evaluate/evaluate.tsx

@@ -14,17 +14,7 @@ import Star from '@/common/components/star/star';
 import { post } from '@/common/utils';
 
 export default function evaluate() {
-  // function generateUniqueID() {
-  //   const timestamp = Date.now().toString(36); // 时间戳转换为36进制
-  //   const randomString = Math.random().toString(36).substr(2, 5); // 随机数转换为36进制并截取部分字符
-
-  //   const uniqueID = timestamp + randomString;
-  //   return uniqueID;
-  // }
-
-  // 示例用法
-  //const uniqueID = generateUniqueID();
-
+  const accoutInfo = Taro.getStorageSync('accountInfo');
   // 初始化状态，存储所有选中的 Radio 项的值
   const [selectedValues, setSelectedValues] = useState<string[]>([]);
 
@@ -51,20 +41,6 @@ export default function evaluate() {
     { value: 'NoAssessment', text: '无考核' },
   ];
 
-  // const [checkedClass,setCheckedClass] = useState([{ content: '只能评价自己学过的课程哦' }]);
-
-  // enum FeatureTag {
-  //   EasyToLearn = '课程简单易学',
-  //   RichInContent = '课程干货满满',
-  //   Challenging = '课程很有挑战',
-  //   RigorousAndResponsible = '老师严谨负责',
-  //   KindAndEasygoing = '老师温柔随和',
-  //   Humorous = '老师风趣幽默',
-  //   LessHomework = '平时作业少',
-  //   KeyPointsForFinal = '期末划重点',
-  //   ComprehensiveOnlineMaterials = '云课堂资料全',
-  // }
-
   const features = [
     { value: 'EasyToLearn', content: '课程简单易学' },
     { value: 'RichInContent', content: '课程干货满满' },
@@ -177,7 +153,9 @@ export default function evaluate() {
     }
   };
 
-  return (
+  return accoutInfo.miniProgram.envVersion !== 'develop' ? (
+    <>因为政策原因，暂时无法评价课程</>
+  ) : (
     <Form className="view">
       <View className="p">
         <Text> 选择课程 : </Text>

src/pages/index/index.tsx

@@ -1,13 +1,14 @@
 import { Navigator, View } from '@tarojs/components';
+// import Taro from '@tarojs/taro';
 import { useState } from 'react';
 import { AtFloatLayout } from 'taro-ui';
 
 import './index.scss';
 
 export default function Index() {
   const [isFloatLayoutVisible, setIsFloatLayoutVisible] = useState(false); // 控制 AtFloatLayout 显示的状态
-
   // 处理打开 FloatLayout 的方法
+
   const handleFloatLayoutChange = (isVisible: boolean) => {
     console.log(1);
     setIsFloatLayoutVisible(isVisible);

src/pages/main/index.tsx

@@ -54,8 +54,6 @@ export default function Index() {
 
   const handleSearch = (searchText: string) => {
     console.log('搜索文本:', searchText);
-    // 这里可以添加发送API请求的代码
-    // 例如: fetchSearchResults(searchText);
   };
 
   const geneHandler = () => {

src/pages/questionList/index.tsx

@@ -1,11 +1,9 @@
-/* eslint-disable import/first */
 /* eslint-disable no-console */
 import { Button, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import { useEffect, useState } from 'react';
 
 // import './index.scss';
-
 import CourseInfo from '@/common/components/CourseInfo/CourseInfo';
 import QuestionListComponent from '@/common/components/QuestionListComponent/QuestionListComponent';
 import { get } from '@/common/utils';

src/pages/research/research.tsx

@@ -64,7 +64,6 @@ const Research: React.FC = () => {
   const handleSearch = (searchText: string) => {
     console.log('搜索文本:', searchText);
     setSpread(true);
-    // 这里可以添加发送API请求的代码
     get(`/search?biz=Course&keyword=${searchText}&search_location=Home`).then((res) => {
       console.log(res);
       setClasses(res.data);