Merge pull request #184 from eleliauk/main

🐞 fix：修复bug
MuxiKeStack · Nov 18, 2024 · 34c6fc3 · 34c6fc3
2 parents dd9175e + f405052
commit 34c6fc3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/.yarn/releases/yarn-4.3.1.cjs b/.yarn/releases/yarn-4.3.1.cjs
diff --git a/src/modules/login/components/AuthForm.tsx b/src/modules/login/components/AuthForm.tsx
@@ -101,7 +101,7 @@ const AuthForm: React.FC = memo(() => {
               password
               onInput={(e) => setUserData({ ...userData, password: e.detail.value })}
             ></Input>
-            <Text className="text-sm text-gray-500">Forget your password?</Text>
+            <Text className="text-sm text-gray-500">请使用一站式账号密码登录</Text>
           </View>
           <View className="mb-12 mt-8 flex w-[90vw] flex-col gap-2">
             <Button

diff --git a/src/modules/profile/components/Header.tsx b/src/modules/profile/components/Header.tsx
@@ -67,7 +67,12 @@ const Header: React.FC = memo(() => {
   return (
     <>
       <Image src={TopBackground as string} className="h-[35vh] w-full"></Image>
-      <View className="absolute top-[12vh] flex w-full items-center gap-4 pl-14">
+      <View
+        className="absolute top-[12vh] flex w-full items-center gap-4 pl-14"
+        onClick={() => {
+          void Taro.navigateTo({ url: '/pages/editUser/index' });
+        }}
+      >
         <View className="aspect-square h-[20vw] w-[20vw] rounded-full bg-white">
           <Image
             src={user.avatarUrl}
@@ -80,14 +85,7 @@ const Header: React.FC = memo(() => {
             {user.selectedTitle !== 'None' && (
               <TitleButton title={user.selectedTitle} isSelected></TitleButton>
             )}
-            <Text
-              className="text-md font-bold text-white"
-              onClick={() => {
-                void Taro.navigateTo({ url: '/pages/editUser/index' });
-              }}
-            >
-              &gt;
-            </Text>
+            <Text className="text-md font-bold text-white">&gt;</Text>
           </View>
           <Text className="flex w-full justify-end text-xs font-bold text-orange-400">
             {user.points}/{user.nextLevel}

diff --git a/src/pages/evaluate/evaluate.tsx b/src/pages/evaluate/evaluate.tsx
@@ -153,7 +153,7 @@ export default function evaluate() {
     }
   };
 
-  return accoutInfo.miniProgram.envVersion !== 'develop' ? (
+  return accoutInfo.miniProgram.envVersion === 'develop' ? (
     <>因为政策原因，暂时无法评价课程</>
   ) : (
     <Form className="view">

diff --git a/src/pages/shareGrades/index.tsx b/src/pages/shareGrades/index.tsx
@@ -19,7 +19,7 @@ const ShareGrades = () => {
           });
         }
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (r.msg === '签约成功') {
+        if (r.msg === 'success') {
           void Taro.showToast({
             icon: 'success',
             title: '签约成功！',