修复一堆问题

src/other_pages/ntrp-evaluate/index.tsx

@@ -216,9 +216,8 @@ function Intro() {
       });
     }
     Taro.redirectTo({
-      url: `/other_pages/ntrp-evaluate/index?stage=${type}${
-        type === StageType.RESULT ? `&id=${id}` : ""
-      }`,
+      url: `/other_pages/ntrp-evaluate/index?stage=${type}${type === StageType.RESULT ? `&id=${id}` : ""
+        }`,
     });
   }
 
@@ -539,18 +538,21 @@ function Result() {
     const res = await evaluateService.getTestResult({ record_id: Number(id) });
     if (res.code === 0) {
       setResult(res.data);
-      // delay(1000);
-      setRadarData(
-        adjustRadarLabels(
-          Object.entries(res.data.radar_data.abilities).map(([key, value]) => [
-            key,
-            Math.min(
-              100,
-              Math.floor((value.current_score / value.max_score) * 100)
-            ),
-          ])
-        )
-      );
+
+      const sortOrder = res.data.sort || [];
+      const abilities = res.data.radar_data.abilities;
+      const sortedKeys = sortOrder.filter((k) => k in abilities);
+      const remainingKeys = Object.keys(abilities).filter((k) => !sortOrder.includes(k));
+      const allKeys = [...sortedKeys, ...remainingKeys];
+      let radarData: [string, number][] = allKeys.map((key) => [
+        key,
+        Math.min(
+          100,
+          Math.floor((abilities[key].current_score / abilities[key].max_score) * 100)
+        ),
+      ]);
+      // 直接使用接口 sort 顺序，不经过 adjustRadarLabels 重新排序
+      setRadarData(radarData);
       updateUserLevel(res.data.record_id, res.data.ntrp_level);
     }
   }
@@ -698,13 +700,12 @@ function Result() {
     }
     const currentPage = getCurrentFullPath();
     Taro.redirectTo({
-      url: `/login_pages/index/index${
-        currentPage ? `?redirect=${encodeURIComponent(currentPage)}` : ""
-      }`,
+      url: `/login_pages/index/index${currentPage ? `?redirect=${encodeURIComponent(currentPage)}` : ""
+        }`,
     });
   }
 
-  function handleGo() {}
+  function handleGo() { }
 
   return (
     <View className={styles.resultContainer}>