| @@ -16,7 +16,7 @@ Page({ | |||||
| addUrl: imgurl.add.url, | addUrl: imgurl.add.url, | ||||
| tingcheHr: imgurl.tingcheHr.url, | tingcheHr: imgurl.tingcheHr.url, | ||||
| cheUrl: imgurl.che.url, | cheUrl: imgurl.che.url, | ||||
| ruleUrl: imgurl.rule.url, | |||||
| jiaofei: imgurl.jiaofei.url, | |||||
| wentiHr: imgurl.wentiHr.url, | wentiHr: imgurl.wentiHr.url, | ||||
| park: null, | park: null, | ||||
| carList: [], | carList: [], | ||||
| @@ -91,7 +91,7 @@ | |||||
| </view> | </view> | ||||
| <view class='textStyle' bindtap='gotodetail' data-rule='{{park.stopFee}}'> | <view class='textStyle' bindtap='gotodetail' data-rule='{{park.stopFee}}'> | ||||
| <image src='{{ruleUrl}}'></image> | |||||
| <image src='{{jiaofei}}'></image> | |||||
| 缴费规则 | 缴费规则 | ||||
| <view class='detail'> | <view class='detail'> | ||||
| <image src='{{jianUrl}}'></image> | <image src='{{jianUrl}}'></image> | ||||
| @@ -18,12 +18,14 @@ | |||||
| <text>活动说明</text> | <text>活动说明</text> | ||||
| <view class='detail'>{{data.detail}}</view> | <view class='detail'>{{data.detail}}</view> | ||||
| </view> | </view> | ||||
| <view class='member'>活动人数:{{data.personLimit}}人</view> | |||||
| <view class='integral' wx:if="{{data.useCredit}}"><text>消耗积分:</text><text class='integralNum'>{{data.credit}}</text> 积分</view> | |||||
| <view class='time'>报名开始时间:{{startTime}}</view> | |||||
| <view class='time'>报名结束时间:{{endTime}}</view> | |||||
| <view class='time' style="margin-top:40rpx;">活动开始时间:{{activityStartTime}}</view> | |||||
| <view class='time'>活动结束时间:{{activityEndTime}}</view> | |||||
| <view class='num'> | |||||
| <view class='member'>1、活动人数:{{data.personLimit}}人</view> | |||||
| <view class='integral' ><text>消耗积分:</text><text class='integralNum'>{{data.credit}}</text> 积分</view> | |||||
| </view> | |||||
| <view class='time'>2、报名有效日期</view> | |||||
| <view class='time' style='margin-left:36rpx' >{{startTime}}--{{endTime}}</view> | |||||
| <view class='time' >3、活动有效日期</view> | |||||
| <view class='time' style='margin-left:36rpx'>{{activityStartTime}}--{{activityEndTime}}</view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -599,7 +599,7 @@ button::after{ border: none; } | |||||
| background: #fff; | background: #fff; | ||||
| border-radius: 12rpx; | border-radius: 12rpx; | ||||
| width:94%; | width:94%; | ||||
| margin: 44rpx auto 0; | |||||
| /* margin: 44rpx auto 0; */ | |||||
| padding-bottom: 20rpx; | padding-bottom: 20rpx; | ||||
| padding:0 3%; | padding:0 3%; | ||||
| } | } | ||||
| @@ -627,22 +627,28 @@ button::after{ border: none; } | |||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| margin-top: 40rpx; | margin-top: 40rpx; | ||||
| } | } | ||||
| .num{ | |||||
| line-height: 50rpx; | |||||
| } | |||||
| .member{ | .member{ | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| padding-left: 2%; | |||||
| float: left; | |||||
| } | } | ||||
| .integral{ | .integral{ | ||||
| display: block; | display: block; | ||||
| margin-top: 20rpx; | |||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| float: left; | |||||
| margin-left: 20rpx; | |||||
| } | } | ||||
| .integral text{ | .integral text{ | ||||
| float: left; | float: left; | ||||
| } | } | ||||
| .integralNum{ | .integralNum{ | ||||
| color: #FD782D; | color: #FD782D; | ||||
| margin-left: 10rpx; | |||||
| margin: 0 5rpx 0 10rpx ; | |||||
| } | } | ||||
| .txt002 { | .txt002 { | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| @@ -1161,6 +1167,7 @@ scroll-view { | |||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| line-height: 50rpx; | line-height: 50rpx; | ||||
| color: #A6A6A6; | color: #A6A6A6; | ||||
| padding-left: 2%; | |||||
| } | } | ||||
| .ques{ | .ques{ | ||||
| display: block; | display: block; | ||||
| @@ -1177,4 +1184,5 @@ scroll-view { | |||||
| line-height: 40rpx; | line-height: 40rpx; | ||||
| margin-bottom: 20rpx; | margin-bottom: 20rpx; | ||||
| color: #666; | color: #666; | ||||
| padding-left: 2%; | |||||
| } | } | ||||
| @@ -115,8 +115,8 @@ Page({ | |||||
| list: tmpArr | list: tmpArr | ||||
| }) | }) | ||||
| for (let i = 0; i < that.data.list.length; i++) { | for (let i = 0; i < that.data.list.length; i++) { | ||||
| var activityStartTime1 = util.formatTime(that.data.list[i].activityStartTime, "yyyy.MM.dd" );//"yyyy-MM-dd hh:mm:ss" | |||||
| var activityEndTime1 = util.formatTime(that.data.list[i].activityEndTime, "yyyy.MM.dd");//"yyyy-MM-dd hh:mm:ss" | |||||
| var activityStartTime1 = util.formatTime(that.data.list[i].activityStartTime, "yyyy-MM-dd hh:mm:ss" ); | |||||
| var activityEndTime1 = util.formatTime(that.data.list[i].activityEndTime, "yyyy-MM-dd hh:mm:ss"); | |||||
| /** | /** | ||||
| * 修改list的endtime | * 修改list的endtime | ||||
| * 渲染到页面 | * 渲染到页面 | ||||
| @@ -8,8 +8,11 @@ | |||||
| <view class='logo'> | <view class='logo'> | ||||
| <image src='{{item.coverImg}}'></image> | <image src='{{item.coverImg}}'></image> | ||||
| </view> | </view> | ||||
| <view class='info'> | |||||
| <view class='bottom'> | |||||
| <view>{{item.title}}</view> | <view>{{item.title}}</view> | ||||
| <view>{{item.activityStartTime}}--{{item.activityEndTime}}</view> | |||||
| </view> | |||||
| <view class='info'> | |||||
| <image class="frImg" wx:if="{{item.status == 0&&key==0}}" src="{{orangeImg}}" mode="aspectFill" lazy-load="true"><text>报名中</text></image> | <image class="frImg" wx:if="{{item.status == 0&&key==0}}" src="{{orangeImg}}" mode="aspectFill" lazy-load="true"><text>报名中</text></image> | ||||
| <image class="frImg" wx:if="{{item.status == 1&&key==0}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>报名成功</text></image> | <image class="frImg" wx:if="{{item.status == 1&&key==0}}" src="{{blueImg}}" mode="aspectFill" lazy-load="true"><text>报名成功</text></image> | ||||
| <image class="frImg" wx:if="{{item.status == 2&&key==0}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>报名失败</text></image> | <image class="frImg" wx:if="{{item.status == 2&&key==0}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>报名失败</text></image> | ||||
| @@ -18,11 +21,10 @@ | |||||
| <!-- <text wx:if="{{item.status == 0&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名中</text> | <!-- <text wx:if="{{item.status == 0&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名中</text> | ||||
| <text wx:if="{{item.status == 1&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名成功</text> | <text wx:if="{{item.status == 1&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名成功</text> | ||||
| <text wx:if="{{item.status == 2&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名失败</text> --> | <text wx:if="{{item.status == 2&&key==0}}" style='font-size:30rpx;font-weight:bold;'>报名失败</text> --> | ||||
| <text>{{item.activityStartTime}}--{{item.activityEndTime}}</text> | |||||
| <!-- <text>活动结束日期:{{item.activityEndTime}}</text> --> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- <view class='bottom'></view> --> | |||||
| </view> | </view> | ||||
| <view class="dingdan" wx:if="{{list.length==0}}"> | <view class="dingdan" wx:if="{{list.length==0}}"> | ||||
| <image src="{{noCoupon}}" mode="widthFix"></image> | <image src="{{noCoupon}}" mode="widthFix"></image> | ||||
| @@ -28,6 +28,13 @@ | |||||
| border-radius: 16rpx; | border-radius: 16rpx; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| } | } | ||||
| .bottom{ | |||||
| background: #FFF; | |||||
| /* display: flex; | |||||
| justify-content: space-between; */ | |||||
| padding: 10rpx 10rpx; | |||||
| text-align: center; | |||||
| } | |||||
| .sendImg{ | .sendImg{ | ||||
| position: absolute; | position: absolute; | ||||
| width: 100rpx; | width: 100rpx; | ||||
| @@ -50,19 +57,13 @@ | |||||
| .section{ | .section{ | ||||
| margin-bottom: 25rpx; | margin-bottom: 25rpx; | ||||
| } | } | ||||
| .info view:nth-child(1) { | |||||
| font-size: 32rpx; | |||||
| margin-top: 40rpx; | |||||
| justify-content: space-between; | |||||
| padding: 0 0 0 4%; | |||||
| /* font-weight: 600; */ | |||||
| .bottom view:nth-child(1) { | |||||
| font-size: 30rpx; | |||||
| color: #3C3C3C; | |||||
| } | } | ||||
| .info text,view{ | |||||
| .bottom view:nth-child(2){ | |||||
| font-size: 26rpx; | font-size: 26rpx; | ||||
| text-align: center; | |||||
| display: block; | |||||
| color: #fff; | |||||
| /* font-weight: 600; */ | |||||
| color: #FD832D; | |||||
| } | } | ||||
| .info { | .info { | ||||
| width: 100%; | width: 100%; | ||||
| @@ -74,7 +75,7 @@ | |||||
| margin: auto; | margin: auto; | ||||
| text-align: center; | text-align: center; | ||||
| color: #fff; | color: #fff; | ||||
| background: rgba(0, 0, 0, 0.5) | |||||
| /* background: rgba(0, 0, 0, 0.5) */ | |||||
| } | } | ||||
| .sub { | .sub { | ||||
| @@ -697,5 +697,9 @@ module.exports = { | |||||
| 'url': baseUrl + "wentiHr.png", | 'url': baseUrl + "wentiHr.png", | ||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| 'jiaofei': { | |||||
| 'url': baseUrl + "jiaofei.png", | |||||
| 'name': '' | |||||
| }, | |||||
| } | } | ||||