| @@ -2,6 +2,7 @@ | |||||
| "pages": [ | "pages": [ | ||||
| "pages/index/index", | "pages/index/index", | ||||
| "pages/cartest/cartest", | "pages/cartest/cartest", | ||||
| "pages/actdetail/actdetail", | |||||
| "pages/bannerdetail/index", | "pages/bannerdetail/index", | ||||
| "pages/getuserinfo/index", | "pages/getuserinfo/index", | ||||
| "pages/phoneinput/phoneinput", | "pages/phoneinput/phoneinput", | ||||
| @@ -6,7 +6,6 @@ | |||||
| padding: 30rpx; | padding: 30rpx; | ||||
| position: relative; | position: relative; | ||||
| height: 184rpx; | height: 184rpx; | ||||
| border-bottom: 1rpx solid #eee; | |||||
| } | } | ||||
| .coupons-border { | .coupons-border { | ||||
| @@ -0,0 +1,70 @@ | |||||
| // pages/actdetail/actdetail.js | |||||
| Page({ | |||||
| /** | |||||
| * 页面的初始数据 | |||||
| */ | |||||
| data: { | |||||
| detail:'' | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面加载 | |||||
| */ | |||||
| onLoad: function (options) { | |||||
| console.log(options) | |||||
| let that = this; | |||||
| that.setData({ | |||||
| detail:options.detail | |||||
| }) | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面初次渲染完成 | |||||
| */ | |||||
| onReady: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面显示 | |||||
| */ | |||||
| onShow: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面隐藏 | |||||
| */ | |||||
| onHide: function () { | |||||
| }, | |||||
| /** | |||||
| * 生命周期函数--监听页面卸载 | |||||
| */ | |||||
| onUnload: function () { | |||||
| }, | |||||
| /** | |||||
| * 页面相关事件处理函数--监听用户下拉动作 | |||||
| */ | |||||
| onPullDownRefresh: function () { | |||||
| }, | |||||
| /** | |||||
| * 页面上拉触底事件的处理函数 | |||||
| */ | |||||
| onReachBottom: function () { | |||||
| }, | |||||
| /** | |||||
| * 用户点击右上角分享 | |||||
| */ | |||||
| onShareAppMessage: function () { | |||||
| } | |||||
| }) | |||||
| @@ -0,0 +1,3 @@ | |||||
| { | |||||
| "navigationBarTitleText": "活动详情" | |||||
| } | |||||
| @@ -0,0 +1,3 @@ | |||||
| <view> | |||||
| {{detail}} | |||||
| </view> | |||||
| @@ -24,7 +24,14 @@ Page({ | |||||
| that.setData({ | that.setData({ | ||||
| data: res.data | data: res.data | ||||
| }); | }); | ||||
| console.log(that.data.data) | |||||
| console.log(that.data.data); | |||||
| }); | }); | ||||
| }, | |||||
| gotoactdetail:function(){ | |||||
| let that = this; | |||||
| console.log("99999"); | |||||
| wx.navigateTo({ | |||||
| url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`, | |||||
| }) | |||||
| } | } | ||||
| }); | }); | ||||
| @@ -3,12 +3,12 @@ | |||||
| <view class="coupons-body"> | <view class="coupons-body"> | ||||
| <view class='banner'> | <view class='banner'> | ||||
| <image src='{{data.coverImg}}' mode="widthFix"></image> | <image src='{{data.coverImg}}' mode="widthFix"></image> | ||||
| <text bindtap='gotoactdetail'>活动详情</text> | |||||
| </view> | </view> | ||||
| <view class='coupons_info'> | <view class='coupons_info'> | ||||
| <view> | <view> | ||||
| <text>{{data.title}}</text> | <text>{{data.title}}</text> | ||||
| <text>{{data.subTitle}}</text> | <text>{{data.subTitle}}</text> | ||||
| <!-- <text>剩余时间:<text>{{day}}天</text><text>{{hour}}小时</text><text>{{minute}}分钟</text></text> --> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -23,7 +23,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> --> | </view> --> | ||||
| <view class='notes'> | |||||
| <view class='notes' style='display:none;'> | |||||
| <view> | <view> | ||||
| <text>活动详情</text> | <text>活动详情</text> | ||||
| </view> | </view> | ||||
| @@ -36,36 +36,38 @@ | |||||
| <button bindtap='orderFunc' class='buy'>立即购买</button> | <button bindtap='orderFunc' class='buy'>立即购买</button> | ||||
| </view> --> | </view> --> | ||||
| <!-- 优惠券 --> | |||||
| <navigator wx:for="{{data.coupons}}" wx:key="{{index}}" url="/pages/coupon/detail/index?couponChannelId={{item.id}}&couponId={{item.couponId}}"> | |||||
| <!-- 首页优惠券列表页面 --> | |||||
| <view class="coupons1"> | |||||
| <view class="coupons1-img"> | |||||
| <image src="{{item.coverImg}}"></image> | |||||
| </view> | |||||
| <view class="coupons1-info"> | |||||
| <view class="coupons1-info-name tit">{{item.title}}</view> | |||||
| <view class="coupons1-info-name subtitle">{{item.subTitle}}</view> | |||||
| <view class="coupons1-info-price-p"> | |||||
| <text class="i">¥</text>{{item.salePriceStr}} | |||||
| <view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> | |||||
| 满¥{{item.usePriceStr}}可用 | |||||
| </view> | |||||
| <view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | |||||
| 仅限本店使用 | |||||
| <view class='contain'> | |||||
| <!-- 优惠券 --> | |||||
| <navigator wx:for="{{data.coupons}}" wx:key="{{index}}" url="/pages/coupon/detail/index?couponChannelId={{item.id}}&couponId={{item.couponId}}"> | |||||
| <!-- 首页优惠券列表页面 --> | |||||
| <view class="coupons1"> | |||||
| <view class="coupons1-img"> | |||||
| <image src="{{item.coverImg}}"></image> | |||||
| </view> | |||||
| <view class="coupons1-info"> | |||||
| <view class="coupons1-info-name tit">{{item.title}}</view> | |||||
| <view class="coupons1-info-name subtitle">{{item.subTitle}}</view> | |||||
| <view class="coupons1-info-price-p"> | |||||
| <text class="i">¥</text>{{item.salePriceStr}} | |||||
| <view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> | |||||
| 满¥{{item.usePriceStr}}可用 | |||||
| </view> | |||||
| <view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | |||||
| 仅限本店使用 | |||||
| </view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | |||||
| <view class="coupons1-btn"> | |||||
| <!-- 优惠券价格 --> | |||||
| <view class="coupons1-info-price"> | |||||
| <view class="coupons1-info-name subtitle sy">剩余: {{item.remainInventory}}</view> | |||||
| <!-- <text class="coupons-info-price-o"><text class='i'>¥</text>{{item.priceStr}}</text> --> | |||||
| <view class="coupons1-btn"> | |||||
| <!-- 优惠券价格 --> | |||||
| <i-button class="buy" wx:if="{{item.salePriceStr==0}}" data-date='{{data}}'>免费领</i-button> | |||||
| <i-button class="buy" wx:elif="{{item.salePriceStr!=0}}" data-date='{{data}}'>马上购</i-button> | |||||
| <view class="coupons1-info-price"> | |||||
| <view class="coupons1-info-name subtitle sy">剩余{{item.remainInventory}}</view> | |||||
| <!-- <text class="coupons-info-price-o"><text class='i'>¥</text>{{item.priceStr}}</text> --> | |||||
| </view> | |||||
| </view> | </view> | ||||
| <i-button class="buy" wx:if="{{item.salePriceStr==0}}" data-date='{{data}}'>领取</i-button> | |||||
| <i-button class="buy" wx:elif="{{item.salePriceStr!=0}}" data-date='{{data}}'>购买</i-button> | |||||
| <!-- <view class="coupons1-border"></view> --> | |||||
| </view> | </view> | ||||
| <view class="coupons1-border"></view> | |||||
| </view> | |||||
| </navigator> | |||||
| </navigator> | |||||
| </view> | |||||
| </view> | </view> | ||||
| @@ -1,10 +1,13 @@ | |||||
| @import "../../app.wxss"; | @import "../../app.wxss"; | ||||
| page { | |||||
| background: #f5f5f5; | |||||
| } | |||||
| .coupons { | .coupons { | ||||
| width: 100%; | width: 100%; | ||||
| background: #f6f6f6; | |||||
| background: #fff; | |||||
| position: relative; | position: relative; | ||||
| overflow: hidden; | |||||
| } | } | ||||
| .coupons-body { | .coupons-body { | ||||
| @@ -13,7 +16,10 @@ | |||||
| } | } | ||||
| .banner { | .banner { | ||||
| width: 100%; | |||||
| position: relative; | |||||
| width: 750rpx; | |||||
| height: 280rpx; | |||||
| overflow: hidden; | |||||
| } | } | ||||
| .banner image { | .banner image { | ||||
| @@ -21,6 +27,25 @@ | |||||
| display: block; | display: block; | ||||
| } | } | ||||
| .banner text { | |||||
| position: absolute; | |||||
| right: 0; | |||||
| top: 0; | |||||
| bottom: 0; | |||||
| margin: auto; | |||||
| width: 122rpx; | |||||
| height: 48rpx; | |||||
| line-height: 48rpx; | |||||
| 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; | |||||
| } | |||||
| .coupons_info { | .coupons_info { | ||||
| width: 92%; | width: 92%; | ||||
| height: 120rpx; | height: 120rpx; | ||||
| @@ -77,6 +102,17 @@ | |||||
| padding-top: 4rpx; | padding-top: 4rpx; | ||||
| } | } | ||||
| navigator { | |||||
| display: block; | |||||
| padding: 0 24rpx 0; | |||||
| margin-bottom: 24rpx; | |||||
| } | |||||
| .contain { | |||||
| background: #f5f5f5; | |||||
| padding-top: 24rpx; | |||||
| } | |||||
| .posi { | .posi { | ||||
| width: 92%; | width: 92%; | ||||
| display: flex; | display: flex; | ||||
| @@ -162,7 +198,7 @@ | |||||
| height: auto; | height: auto; | ||||
| padding: 0 4% 4%; | padding: 0 4% 4%; | ||||
| background: #fff; | background: #fff; | ||||
| border-bottom: 1rpx solid #f5f5f5; | |||||
| /* border-bottom: 1rpx solid #f5f5f5; */ | |||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| } | } | ||||
| @@ -204,7 +240,7 @@ | |||||
| font-size: 28rpx; | font-size: 28rpx; | ||||
| line-height: 50rpx; | line-height: 50rpx; | ||||
| text-align: center; | text-align: center; | ||||
| border-radius: 6rpx; | |||||
| border-radius: 50rpx; | |||||
| } | } | ||||
| .coupons1-btn-gm { | .coupons1-btn-gm { | ||||
| @@ -224,30 +260,32 @@ | |||||
| .coupons1 { | .coupons1 { | ||||
| flex-direction: row; | flex-direction: row; | ||||
| display: flex; | display: flex; | ||||
| padding: 30rpx; | |||||
| padding: 24rpx; | |||||
| position: relative; | position: relative; | ||||
| height: 184rpx; | |||||
| border: 1px solid #eee; | |||||
| height: 152rpx; | |||||
| background: #fff; | |||||
| border-radius: 16rpx; | |||||
| box-shadow: 0 5px 15px 0 rgba(0, 0, 0, 0.3); | |||||
| } | } | ||||
| .coupons1-border { | |||||
| /* .coupons1-border { | |||||
| height: 1rpx; | height: 1rpx; | ||||
| /* width: 100%; */ | |||||
| left: 30rpx; | left: 30rpx; | ||||
| right: 30rpx; | right: 30rpx; | ||||
| background: #f5f5f5; | background: #f5f5f5; | ||||
| position: absolute; | position: absolute; | ||||
| bottom: 0; | bottom: 0; | ||||
| } | |||||
| } */ | |||||
| .coupons1-img { | .coupons1-img { | ||||
| width: 248rpx; | |||||
| height: 184rpx; | |||||
| width: 160rpx; | |||||
| height: 160rpx; | |||||
| overflow: hidden; | overflow: hidden; | ||||
| border-radius: 10rpx; | border-radius: 10rpx; | ||||
| } | } | ||||
| .coupons1-img image { | .coupons1-img image { | ||||
| display: block; | |||||
| width: 100%; | width: 100%; | ||||
| height: 100%; | height: 100%; | ||||
| } | } | ||||
| @@ -263,10 +301,6 @@ | |||||
| line-height: 38rpx; | line-height: 38rpx; | ||||
| } | } | ||||
| .coupons1-info-price { | |||||
| padding: 32rpx 0 0; | |||||
| } | |||||
| .i { | .i { | ||||
| font-size: 20rpx; | font-size: 20rpx; | ||||
| font-style: normal; | font-style: normal; | ||||
| @@ -280,7 +314,9 @@ | |||||
| } | } | ||||
| .tit { | .tit { | ||||
| margin-top: 32rpx; | |||||
| font-size: 28rpx; | |||||
| color: #000; | |||||
| letter-spacing: 0; | |||||
| } | } | ||||
| .coupons1-info-price-o { | .coupons1-info-price-o { | ||||
| @@ -311,7 +347,7 @@ | |||||
| .coupons1-btn { | .coupons1-btn { | ||||
| position: absolute; | position: absolute; | ||||
| width: 120rpx; | width: 120rpx; | ||||
| top: 40rpx; | |||||
| top: 61rpx; | |||||
| right: 30rpx; | right: 30rpx; | ||||
| } | } | ||||
| @@ -330,15 +366,16 @@ | |||||
| } | } | ||||
| .subtitle { | .subtitle { | ||||
| font-size: 22rpx; | |||||
| color: #333; | |||||
| font-size: 24rpx; | |||||
| font-weight: 100; | font-weight: 100; | ||||
| text-align: left; | text-align: left; | ||||
| overflow: hidden; | overflow: hidden; | ||||
| white-space: nowrap; | white-space: nowrap; | ||||
| text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
| width: 300rpx; | width: 300rpx; | ||||
| height: 40rpx; | |||||
| height: 33rpx; | |||||
| color: #919191; | |||||
| letter-spacing: 0; | |||||
| } | } | ||||
| .coupons1-info-manjian { | .coupons1-info-manjian { | ||||
| @@ -370,7 +407,7 @@ | |||||
| .sy { | .sy { | ||||
| display: block; | display: block; | ||||
| text-align: center; | text-align: center; | ||||
| width: 120rpx!important; | |||||
| width: 120rpx !important; | |||||
| } | } | ||||
| .usermotto { | .usermotto { | ||||
| @@ -139,6 +139,7 @@ | |||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #b8b8b8; | color: #b8b8b8; | ||||
| padding-top: 10rpx; | padding-top: 10rpx; | ||||
| width:450rpx; | |||||
| } | } | ||||
| .notes { | .notes { | ||||
| @@ -3,5 +3,5 @@ | |||||
| "i-tab": "../../../dist/tab/index", | "i-tab": "../../../dist/tab/index", | ||||
| "i-tabs": "../../../dist/tabs/index" | "i-tabs": "../../../dist/tabs/index" | ||||
| }, | }, | ||||
| "navigationBarTitleText": "我的优惠劵" | |||||
| "navigationBarTitleText": "停车券" | |||||
| } | } | ||||