commit

src/main/resources/views/platform/zhgh/activity/family/apply/index.html

@@ -72,8 +72,7 @@ layout("/layouts/platform.html"){
                     <el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
                                placeholder="请选择活动状态" filterable>
                         <el-option :value="1" label="全部"></el-option>
-                        <el-option :value="4" label="即将开始"></el-option>
-                        <el-option :value="2" label="报名中"></el-option>
+                        <el-option :value="2" label="即将开始 & 报名中"></el-option>
                         <el-option :value="3" label="已结束"></el-option>
                     </el-select>
                 </search-item>
@@ -108,8 +107,13 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column label="操作" width="300">
                     <template v-slot="{row}">
-                        <el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
-                        <el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
+                        <template v-if="$moment().isBefore($moment(row.activitySignUpEndTime))">
+                            <el-button @click="onView(row)" size="mini" type="primary">查看介绍</el-button>
+                            <el-button @click="onOpen(row)" size="mini" type="primary">去报名</el-button>
+                        </template>
+                        <template v-if="$moment().isAfter($moment(row.activitySignUpEndTime))">
+                            <el-button size="mini" type="info">已结束</el-button>
+                        </template>
                     </template>
                 </el-table-column>
             </el-table>
@@ -160,7 +164,7 @@ layout("/layouts/platform.html"){
             return {
                 pageForm: {
                     year: this.$moment().format("YYYY"),
-                    activityType: 4
+                    activityType: 2
                 },
                 tableColumns: [
                     { label: "活动名称", prop: "activityName", width: 600},