commit

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

@@ -24,6 +24,11 @@ layout("/layouts/platform_h5.html"){
     .van-count-down {
         color: #fff;
     }
+    .item-header .van-tag {
+        font-size: 12px;
+        padding: 3px 6px;
+        border-radius: 6px;
+    }
 </style>
 
 <div id="app">
@@ -40,10 +45,25 @@ layout("/layouts/platform_h5.html"){
     <table-list api="/platform/family/apply/activityPageData"
                 :page_form.sync="pageForm"
                 ref="tableListRef"
-                title="activityName"
                 img="cover"
                 @ready="onReady"
     >
+        <template #header="{index,row}">
+            <div class="item-header">
+                <div class="item-title">{{ row.activityName }}</div>
+                <div>
+                    <van-tag type="primary" v-if="$moment().isBefore($moment(row.activitySignUpStartTime))">
+                        即将开始
+                    </van-tag>
+                    <van-tag type="success" v-if="$moment().isAfter($moment(row.activitySignUpStartTime)) && $moment().isBefore($moment(row.activitySignUpEndTime))">
+                        进行中
+                    </van-tag>
+                    <van-tag class="grey" v-if="$moment().isAfter($moment(row.activitySignUpEndTime))">
+                        已结束
+                    </van-tag>
+                </div>
+            </div>
+        </template>
         <template v-slot="{index,row}">
             <table-column label="面向对象">{{row.activityGroupName}}</table-column>
             <table-column label="报名时间">
@@ -54,14 +74,16 @@ layout("/layouts/platform_h5.html"){
             </table-column>
         </template>
         <template #actions="{index,row}">
-            <div class="action-btn" @click="onView(row)">
-                <i class="fa fa-eye"></i>
-                <span>查看介绍</span>
-            </div>
-            <div class="action-btn" @click="onApply(row)">
-                <i class="fa fa-edit"></i>
-                <span>去报名</span>
-            </div>
+            <template v-if="$moment().isBefore($moment(row.activitySignUpEndTime))">
+                <div class="action-btn" @click="onView(row)">
+                    <i class="fa fa-eye"></i>
+                    <span>查看介绍</span>
+                </div>
+                <div class="action-btn" @click="onApply(row)">
+                    <i class="fa fa-edit"></i>
+                    <span>去报名</span>
+                </div>
+            </template>
         </template>
     </table-list>
 
@@ -105,12 +127,11 @@ layout("/layouts/platform_h5.html"){
                     totalCount: 0,
                     searchKeyword: '',
                     year: new Date().getFullYear(),
-                    activityType: 4,
+                    activityType: 2,
                 },
                 typeOptions: [
                     {text: '全部', value: 1},
-                    {text: '即将开始', value: 4},
-                    {text: '报名中', value: 2},
+                    {text: '即将开始 & 报名中', value: 2},
                     {text: '已结束', value: 3},
                 ],
                 infoVisible: false,

src/main/resources/views/platform/zhghh5/club/apply/index.html

@@ -271,6 +271,7 @@ layout("/layouts/platform_h5.html"){
                     this.$set(this.formData, "sex", user.sex)
                     this.$set(this.formData, "birthday", user.birthday ? this.$moment(user.birthday).format('YYYY-MM-DD') : '')
                     this.$set(this.formData, "nation", user.nation)
+                    this.$set(this.formData, "mobile", user.mobile)
                     this.$set(this.formData, "political", user.political)
                     this.$set(this.formData, "education", user.education)
                     this.$set(this.formData, "technicalTitle", user.technicalTitle)