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 2025-01-07 19:04:58 +08:00
parent 44d6e5f4c0
commit 36d0fb024a
9 changed files with 108 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
component/admission-box/admission-box.js
View File

@ -40,18 +40,39 @@ Component({
*/
methods: {
getAdmissionsOfficer() {
util.wxget('/miniprogramApi/offer/home/admissionsOfficer').then(res => {
util.wxget('/api/project.other/admissionOfficerIn').then(res => {
if (res.code != 200) return
const data = res.data || []
const today = new Date()
today.setHours(0, 0, 0, 0)
// data[0]['date'] = "1733899465"
data.forEach(element => {
let list = []
for (var i in data) {
const item = data[i];
for (var ii in item) {
const ite = item[ii];
list.push(...ite)
}
}
let urls = []
console.log("list", list);
list.forEach(element => {
element.urls.forEach(ele => {
urls.push({
...ele,
logo: element.schoollogo
})
})
})
urls.sort((a, b) => b.rank - a.rank);
urls.forEach(element => {
let mold = null
let timestamp = ""
if (!element.date || (typeof element.date == 'string' && element.date.indexOf("答疑") >= 0)) mold = 3;
else {
const date = new Date(element.date * 1000);
const date = new Date(element.date);
if (!isNaN(date.getTime())) {
if (date >= today) mold = 1
else mold = 2
@ -64,10 +85,10 @@ Component({
})
this.setData({
urls: data,
urls,
})
this.setCountDown(0)
if (urls.length != 0) this.setCountDown(0)
})
},

34
pages/projectComparison/projectComparison.less
View File

@ -430,4 +430,38 @@ view {
.index-sidebar {
position: relative;
z-index: 99;
}
.QRcode {
.block {
background-color: rgba(251, 251, 251, 1);
padding: 30rpx 0;
}
.hint {
height: 70rpx;
}
.arrows {
width: 30rpx;
height: 12rpx;
margin: 10rpx;
margin-right: 40rpx;
margin-bottom: -13px;
margin-left: 18rpx;
}
.img {
width: 225rpx;
height: 225rpx;
background-color: rgba(255, 255, 255, 1);
border-radius: 15rpx;
box-shadow: 0 0 7.5rpx rgba(0, 0, 0, 0.152941176470588);
.icon {
width: 199.5rpx;
height: 199.5rpx;
}
}
}

11
pages/projectComparison/projectComparison.wxml
View File

@ -207,6 +207,17 @@
</view>
</view>
<view class="lump QRcode">
<view class="title">更多信息</view>
<view class="block flexcenter">
<image class="hint" mode="heightFix" src="https://app.gter.net/image/miniApp/offer/hint.png"></image>
<image class="arrows" mode="widthFix" src="https://app.gter.net/image/miniApp/offer/arrows-long-straight-black-hair.svg"></image>
<view class="img flexcenter">
<image class="icon" mode="widthFix" src="https://u.gter.net/assistantwxqrcode.png" show-menu-by-longpress="true"></image>
</view>
</view>
</view>
<view class="end flexcenter">- End -</view>
<view class="base flexcenter" wx:if="{{ !isquick }}">

26
pages/projectComparison/projectComparison.wxss
View File

@ -335,3 +335,29 @@ view {
position: relative;
z-index: 99;
}
.QRcode .block {
background-color: #fbfbfb;
padding: 30rpx 0;
}
.QRcode .hint {
height: 70rpx;
}
.QRcode .arrows {
width: 30rpx;
height: 12rpx;
margin: 10rpx;
margin-right: 40rpx;
margin-bottom: -13px;
margin-left: 18rpx;
}
.QRcode .img {
width: 225rpx;
height: 225rpx;
background-color: #ffffff;
border-radius: 15rpx;
box-shadow: 0 0 7.5rpx rgba(0, 0, 0, 0.15294118);
}
.QRcode .img .icon {
width: 199.5rpx;
height: 199.5rpx;
}

3
pages/projectDetails/projectDetails.js
View File

@ -228,7 +228,8 @@ Page({
const month = date.getMonth() + 1
const year = date.getFullYear()
const semester = info.semester || {}
if (month > semester.month && year + 1 <= semester.year) info['semesterState'] = true
// if (month > semester.month && year + 1 <= semester.year) info['semesterState'] = true
if ((year < semester.year) || (year === semester.year && month < semester.month)) info['semesterState'] = true
let scores = info.language_proficiency_scores || []
const scoresList = scores

3
pages/projectLibrary/projectLibrary.js
View File

@ -326,7 +326,8 @@ Page({
list = (list).map(element => ({
...element,
random: app.randomString(6),
semesterState: month > element.semester.month && year + 1 <= element.semester.year,
// semesterState: month > element.semester.month && year + 1 <= element.semester.year,
semesterState: (year < element.semester.year) || (year === element.semester.year && month < element.semester.month),
}));
this.setData({

3
pages/projectSchoolHomepage/projectSchoolHomepage.js
View File

@ -153,7 +153,8 @@ Page({
list.forEach(element => {
const semester = element.semester || {}
if (month > semester.month && year + 1 <= semester.year) element['semesterState'] = true
// if (month > semester.month && year + 1 <= semester.year) element['semesterState'] = true
if ((year < semester.year) || (year === semester.year && month < semester.month)) element['semesterState'] = true
element['tuition_fee_text'] = common.formatNumberWithSpaces(element.tuition_fee)
element['random'] = app.randomString(6)
element['rankk'] = this.convertRankToRankText(element.rank)

3
pages/projectSubjectList/projectSubjectList.js
View File

@ -119,7 +119,8 @@ Page({
...element,
rankk: convertRankToRankText(element.rank),
random: app.randomString(6),
semesterState: month > element.semester.month && year + 1 <= element.semester.year,
// semesterState: month > element.semester.month && year + 1 <= element.semester.year,
semesterState: (year < element.semester.year) || (year === element.semester.year && month < element.semester.month)
}));
function convertRankToRankText(rank) {

3
pages/search/search.js
View File

@ -256,7 +256,8 @@ Page({
if (this.data.type == 'xg') {
element['tuition_fee_text'] = common.formatNumberWithSpaces(element.tuition_fee || '')
element['random'] = app.randomString(6)
element['semesterState'] = month > element.semester.month && year + 1 <= element.semester.year
// element['semesterState'] = month > element.semester.month && year + 1 <= element.semester.year
element['semesterState'] = (year < element.semester.year) || (year === element.semester.year && month < element.semester.month)
}
if (element.type == 'appmsgalbum') {