hookehuyr

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

<!--
* @Date: 2022-09-26 16:10:35
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-11-16 10:33:15
* @LastEditTime: 2022-11-16 13:53:55
* @FilePath: /swx/src/components/activity-bar.vue
* @Description: 活动详情页底部导航栏
-->
......@@ -17,7 +17,7 @@
</view>
</van-col>
<van-col span="19" offset="0">
<!-- <view v-if="isEnd == 1">
<view v-if="isEnd == 1">
<view class="activity-close">
<view class="button">活动结束</view>
</view>
......@@ -26,8 +26,8 @@
<view class="user-reg">
<view class="button">报名结束</view>
</view>
</view> -->
<view>
</view>
<view v-else>
<view v-if="userType === 'volunteer'" class="user-not-reg">
<view class="button" @tap="goTo('volunteer')">义工报名</view>
<view class="button" @tap="goTo('join')">活动报名</view>
......
<!--
* @Date: 2022-09-30 09:53:14
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-11-15 17:05:21
* @LastEditTime: 2022-11-16 13:52:14
* @FilePath: /swx/src/pages/editInfo/index.vue
* @Description: 文件描述
-->
......@@ -63,8 +63,8 @@
</view>
<view v-if="role === 'player' && my_member_role === 'creator'" class="at-input" style="margin-right: 1rem;">
<view class="at-input__container">
<label class="h5-label at-input__title at-input__title">记录人</label>
<input @tap="show_partner_popup=true" class="h5-input at-input__input" placeholder-class="placeholder" :value="user_partner.text" placeholder="请选择记录人" :disabled="true"/>
<label class="h5-label at-input__title at-input__title">陪伴人</label>
<input @tap="show_partner_popup=true" class="h5-input at-input__input" placeholder-class="placeholder" :value="user_partner.text" placeholder="请选择陪伴人" :disabled="true"/>
<view style="margin-right: 0; margin-top: 0.5rem;"><van-icon @tap="show_partner_popup=true" :name="icon_sel" color="" /></view>
</view>
</view>
......
<!--
* @Date: 2022-09-19 14:11:06
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2022-11-15 16:27:57
* @LastEditTime: 2022-11-16 13:20:46
* @FilePath: /swx/src/pages/index/index.vue
* @Description: 首页
-->
<template>
<view id="page-header">
<view>
<view v-if="carousel.length">
<swiper class='slide-box' indicatorColor='#94B294' indicatorActiveColor='#FFFFFF' current="current"
:duration="duration" :interval="interval" :circular="isCircular" :autoplay="isAutoplay"
:indicatorDots="hasIndicatorDots">
......@@ -16,6 +16,7 @@
</swiper-item>
</swiper>
</view>
<view v-else><image :src="icon_no_join_recommend" class="slide-image" /></view>
<view style="padding: 1rem 1rem 0.5rem 1rem;">
<text class="bg-gradient" style="font-size: 1.15rem;">推荐活动</text>
</view>
......