c-zhangr1/zhgh_njnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2025-09-16 17:45:51 +08:00
parent 6235144a74 691d948835
commit 7b05c70b14
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/sys/home/activity.js
+6 -1
View File
@@ -22,9 +22,14 @@ const activity = {
</el-tag>
<el-tag class="act-item-tag" type="success" size="mini"
v-else-if="$moment().unix() < $moment(item.endDate).unix()">
v-else-if="$moment().unix() > $moment(item.startDate).unix() && $moment().unix() < $moment(item.endDate).unix()">
进行中
</el-tag>
<el-tag class="act-item-tag" type="success" size="mini"
v-else-if="$moment().unix() < $moment(item.startDate).unix()">
即将开始
</el-tag>
</div>
<div style="flex: 1;height: 90px;display: flex;flex-direction: column;justify-content: space-between;">
<div style="color: #111">
src/main/resources/views/platform/zhghh5/sys/home/home.js
+5 -1
View File
@@ -38,9 +38,13 @@ const home = {
已结束
</van-tag>
<van-tag class="act-item-wrapper-tag" type="success" v-else-if="$moment().unix() < $moment(item.endDate).unix()">
<van-tag class="act-item-wrapper-tag" type="success" v-else-if="$moment().unix() > $moment(item.startDate).unix() && $moment().unix() < $moment(item.endDate).unix()">
进行中
</van-tag>
<van-tag class="act-item-wrapper-tag" type="primary" v-else-if="$moment().unix() < $moment(item.startDate).unix()">
即将开始
</van-tag>
<div class="act-item-cover">
<van-image v-if="item.cover" width="120" height="84" :src="item.cover"></van-image>
src/main/resources/views/platform/zhghh5/sys/home/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform_h5.html"){
<div id="app" v-cloak>
<div>
<div>
<div style="height: calc(100vh - 50px); overflow-y: auto">
<home v-if="homeTabbarActive === 'home'" @module-click="moduleClick"></home>
<work v-if="homeTabbarActive === 'work'"></work>
<mine v-if="homeTabbarActive === 'mine'"></mine>