gter.net/min-project
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
A1300399510 2024-12-20 17:16:47 +08:00
parent 9b1f0680d9
commit 02950ad9ea
6 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/projectComparison/projectComparison.wxml
View File

@ -36,15 +36,14 @@
</view> </view>
</view> </view>
<view class="lump"> <!-- <view class="lump">
<view class="title">学校合排名</view> <view class="title">学校合排名</view>
<view class="block flexflex"> <view class="block flexflex">
<view class="item flex1" wx:for="{{ list }}" wx:key="index"> <view class="item flex1" wx:for="{{ list }}" wx:key="index">
<!-- <template is="mode2" data="{{ text: item.rankingsMin || '-' }}"></template> -->
<template is="mode2" data="{{ text: item.rankings[0].rank || '-' }}"></template> <template is="mode2" data="{{ text: item.rankings[0].rank || '-' }}"></template>
</view> </view>
</view> </view>
</view> </view> -->
<view class="lump"> <view class="lump">
<view class="title">学科领域</view> <view class="title">学科领域</view>

9
pages/projectDetails/projectDetails.js
View File

@ -217,16 +217,15 @@ Page({
let scores = [element.reading, element.speaking, element.writing, element.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])) { if (scores.length == 4 && scores.every(score => score !== undefined && score > 0 && score === scores[0])) text = `总分 ${element.total} 分以上，各项分数不低于 ${scores[0]} 分`
text = `总分 ${element.total} 分以上，各项分数不低于 ${scores[0]} 分` else {
} else {
for (const [key, label] of Object.entries(fields)) { for (const [key, label] of Object.entries(fields)) {
if (element[key]) text += `${label} ${element[key]} 分以上、` if (element[key]) text += `${label} ${element[key]} 分以上、`
} }
if (text.endsWith("、")) text = text.slice(0, -1) 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 && /^[A-Za-z]+$/.test(element.total)) text = `等级 ${element.total} 以上`
else if (element.total) text = `总分 ${element.total} 分以上` else if (element.total) text = `总分 ${element.total} 分以上`
return text ? { return text ? {
name: element.name_zh, name: element.name_zh,

6
pages/projectDetails/projectDetails.less
View File

@ -500,7 +500,7 @@ navigator {
.left { .left {
display: flex; display: flex;
flex-direction: column; // flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -525,12 +525,14 @@ navigator {
font-weight: 900; font-weight: 900;
font-size: 30rpx; font-size: 30rpx;
color: #000000; color: #000000;
margin-bottom: 12rpx; // margin-bottom: 12rpx;
} }
.text { .text {
font-size: 24rpx; font-size: 24rpx;
color: #555555; color: #555555;
margin-right: 20rpx;
} }
} }

24
pages/projectDetails/projectDetails.wxml
View File

@ -139,10 +139,10 @@
<view class="tuition block"> <view class="tuition block">
<view class="left flex1"> <view class="left flex1">
<view class="unit">{{ info.tuition_currency || 'HK$' }}</view> <view class="unit">{{ info.tuition_currency || 'HK$' }}</view>
<view class="number">{{ info.tuition_fee_text || '待确认' }}</view>
<view class="text">总学费</view> <view class="text">总学费</view>
<view class="number">{{ info.tuition_fee_text || '待确认' }}</view>
</view> </view>
<view class="right"> <!-- <view class="right">
<view class="item flexacenter"> <view class="item flexacenter">
<view class="key">每学分学费</view> <view class="key">每学分学费</view>
<view class="value">{{ info.tuition_fee_per_credit_text || '-' }}</view> <view class="value">{{ info.tuition_fee_per_credit_text || '-' }}</view>
@ -155,7 +155,7 @@
<view class="key">入学保证金</view> <view class="key">入学保证金</view>
<view class="value">{{ info.admission_deposit_text || '-' }}</view> <view class="value">{{ info.admission_deposit_text || '-' }}</view>
</view> </view>
</view> </view> -->
</view> </view>
<!-- 语言和奖金 --> <!-- 语言和奖金 -->
@ -277,15 +277,15 @@
<template is="item-header" data="{{ text: '最低入学要求' }}"></template> <template is="item-header" data="{{ text: '最低入学要求' }}"></template>
<view class="demand block"> <view class="demand block">
<view class="text">{{ info.entrance_requirements || '-' }}</view> <view class="text">{{ info.entrance_requirements || '-' }}</view>
<block wx:if="{{ info.language_proficiency_scores }}"> <block wx:if="{{ info.scoresList.length != 0 }}">
<view class="title">英语能力要求</view> <view class="title">英语能力要求</view>
<view class="hint">满足以下其中一项即可</view> <view class="hint">满足以下其中一项即可</view>
<view class="list"> <view class="list">
<block wx:for="{{ info.language_proficiency_scores }}" wx:key="index"> <block wx:for="{{ info.scoresList }}" wx:key="index">
<view class="item" wx:if="{{ item.total }}"> <view class="item">
<image class="triangle" src="https://app.gter.net/image/miniApp/offer/triangle-red.svg" mode="widthFix"></image> <image class="triangle" src="https://app.gter.net/image/miniApp/offer/triangle-red.svg" mode="widthFix"></image>
<view class="name">{{ item.name_zh }}</view> <view class="name">{{ item.name }}</view>
<view class="value">总分 {{ item.total }} 分以上</view> <view class="value">{{ item.text }}</view>
</view> </view>
</block> </block>
</view> </view>
@ -304,10 +304,10 @@
<view class="tuition block"> <view class="tuition block">
<view class="left flex1"> <view class="left flex1">
<view class="unit">{{ info.tuition_currency || 'HK$' }}</view> <view class="unit">{{ info.tuition_currency || 'HK$' }}</view>
<view class="number">{{ info.tuition_fee_text || '待确认' }}</view>
<view class="text">总学费</view> <view class="text">总学费</view>
<view class="number">{{ info.tuition_fee_text || '待确认' }}</view>
</view> </view>
<view class="right"> <!-- <view class="right">
<view class="item flexacenter"> <view class="item flexacenter">
<view class="key">每学分学费</view> <view class="key">每学分学费</view>
<view class="value">{{ info.tuition_fee_per_credit_text || '-' }}</view> <view class="value">{{ info.tuition_fee_per_credit_text || '-' }}</view>
@ -320,7 +320,7 @@
<view class="key">入学保证金</view> <view class="key">入学保证金</view>
<view class="value">{{ info.admission_deposit_text || '-' }}</view> <view class="value">{{ info.admission_deposit_text || '-' }}</view>
</view> </view>
</view> </view> -->
</view> </view>
<block wx:if="{{ info.scholarships }}"> <block wx:if="{{ info.scholarships }}">
@ -485,7 +485,7 @@
<navigator class="consult-item" target="miniProgram" app-id="wxa9296b07391c2bc7" wx:for="{{ offerList }}" wx:key="index" path="/pages/victoryDetails/victoryDetails?id={{ item.id || item.uniqid }}" hover-class="none"> <navigator class="consult-item" target="miniProgram" app-id="wxa9296b07391c2bc7" wx:for="{{ offerList }}" wx:key="index" path="/pages/victoryDetails/victoryDetails?id={{ item.id || item.uniqid }}" hover-class="none">
<view class="school flexacenter"> <view class="school flexacenter">
<image class="img" src="{{ item.schoolimage }}" mode="widthFix"></image> <image class="img" src="{{ item.schoolimage }}" mode="widthFix"></image>
{{ item.schoolname }} <view class="flex1">{{ item.schoolname }}</view>
</view> </view>
<view class="info-item flexflex" wx:if="{{item.professional}}"> <view class="info-item flexflex" wx:if="{{item.professional}}">
<view class="info-major">专业</view> <view class="info-major">专业</view>

3
pages/projectDetails/projectDetails.wxss
View File

@ -414,7 +414,6 @@ navigator {
} }
.details-box .tuition .left { .details-box .tuition .left {
display: flex; display: flex;
flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
@ -438,11 +437,11 @@ navigator {
font-weight: 900; font-weight: 900;
font-size: 30rpx; font-size: 30rpx;
color: #000000; color: #000000;
margin-bottom: 12rpx;
} }
.details-box .tuition .left .text { .details-box .tuition .left .text {
font-size: 24rpx; font-size: 24rpx;
color: #555555; color: #555555;
margin-right: 20rpx;
} }
.details-box .tuition .right { .details-box .tuition .right {
width: 300rpx; width: 300rpx;

2
project.private.config.json
View File

@ -11,7 +11,7 @@
{ {
"name": "pages/projectDetails/projectDetails", "name": "pages/projectDetails/projectDetails",
"pathName": "pages/projectDetails/projectDetails", "pathName": "pages/projectDetails/projectDetails",
"query": "uniqid=IwdCOvZ08KUhkXtjXQ5vhAPHczKrcBN5pT_y_7MIdipV21AHwG_5tr-Khp8EdxCnmMHk8uHJtNw-knkCuWIyYTU~", "query": "uniqid=bOTzfqH5Ci8q",
"launchMode": "default", "launchMode": "default",
"scene": null "scene": null
} }