| @@ -1,4 +1,3 @@ | |||
| <view> | |||
| <text>活动详情</text> | |||
| <text>{{detail}}</text> | |||
| </view> | |||
| @@ -2,13 +2,7 @@ view text{ | |||
| display: block; | |||
| } | |||
| view text:nth-of-type(1){ | |||
| font-size: 30rpx; | |||
| color: #000; | |||
| padding: 30rpx 0; | |||
| text-align: center; | |||
| } | |||
| view text:nth-of-type(2){ | |||
| padding: 0 30rpx; | |||
| padding: 20rpx 30rpx; | |||
| font-size: 28rpx; | |||
| line-height: 50rpx; | |||
| color: #999; | |||
| @@ -3,26 +3,17 @@ | |||
| <view class="coupons-body"> | |||
| <view class='banner'> | |||
| <image src='{{data.coverImg}}' mode="widthFix"></image> | |||
| <text bindtap='gotoactdetail'>活动详情</text> | |||
| </view> | |||
| <!-- <view class='coupons_info'> | |||
| <view> | |||
| <text>{{data.title}}</text> | |||
| <text>{{data.subTitle}}</text> | |||
| </view> | |||
| </view> --> | |||
| <!-- <view class='posi'> | |||
| <view class='posi_logo'> | |||
| <view> | |||
| <image src='{{data.merChantImgUrl}}'></image> | |||
| </view> | |||
| <view> | |||
| <text>{{data.merchantName}}</text> | |||
| <text>{{data.addr}}{{data.buildingName}}{{data.floorName}}</text> | |||
| </view> | |||
| <image class="orbg" src='./../../assets/img/orbg.png' mode="widthFix"></image> | |||
| <view class='act' bindtap='gotoactdetail'> | |||
| <text class='txt001'>{{data.title}}</text> | |||
| <text class='txt002'>{{data.subTitle}}</text> | |||
| <view class="proct"> | |||
| <text>活动说明</text> | |||
| <text>{{data.detail}}</text> | |||
| <image class="jian" src='../../assets/img/jian.png' mode="widthFix"></image> | |||
| </view> | |||
| </view> --> | |||
| </view> | |||
| <view class='notes' style='display:none;'> | |||
| <view> | |||
| <text>活动详情</text> | |||
| @@ -1,12 +1,11 @@ | |||
| @import "../../app.wxss"; | |||
| page { | |||
| background: #f5f5f5; | |||
| background: #fe5252; | |||
| } | |||
| .coupons { | |||
| width: 100%; | |||
| background: #fff; | |||
| position: relative; | |||
| } | |||
| @@ -27,6 +26,73 @@ page { | |||
| display: block; | |||
| } | |||
| .act { | |||
| position: relative; | |||
| z-index: 1000000000; | |||
| background: #fff; | |||
| border-radius: 12rpx; | |||
| width: 702rpx; | |||
| height: 212rpx; | |||
| margin: -46rpx auto 0; | |||
| } | |||
| .act text { | |||
| display: block; | |||
| padding-left: 4.8%; | |||
| } | |||
| .txt001 { | |||
| font-size: 34rpx; | |||
| color: #363636; | |||
| letter-spacing: 0; | |||
| text-align: left; | |||
| line-height: 48rpx; | |||
| padding-top: 3.2%; | |||
| } | |||
| .txt002 { | |||
| font-size: 24rpx; | |||
| color: #999; | |||
| letter-spacing: 0; | |||
| text-align: left; | |||
| line-height: 33rpx; | |||
| } | |||
| .proct { | |||
| position: relative; | |||
| height: 60rpx; | |||
| margin-top:20rpx; | |||
| } | |||
| .proct text:nth-of-type(1) { | |||
| font-size: 30rpx; | |||
| color: #ff4949; | |||
| letter-spacing: 0; | |||
| line-height: 32rpx; | |||
| display: inline-block; | |||
| width: 60rpx; | |||
| height: 64rpx; | |||
| padding-right:20rpx; | |||
| border-right: 2px solid #e5e5e5; | |||
| } | |||
| .proct text:nth-of-type(2) { | |||
| display: inline-block; | |||
| width: 498rpx; | |||
| height: 60rpx; | |||
| overflow: hidden; | |||
| white-space: nowrap; | |||
| text-overflow: ellipsis; | |||
| font-size: 22rpx; | |||
| color: #6f6f6f; | |||
| letter-spacing: 0; | |||
| } | |||
| .orbg { | |||
| position: absolute; | |||
| top: 256rpx; | |||
| z-index: 1000000; | |||
| } | |||
| .banner text { | |||
| position: absolute; | |||
| right: 0; | |||
| @@ -39,11 +105,11 @@ page { | |||
| opacity: 0.8; | |||
| background: #000; | |||
| font-size: 24rpx; | |||
| color: #FFFFFF; | |||
| letter-spacing: 0; | |||
| text-indent: .5em; | |||
| border-top-left-radius: 50rpx; | |||
| border-bottom-left-radius: 50rpx; | |||
| color: #fff; | |||
| letter-spacing: 0; | |||
| text-indent: 0.5em; | |||
| border-top-left-radius: 50rpx; | |||
| border-bottom-left-radius: 50rpx; | |||
| } | |||
| .coupons_info { | |||
| @@ -110,7 +176,6 @@ navigator { | |||
| } | |||
| .contain { | |||
| background: #f5f5f5; | |||
| padding-top: 24rpx; | |||
| } | |||
| @@ -385,6 +450,12 @@ navigator { | |||
| line-height: 34rpx; | |||
| display: inline-block; | |||
| } | |||
| .jian{ | |||
| width: 44rpx; | |||
| position: absolute; | |||
| bottom: 1.7%; | |||
| right: 3.5%; | |||
| } | |||
| /**上拉加载更多**/ | |||
| @@ -350,12 +350,12 @@ Page({ | |||
| fail: res => { | |||
| that.payOrderUpdate(that.data.orderId, payOrderId, 2); // 支付失败 | |||
| console.log(res); | |||
| wx.showToast({ | |||
| title: "支付失败", | |||
| image: "./../../../assets/img/fail.png", | |||
| duration: 2000, | |||
| mask: false | |||
| }); | |||
| // wx.showToast({ | |||
| // title: "支付失败", | |||
| // image: "./../../../assets/img/fail.png", | |||
| // duration: 2000, | |||
| // mask: false | |||
| // }); | |||
| return; | |||
| }, | |||
| complete: res => { | |||
| @@ -147,12 +147,12 @@ Page({ | |||
| fail: res => { | |||
| that.payOrderUpdate(that.data.orderId, payOrderId, 2); | |||
| console.log(res); | |||
| wx.showToast({ | |||
| title: "支付失败", | |||
| image: "./../../../assets/img/fail.png", | |||
| duration: 2000, | |||
| mask: false | |||
| }); | |||
| // wx.showToast({ | |||
| // title: "支付失败", | |||
| // image: "./../../../assets/img/fail.png", | |||
| // duration: 2000, | |||
| // mask: false | |||
| // }); | |||
| return; | |||
| }, | |||
| // complete: res => { | |||