| @@ -9,7 +9,7 @@ Page({ | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| homeSelectedO: imgurl.homeSelectedO.url, | homeSelectedO: imgurl.homeSelectedO.url, | ||||
| isshowposter:false,//是否显示分享弹框 | isshowposter:false,//是否显示分享弹框 | ||||
| fenxiang: imgurl.fenxiang.url, | |||||
| fenxiang: imgurl.fenxiang1.url, | |||||
| fenxiangUrl: imgurl.fenxiang.url, | fenxiangUrl: imgurl.fenxiang.url, | ||||
| clockUrl: imgurl.clock.url, | clockUrl: imgurl.clock.url, | ||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| @@ -15,7 +15,7 @@ Page({ | |||||
| noCoupon: imgurl.noCoupon.url, | noCoupon: imgurl.noCoupon.url, | ||||
| poterbg: imgurl.poterbg.url, | poterbg: imgurl.poterbg.url, | ||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| fenxiang: imgurl.fenxiang.url, | |||||
| fenxiang: imgurl.fenxiang1.url, | |||||
| actUrl: imgurl.act.url, | actUrl: imgurl.act.url, | ||||
| wmhome: imgurl.wmhome.url, | wmhome: imgurl.wmhome.url, | ||||
| page: 1, | page: 1, | ||||
| @@ -62,7 +62,7 @@ page{ | |||||
| } | } | ||||
| .merchant-brand view:nth-child(1) { | .merchant-brand view:nth-child(1) { | ||||
| width: 98%; | |||||
| width: 88%; | |||||
| /* height: 700rpx; */ | /* height: 700rpx; */ | ||||
| display: flex; | display: flex; | ||||
| flex-direction: column; | flex-direction: column; | ||||
| @@ -27,8 +27,8 @@ | |||||
| <view class='subtitle'> | <view class='subtitle'> | ||||
| <text>{{item.subTitle}}</text> | <text>{{item.subTitle}}</text> | ||||
| </view> | </view> | ||||
| <view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">查看</view> | |||||
| <view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> | |||||
| <!-- <view hover-class='active' wx:if="{{item.couponOrderStatus==0}}" class="btns">查看</view> | |||||
| <view hover-class='active' wx:elif="{{item.couponOrderStatus==1||item.couponOrderStatus==2||item.couponOrderStatus==3}}" class="btns">查看</view> --> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- <image class="liness" src='{{linessUrl}}' mode="widthFix"></image> --> | <!-- <image class="liness" src='{{linessUrl}}' mode="widthFix"></image> --> | ||||
| @@ -9,7 +9,7 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} | |||||
| let configUrls = extConfig.attr.configUrl; | let configUrls = extConfig.attr.configUrl; | ||||
| Page({ | Page({ | ||||
| data: { | data: { | ||||
| fenxiang: imgurl.fenxiang.url, | |||||
| fenxiang: imgurl.fenxiang1.url, | |||||
| navigationBarHeight, | navigationBarHeight, | ||||
| data: {}, | data: {}, | ||||
| status: 1, | status: 1, | ||||
| @@ -11,7 +11,7 @@ Page({ | |||||
| */ | */ | ||||
| data: { | data: { | ||||
| navigationBarHeight, | navigationBarHeight, | ||||
| fenxiang: imgurl.fenxiang.url, | |||||
| fenxiang: imgurl.fenxiang1.url, | |||||
| homeSelectedO:imgurl.homeSelectedO.url, | homeSelectedO:imgurl.homeSelectedO.url, | ||||
| isshowposter:false,//是否显示分享弹框 | isshowposter:false,//是否显示分享弹框 | ||||
| teljpgUrl: imgurl.teljpg.url, | teljpgUrl: imgurl.teljpg.url, | ||||
| @@ -14,8 +14,8 @@ | |||||
| <view class='text'> | <view class='text'> | ||||
| <view class='remark'>{{data.subTitle}}</view> | <view class='remark'>{{data.subTitle}}</view> | ||||
| <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | <view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | ||||
| <image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享有礼</text> | |||||
| <image src='{{fenxiang}}' mode="widthFix"></image> | |||||
| <text class='gift'>分享</text> | |||||
| </view> | </view> | ||||
| <view class='des'> | <view class='des'> | ||||
| <view class='des-peoplenum'>「拼团价」{{data.pressLimitNum}}人拼团成功,单价仅需¥</view> | <view class='des-peoplenum'>「拼团价」{{data.pressLimitNum}}人拼团成功,单价仅需¥</view> | ||||
| @@ -31,9 +31,10 @@ | |||||
| <text class='timess' wx:if='{{limitCondition==1}}'>仅限新用户活动</text> | <text class='timess' wx:if='{{limitCondition==1}}'>仅限新用户活动</text> | ||||
| <text class='timess' wx:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text> | <text class='timess' wx:if='{{limitCondition==2&&(minLimit||minLimit==0)&&maxLimit}}'>({{minLimit}}-{{maxLimit}}成长值)</text> | ||||
| <text class='timess' wx:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text> | <text class='timess' wx:if='{{limitCondition==2&&minLimit&&!maxLimit}}'>(大于{{minLimit}}成长值)</text> | ||||
| <view class='right-text'>剩余{{data.remainInventory}}张</view> | |||||
| </view> | </view> | ||||
| <view class='status' wx:if="{{spellData!=null}}"> | <view class='status' wx:if="{{spellData!=null}}"> | ||||
| <view class='status01 st'> | |||||
| <view class='status01 st'> | |||||
| <image src='{{spellData.avatarUrl}}'></image> | <image src='{{spellData.avatarUrl}}'></image> | ||||
| </view> | </view> | ||||
| <view class='status02 st'>{{spellData.nickName}}的团还差<view class='r-p-num'>1人</view></view> | <view class='status02 st'>{{spellData.nickName}}的团还差<view class='r-p-num'>1人</view></view> | ||||
| @@ -367,7 +367,9 @@ button::after{ border: none; } | |||||
| background: #FFF; | background: #FFF; | ||||
| padding: 0 30rpx; | padding: 0 30rpx; | ||||
| } | } | ||||
| .right-text{ | |||||
| float: right; | |||||
| } | |||||
| .restNum { | .restNum { | ||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| color: #999; | color: #999; | ||||
| @@ -413,25 +415,23 @@ button::after{ border: none; } | |||||
| .fenxiang { | .fenxiang { | ||||
| position:absolute; | position:absolute; | ||||
| right:28rpx; | right:28rpx; | ||||
| top:-27rpx; | |||||
| top:-55rpx; | |||||
| width:108rpx; | width:108rpx; | ||||
| z-index:10; | z-index:10; | ||||
| display: flex; | |||||
| flex-direction: column; | |||||
| } | } | ||||
| .fenxiang image { | .fenxiang image { | ||||
| width:48rpx; | width:48rpx; | ||||
| height: 48rpx; | height: 48rpx; | ||||
| position: absolute; | |||||
| right: 16rpx; | |||||
| top: 0; | |||||
| z-index: 10; | z-index: 10; | ||||
| margin: 0 auto; | |||||
| } | } | ||||
| .gift{ | .gift{ | ||||
| color: #3C3C3C; | color: #3C3C3C; | ||||
| font-size: 20rpx; | font-size: 20rpx; | ||||
| position: absolute; | |||||
| top: 50rpx; | |||||
| right: 0; | |||||
| margin: 0 auto; | |||||
| } | } | ||||
| .user-motto { | .user-motto { | ||||
| width: 270rpx; | width: 270rpx; | ||||
| @@ -112,8 +112,8 @@ module.exports = { | |||||
| 'url': baseUrl + 'fail.png', | 'url': baseUrl + 'fail.png', | ||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| 'fenxiang': { | |||||
| 'url': baseUrl + 'fenxiang.png', | |||||
| 'fenxiang1': { | |||||
| 'url': baseUrl + 'fenxiang1.png', | |||||
| 'name': '' | 'name': '' | ||||
| }, | }, | ||||
| 'game': { | 'game': { | ||||