diff --git a/component/admission-box/admission-box.js b/component/admission-box/admission-box.js
index 01b6756..af8d06d 100644
--- a/component/admission-box/admission-box.js
+++ b/component/admission-box/admission-box.js
@@ -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)
})
},
diff --git a/pages/projectComparison/projectComparison.less b/pages/projectComparison/projectComparison.less
index c70e6d3..1116ee5 100644
--- a/pages/projectComparison/projectComparison.less
+++ b/pages/projectComparison/projectComparison.less
@@ -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;
+ }
+ }
}
\ No newline at end of file
diff --git a/pages/projectComparison/projectComparison.wxml b/pages/projectComparison/projectComparison.wxml
index 46ea7e1..14557ff 100644
--- a/pages/projectComparison/projectComparison.wxml
+++ b/pages/projectComparison/projectComparison.wxml
@@ -207,6 +207,17 @@
+
+ 更多信息
+
+
+
+
+
+
+
+
+
- End -
diff --git a/pages/projectComparison/projectComparison.wxss b/pages/projectComparison/projectComparison.wxss
index 0019abc..ac11ef0 100644
--- a/pages/projectComparison/projectComparison.wxss
+++ b/pages/projectComparison/projectComparison.wxss
@@ -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;
+}
diff --git a/pages/projectDetails/projectDetails.js b/pages/projectDetails/projectDetails.js
index 9f5f9c7..942d2d1 100644
--- a/pages/projectDetails/projectDetails.js
+++ b/pages/projectDetails/projectDetails.js
@@ -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
diff --git a/pages/projectLibrary/projectLibrary.js b/pages/projectLibrary/projectLibrary.js
index 67764f3..22473ef 100644
--- a/pages/projectLibrary/projectLibrary.js
+++ b/pages/projectLibrary/projectLibrary.js
@@ -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({
diff --git a/pages/projectSchoolHomepage/projectSchoolHomepage.js b/pages/projectSchoolHomepage/projectSchoolHomepage.js
index 58669ff..59b0c0f 100644
--- a/pages/projectSchoolHomepage/projectSchoolHomepage.js
+++ b/pages/projectSchoolHomepage/projectSchoolHomepage.js
@@ -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)
diff --git a/pages/projectSubjectList/projectSubjectList.js b/pages/projectSubjectList/projectSubjectList.js
index cc1a511..82e004e 100644
--- a/pages/projectSubjectList/projectSubjectList.js
+++ b/pages/projectSubjectList/projectSubjectList.js
@@ -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) {
diff --git a/pages/search/search.js b/pages/search/search.js
index 1387983..9275f4b 100644
--- a/pages/search/search.js
+++ b/pages/search/search.js
@@ -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') {