diff --git a/component/admission-box/admission-box.js b/component/admission-box/admission-box.js index c21b3c0..c71adbb 100644 --- a/component/admission-box/admission-box.js +++ b/component/admission-box/admission-box.js @@ -156,6 +156,12 @@ Component({ const newTime = new Date().getTime() const dateTime = new Date(date).getTime() let timer = dateTime - newTime + if (timer <= 0) { + this.setData({ + countDownState: false + }) + return + } const days = Math.floor(timer / (24 * 60 * 60 * 1000)); const hours = Math.floor((timer % (24 * 60 * 60 * 1000)) / (60 * 60 * 1000)); const minutes = Math.floor((timer % (60 * 60 * 1000)) / (60 * 1000)); diff --git a/pages/projectComparison/projectComparison.wxml b/pages/projectComparison/projectComparison.wxml index 14557ff..b09320b 100644 --- a/pages/projectComparison/projectComparison.wxml +++ b/pages/projectComparison/projectComparison.wxml @@ -36,14 +36,14 @@ - + 学科领域 diff --git a/pages/projectLibrary/projectLibrary.less b/pages/projectLibrary/projectLibrary.less index 9e4ec22..c3a9385 100644 --- a/pages/projectLibrary/projectLibrary.less +++ b/pages/projectLibrary/projectLibrary.less @@ -366,6 +366,7 @@ view { border-radius: 172.5rpx; font-size: 24rpx; color: #026277; + font-weight: 650; } } } diff --git a/pages/projectLibrary/projectLibrary.wxss b/pages/projectLibrary/projectLibrary.wxss index 7905b1e..7db6aee 100644 --- a/pages/projectLibrary/projectLibrary.wxss +++ b/pages/projectLibrary/projectLibrary.wxss @@ -300,6 +300,7 @@ view { border-radius: 172.5rpx; font-size: 24rpx; color: #026277; + font-weight: 650; } .admission { margin: 0 22.5rpx 30rpx;