commit

src/main/resources/views/platform/zhghh5/activity/culture/applyUser.html

@@ -8,8 +8,8 @@ layout("/layouts/platform_h5.html"){
     }
 
     .list-card-body {
-        width: calc(100% - 140px);
-        display: flex;
+       /* width: calc(100% - 140px);
+        display: flex;*/
         flex-direction: column;
         justify-content: space-between;
     }
@@ -35,6 +35,9 @@ layout("/layouts/platform_h5.html"){
         padding: 5px;
         border-radius: 5px;
     }
+    .list-card-img img{
+        width: 100%;
+    }
 </style>
 
 <div id="app" v-cloak>
@@ -44,6 +47,7 @@ layout("/layouts/platform_h5.html"){
             <year-van-dropdown-item :num="5" @change="doSearch" v-model="pageForm.year"></year-van-dropdown-item>
             <van-dropdown-item :options="stateList" @change="doSearch" v-model="pageForm.state"></van-dropdown-item>
             <van-dropdown-item :options="isEnrolledOptions" @change="doSearch" v-model="pageForm.isEnrolledText"></van-dropdown-item>
+            <van-dropdown-item :options="activityTypeOptions" @change="doSearch" v-model="pageForm.activity_type"></van-dropdown-item>
         </van-dropdown-menu>
     </van-sticky>
 
@@ -115,12 +119,13 @@ layout("/layouts/platform_h5.html"){
                 loading: false,
                 refreshing: false,
                 pageForm: {
-                    state: 2,
+                    state: 1,
                     isEnrolledText: 0,
                     year: new Date().getFullYear(),
                     pageNumber: 1,
                     pageSize: 5,
-                    totalCount: 0
+                    totalCount: 0,
+                    activity_type: 40001
                 },
                 yearList: [],
                 isEnrolledOptions: [
@@ -134,7 +139,12 @@ layout("/layouts/platform_h5.html"){
                 ],
                 subLoading: false,
                 viewShow: false,
-                viewData: {}
+                viewData: {},
+                activityTypeOptions: [
+                    { value: 40001, text: "校文化活动" },
+                    { value: 40002, text: "分工会文化活动" },
+                    { value: 40003, text: "协会文化活动" },
+                ]
             }
         },
         components: {

src/main/resources/views/platform/zhghh5/activity/culture/signUp.html

@@ -301,7 +301,6 @@ layout("/layouts/platform_h5.html"){
             <span>取消报名</span>
             <span style="font-size: 12px; margin-top: 5px">{{viewData.applyEndTime}}截止报名</span>
         </div>
-
         <div class="bottom-button" v-if="$moment(viewData.endTime).valueOf() < $moment().valueOf()">活动已结束</div>
     </div>
 </div>