Hooke / swx_weapp

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
b461123f 1 parent 4a7b912e

fix 活动结束和报名结束显示控制

Inline Side-by-side
Showing 3 changed files with 10 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-11-16 10:33:15 4 + * @LastEditTime: 2022-11-16 13:53:55
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,7 @@ ...@@ -17,7 +17,7 @@
17 </view> 17 </view>
18 </van-col> 18 </van-col>
19 <van-col span="19" offset="0"> 19 <van-col span="19" offset="0">
20 - <!-- <view v-if="isEnd == 1"> 20 + <view v-if="isEnd == 1">
21 <view class="activity-close"> 21 <view class="activity-close">
22 <view class="button">活动结束</view> 22 <view class="button">活动结束</view>
23 </view> 23 </view>
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
26 <view class="user-reg"> 26 <view class="user-reg">
27 <view class="button">报名结束</view> 27 <view class="button">报名结束</view>
28 </view> 28 </view>
29 - </view> --> 29 + </view>
30 - <view> 30 + <view v-else>
31 <view v-if="userType === 'volunteer'" class="user-not-reg"> 31 <view v-if="userType === 'volunteer'" class="user-not-reg">
32 <view class="button" @tap="goTo('volunteer')">义工报名</view> 32 <view class="button" @tap="goTo('volunteer')">义工报名</view>
33 <view class="button" @tap="goTo('join')">活动报名</view> 33 <view class="button" @tap="goTo('join')">活动报名</view>
......
1 <!-- 1 <!--
2 * @Date: 2022-09-30 09:53:14 2 * @Date: 2022-09-30 09:53:14
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-11-15 17:05:21 4 + * @LastEditTime: 2022-11-16 13:52:14
5 * @FilePath: /swx/src/pages/editInfo/index.vue 5 * @FilePath: /swx/src/pages/editInfo/index.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
63 </view> 63 </view>
64 <view v-if="role === 'player' && my_member_role === 'creator'" class="at-input" style="margin-right: 1rem;"> 64 <view v-if="role === 'player' && my_member_role === 'creator'" class="at-input" style="margin-right: 1rem;">
65 <view class="at-input__container"> 65 <view class="at-input__container">
66 - <label class="h5-label at-input__title at-input__title">记录人</label> 66 + <label class="h5-label at-input__title at-input__title">陪伴人</label>
67 - <input @tap="show_partner_popup=true" class="h5-input at-input__input" placeholder-class="placeholder" :value="user_partner.text" placeholder="请选择记录人" :disabled="true"/> 67 + <input @tap="show_partner_popup=true" class="h5-input at-input__input" placeholder-class="placeholder" :value="user_partner.text" placeholder="请选择陪伴人" :disabled="true"/>
68 <view style="margin-right: 0; margin-top: 0.5rem;"><van-icon @tap="show_partner_popup=true" :name="icon_sel" color="" /></view> 68 <view style="margin-right: 0; margin-top: 0.5rem;"><van-icon @tap="show_partner_popup=true" :name="icon_sel" color="" /></view>
69 </view> 69 </view>
70 </view> 70 </view>
......
1 <!-- 1 <!--
2 * @Date: 2022-09-19 14:11:06 2 * @Date: 2022-09-19 14:11:06
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2022-11-15 16:27:57 4 + * @LastEditTime: 2022-11-16 13:20:46
5 * @FilePath: /swx/src/pages/index/index.vue 5 * @FilePath: /swx/src/pages/index/index.vue
6 * @Description: 首页 6 * @Description: 首页
7 --> 7 -->
8 <template> 8 <template>
9 <view id="page-header"> 9 <view id="page-header">
10 - <view> 10 + <view v-if="carousel.length">
11 <swiper class='slide-box' indicatorColor='#94B294' indicatorActiveColor='#FFFFFF' current="current" 11 <swiper class='slide-box' indicatorColor='#94B294' indicatorActiveColor='#FFFFFF' current="current"
12 :duration="duration" :interval="interval" :circular="isCircular" :autoplay="isAutoplay" 12 :duration="duration" :interval="interval" :circular="isCircular" :autoplay="isAutoplay"
13 :indicatorDots="hasIndicatorDots"> 13 :indicatorDots="hasIndicatorDots">
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
16 </swiper-item> 16 </swiper-item>
17 </swiper> 17 </swiper>
18 </view> 18 </view>
19 + <view v-else><image :src="icon_no_join_recommend" class="slide-image" /></view>
19 <view style="padding: 1rem 1rem 0.5rem 1rem;"> 20 <view style="padding: 1rem 1rem 0.5rem 1rem;">
20 <text class="bg-gradient" style="font-size: 1.15rem;">推荐活动</text> 21 <text class="bg-gradient" style="font-size: 1.15rem;">推荐活动</text>
21 </view> 22 </view>
......