Merge pull request #168 from MaggieMii/main

🐞 fix: 修改评课部分bug
MuxiKeStack · Oct 23, 2024 · 50c82e4 · 50c82e4
2 parents a4cb277 + e5a53f9
commit 50c82e4
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 44,850 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/common/components/label3/label3.scss b/src/common/components/label3/label3.scss
@@ -4,16 +4,13 @@
   box-shadow: 0rpx 5rpx 11rpx 2rpx rgba(0, 0, 0, 0.16);
   border-radius: 16rpx 16rpx 16rpx 16rpx;
   opacity: 1;
-  font-size: 22rpx;
+  font-size: 25rpx;
   font-family:
     Segoe UI-Regular,
     Segoe UI;
   font-weight: 400;
   color: #f18900;
-  padding-left: 20rpx;
-  padding-right: 20rpx;
-  padding-top: 5rpx;
-  padding-bottom: 5rpx;
+  padding: 7rpx 25rpx;
   margin-bottom: 15rpx;
   margin-right: 15rpx;
   display: inline-block;

diff --git a/src/common/components/label3/label3.tsx b/src/common/components/label3/label3.tsx
@@ -6,10 +6,11 @@ import { View } from '@tarojs/components';
 import './label3.scss';
 
 export default function Label3(props) {
-  const { handleChecked } = props;
+  const { handleChecked, handleClick } = props;
 
   const label3Checked = (id) => {
-    handleChecked(id);
+    if (id) handleChecked(id);
+    handleClick();
     // console.log("已点击")
   };
 

diff --git a/src/common/components/star/star.scss b/src/common/components/star/star.scss
@@ -1,5 +1,5 @@
 .star {
-  width: 25rpx;
-  height: 25rpx;
+  width: 35rpx;
+  height: 35rpx;
   margin-right: 5rpx;
 }
diff --git a/src/pages/evaluate/evaluate.tsx b/src/pages/evaluate/evaluate.tsx
@@ -169,11 +169,19 @@ export default function evaluate() {
     // 执行其他需要的逻辑
   };
 
+  const onLableClick = () => {
+    if (courseName == '只能评价自己学过的课程哦') {
+      void Taro.navigateTo({
+        url: '/pages/myclass/myclass',
+      });
+    }
+  };
+
   return (
     <Form className="view">
       <View className="p">
         <Text> 选择课程 : </Text>
-        <Label3 content={courseName}></Label3>
+        <Label3 handleClick={onLableClick} content={courseName}></Label3>
       </View>
       <View className="p">
         <Text>评价星级 :</Text>

diff --git a/src/pages/questionList/index.config.ts b/src/pages/questionList/index.config.ts
diff --git a/src/pages/questionList/index.scss b/src/pages/questionList/index.scss
diff --git a/src/pages/questionList/index.tsx b/src/pages/questionList/index.tsx
@@ -4,7 +4,7 @@ import { Button, View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 import { useEffect, useState } from 'react';
 
-import './index.scss';
+// import './index.scss';
 
 import CourseInfo from '@/common/components/CourseInfo/CourseInfo';
 import QuestionListComponent from '@/common/components/QuestionListComponent/QuestionListComponent';