Hooke / swx_weapp

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
f160a6f9 1 parent d4e45d5d

fix

Inline Side-by-side
Showing 2 changed files with 15 additions and 9 deletions
1 <!-- 1 <!--
2 * @Date: 2022-09-26 16:10:35 2 * @Date: 2022-09-26 16:10:35
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-25 16:25:19 4 + * @LastEditTime: 2022-10-25 17:08:45
5 * @FilePath: /swx/src/components/activity-bar.vue 5 * @FilePath: /swx/src/components/activity-bar.vue
6 * @Description: 活动详情页底部导航栏 6 * @Description: 活动详情页底部导航栏
7 --> 7 -->
...@@ -17,7 +17,18 @@ ...@@ -17,7 +17,18 @@
17 </view> 17 </view>
18 </van-col> 18 </van-col>
19 <van-col span="19"> 19 <van-col span="19">
20 - <view v-if="!isEnd"> 20 + <!-- <view v-if="isEnd == 1">
21 + <view class="activity-close">
22 + <view class="button">活动结束</view>
23 + </view>
24 + </view>
25 + <view v-else-if="activityStatus === '报名结束'">
26 + <view class="user-reg">
27 + <view class="button">报名结束</view>
28 + </view>
29 + </view> -->
30 + <!-- TODO: 后期看一下控制是不是放在里边的页面去做 -->
31 + <view>
21 <view v-if="userType === 'volunteer'" class="user-not-reg"> 32 <view v-if="userType === 'volunteer'" class="user-not-reg">
22 <view class="button" @tap="goTo('volunteer')">义工报名</view> 33 <view class="button" @tap="goTo('volunteer')">义工报名</view>
23 <view class="button" @tap="goTo('join')">活动报名</view> 34 <view class="button" @tap="goTo('join')">活动报名</view>
...@@ -36,11 +47,6 @@ ...@@ -36,11 +47,6 @@
36 <view class="button" @tap="goTo('volunteer')">义工报名</view> 47 <view class="button" @tap="goTo('volunteer')">义工报名</view>
37 </view> 48 </view>
38 </view> 49 </view>
39 - <view v-else>
40 - <view class="activity-close">
41 - <view class="button" @tap="goTo('info')">活动结束</view>
42 - </view>
43 - </view>
44 </van-col> 50 </van-col>
45 </van-row> 51 </van-row>
46 </view> 52 </view>
...@@ -62,6 +68,7 @@ const props = defineProps({ ...@@ -62,6 +68,7 @@ const props = defineProps({
62 regId: String, 68 regId: String,
63 memberRole : String, 69 memberRole : String,
64 isEnd : String, 70 isEnd : String,
71 + activityStatus : String,
65 }) 72 })
66 73
67 const goTo = (type) => { 74 const goTo = (type) => {
......
1 <!-- 1 <!--
2 * @Date: 2022-09-20 15:39:37 2 * @Date: 2022-09-20 15:39:37
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-10-25 16:37:35 4 + * @LastEditTime: 2022-10-25 16:59:43
5 * @FilePath: /swx/src/components/activity-card.vue 5 * @FilePath: /swx/src/components/activity-card.vue
6 * @Description: 活动卡片组件 6 * @Description: 活动卡片组件
7 --> 7 -->
...@@ -90,7 +90,6 @@ const formatStatus = (item) => { ...@@ -90,7 +90,6 @@ const formatStatus = (item) => {
90 } else if (dayjs(item.activity_time).isBefore(dayjs(item.server_time))) { 90 } else if (dayjs(item.activity_time).isBefore(dayjs(item.server_time))) {
91 return '活动进行中'; 91 return '活动进行中';
92 } 92 }
93 - return 'mo'
94 } 93 }
95 94
96 const goTo = (id, status) => { 95 const goTo = (id, status) => {
......