diff --git a/pages/projectComparison/projectComparison.wxml b/pages/projectComparison/projectComparison.wxml
index 9b71d60..122193a 100644
--- a/pages/projectComparison/projectComparison.wxml
+++ b/pages/projectComparison/projectComparison.wxml
@@ -36,15 +36,14 @@
-
+
-
+ -->
学科领域
diff --git a/pages/projectDetails/projectDetails.js b/pages/projectDetails/projectDetails.js
index 502543a..8214bce 100644
--- a/pages/projectDetails/projectDetails.js
+++ b/pages/projectDetails/projectDetails.js
@@ -217,16 +217,15 @@ Page({
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 {
+ 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 && /^[A-Za-z]+$/.test(element.total)) text = `等级 ${element.total} 以上`
+ } 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,
diff --git a/pages/projectDetails/projectDetails.less b/pages/projectDetails/projectDetails.less
index 924dab0..c4c932a 100644
--- a/pages/projectDetails/projectDetails.less
+++ b/pages/projectDetails/projectDetails.less
@@ -500,7 +500,7 @@ navigator {
.left {
display: flex;
- flex-direction: column;
+ // flex-direction: column;
justify-content: center;
align-items: center;
@@ -525,12 +525,14 @@ navigator {
font-weight: 900;
font-size: 30rpx;
color: #000000;
- margin-bottom: 12rpx;
+ // margin-bottom: 12rpx;
}
.text {
font-size: 24rpx;
color: #555555;
+ margin-right: 20rpx;
+
}
}
diff --git a/pages/projectDetails/projectDetails.wxml b/pages/projectDetails/projectDetails.wxml
index cf0635e..3a2f7a1 100644
--- a/pages/projectDetails/projectDetails.wxml
+++ b/pages/projectDetails/projectDetails.wxml
@@ -139,10 +139,10 @@
{{ info.tuition_currency || 'HK$' }}
- {{ info.tuition_fee_text || '待确认' }}
总学费
+ {{ info.tuition_fee_text || '待确认' }}
-
+
@@ -277,15 +277,15 @@
{{ info.entrance_requirements || '-' }}
-
+
英语能力要求
满足以下其中一项即可
-
-
+
+
- {{ item.name_zh }}
- 总分 {{ item.total }} 分以上
+ {{ item.name }}
+ {{ item.text }}
@@ -304,10 +304,10 @@
{{ info.tuition_currency || 'HK$' }}
- {{ info.tuition_fee_text || '待确认' }}
总学费
+ {{ info.tuition_fee_text || '待确认' }}
-
+
@@ -485,7 +485,7 @@
- {{ item.schoolname }}
+ {{ item.schoolname }}
专业
diff --git a/pages/projectDetails/projectDetails.wxss b/pages/projectDetails/projectDetails.wxss
index f7974b3..3bf2dc1 100644
--- a/pages/projectDetails/projectDetails.wxss
+++ b/pages/projectDetails/projectDetails.wxss
@@ -414,7 +414,6 @@ navigator {
}
.details-box .tuition .left {
display: flex;
- flex-direction: column;
justify-content: center;
align-items: center;
}
@@ -438,11 +437,11 @@ navigator {
font-weight: 900;
font-size: 30rpx;
color: #000000;
- margin-bottom: 12rpx;
}
.details-box .tuition .left .text {
font-size: 24rpx;
color: #555555;
+ margin-right: 20rpx;
}
.details-box .tuition .right {
width: 300rpx;
diff --git a/project.private.config.json b/project.private.config.json
index e382d64..ea791b4 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -11,7 +11,7 @@
{
"name": "pages/projectDetails/projectDetails",
"pathName": "pages/projectDetails/projectDetails",
- "query": "uniqid=IwdCOvZ08KUhkXtjXQ5vhAPHczKrcBN5pT_y_7MIdipV21AHwG_5tr-Khp8EdxCnmMHk8uHJtNw-knkCuWIyYTU~",
+ "query": "uniqid=bOTzfqH5Ci8q",
"launchMode": "default",
"scene": null
}