From 5ec53fc464a5f6f5831774763044e5b954b128d2 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Tue, 25 Feb 2025 19:17:05 +0800
Subject: [PATCH] no message

---
 component/territorySelect/territorySelect.js |  2 +-
 pages/projectComparison/projectComparison.js | 25 +++++++++-----
 utils/commonMethod.js                        | 36 ++++++++++++++++++++
 3 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/component/territorySelect/territorySelect.js b/component/territorySelect/territorySelect.js
index 25130bb..69f9b72 100644
--- a/component/territorySelect/territorySelect.js
+++ b/component/territorySelect/territorySelect.js
@@ -23,7 +23,7 @@ Component({
             major: "请选择专业",
             subject2: "请选择专业",
             subject: "请选择学科领域",
-            school: "请选择学院领域",
+            school: "请选择学院",
         },
     },
 
diff --git a/pages/projectComparison/projectComparison.js b/pages/projectComparison/projectComparison.js
index fde12be..0420d7b 100644
--- a/pages/projectComparison/projectComparison.js
+++ b/pages/projectComparison/projectComparison.js
@@ -101,14 +101,23 @@ Page({
                         element['language_of_instruction_text'] = strOutput
                     }
 
-                    if (Array.isArray(element.english_proficiency)) {
-                        const english = element.english_proficiency
-                        let text = ""
-                        english.forEach(element => {
-                            text += `・${element.name_zh}(${element.name_en}) ${element.total}分以上 \n`
-                        })
-                        element['english_proficiency_text'] = text
-                    }
+                    let scores = element.language_proficiency_scores || []
+
+                    const scoresList = common.scoresList(scores)
+
+                    element["english_proficiency_text"] = ""
+                    scoresList.forEach(ele => {
+                        element["english_proficiency_text"] += `・ ${ele.name}：${ele.text}； \n`
+                    })
+
+                    // if (Array.isArray(element.english_proficiency)) {
+                    //     const english = element.english_proficiency
+                    //     let text = ""
+                    //     english.forEach(element => {
+                    //         text += `・${element.name_zh}(${element.name_en}) ${element.total}分以上 \n`
+                    //     })
+                    //     element['english_proficiency_text'] = text
+                    // }
 
                     if (element.scholarship) element['scholarshipText'] = this.JudgmentScholarshipText(element.scholarship)
                     element['disciplinename'] = obj[element.disciplineid] || ''
diff --git a/utils/commonMethod.js b/utils/commonMethod.js
index 79a1c87..a0912dd 100644
--- a/utils/commonMethod.js
+++ b/utils/commonMethod.js
@@ -92,6 +92,41 @@ function decodeKey(encrypted, key) {
     })
 }
 
+const scoresList = scores => {
+    return scores
+        .map(element => {
+            let text = ""
+            if (["GMAT", "GMAT Focus Edition"].includes(element.name_zh)) text = `Verbal Reasoning ${element.verbal_reasoning} 分以上`
+            else if (["IELTS Academic", "TOEFL-iBT", "TOEFL-pBT"].includes(element.name_en)) {
+                const fields = {
+                    total: "总分",
+                    reading: "阅读",
+                    speaking: "口语",
+                    writing: "写作",
+                    listening: "听力",
+                }
+
+                let scores = [element.reading, element.speaking, element.writing, element.listening]
+
+                if (scores.length == 4 && scores.every(score => score !== undefined && score > 0 && score === scores[0])) text = `总分 ${element.total} 分以上，各项分数不低于 ${scores[0]} 分`
+                else {
+                    for (const [key, label] of Object.entries(fields)) {
+                        if (element[key]) text += `${label} ${element[key]} 分以上、`
+                    }
+                    if (text.endsWith("、")) text = text.slice(0, -1)
+                }
+
+            } else if (element.total && element.total == 'Pass') text = `等级 ${element.total}`
+            else if (element.total && /^[A-Za-z]+$/.test(element.total)) text = `等级 ${element.total} 以上`
+            else if (element.total) text = `总分 ${element.total} 分以上`
+            return text ? {
+                name: element.name_zh,
+                text
+            } : null
+        })
+        .filter(item => item !== null)
+}
+
 module.exports = {
     getOfferAdDetails,
     goPage,
@@ -99,4 +134,5 @@ module.exports = {
     xgBasicData,
     formatNumberWithSpaces,
     decodeKey,
+    scoresList,
 }
\ No newline at end of file