@@ -21,7 +21,7 @@ | |||
<view class="coupons-info-name subtitle">{{data.subTitle}}</view> | |||
<view class="coupons-info-price-p"> | |||
<view class='price'> | |||
<text wx:if="{{data.targetAd == 1||data.targetAd == 5}}"><text class='rmb'>¥</text>{{data.salePriceStr}}<text class='saleprice'></text></text> | |||
<text wx:if="{{data.targetAd == 1||data.targetAd == 5}}"><text class='rmb'>¥</text><text class='num'>{{data.salePriceStr}}</text><text class='saleprice'></text></text> | |||
<text wx:if="{{data.targetAd == 2}}"><text class='saleprice'>抢购价</text><text class='rmb'>¥</text>{{data.salePriceStr}}<text class='saleprice'></text></text> | |||
<text wx:if="{{data.targetAd == 6}}"><text class='saleprice'>可砍至</text><text class='rmb'>¥</text>{{data.salePriceStr}}<text class='saleprice'></text></text> | |||
<text wx:if="{{data.targetAd == 7}}"><text class='saleprice'>拼团价</text><text class='rmb'>¥</text>{{data.salePriceStr}}<text class='saleprice'></text></text> | |||
@@ -2,7 +2,7 @@ | |||
.coupons { | |||
position: relative; | |||
width: 346rpx; | |||
width: 340rpx; | |||
display: inline-block; | |||
overflow: hidden; | |||
border-radius:12rpx; | |||
@@ -17,10 +17,7 @@ | |||
bottom: 0; | |||
} | |||
.coupons-img { | |||
/* border-radius: 10rpx; */ | |||
} | |||
.coupons-img image { | |||
display: block; | |||
@@ -55,24 +52,30 @@ | |||
} | |||
.coupons-info-price-p { | |||
display: block; | |||
display: inline-block; | |||
font-size: 50rpx; | |||
color: #ff4949; | |||
margin-bottom: 26rpx; | |||
width: 100%; | |||
} | |||
.price { | |||
font-size: 40rpx; | |||
font-family: PingFang-SC-Bold; | |||
font-weight: bold; | |||
color: #FD782D; | |||
line-height: 44rpx; | |||
margin-left: 16rpx; | |||
padding-top: 16rpx; | |||
color: #FD832D; | |||
} | |||
.rmb{ | |||
font-size: 24rpx!important; | |||
margin-right: 4rpx!important; | |||
float: left; | |||
color: #FD782D!; | |||
} | |||
.num{ | |||
float: left; | |||
color: #FD782D; | |||
} | |||
.tit { | |||
overflow: hidden; | |||
@@ -278,7 +281,7 @@ scroll-view { | |||
} | |||
.navigator:nth-of-type(2n+1) { | |||
margin-right: 10rpx; | |||
/* margin-right: 10rpx; */ | |||
} | |||
.superscript { | |||
@@ -165,7 +165,7 @@ | |||
} | |||
.nocoupon button { | |||
background: #00c0ff; | |||
background: linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||
color: #fff; | |||
font-style: 30rpx; | |||
width: 100%; | |||
@@ -20,7 +20,7 @@ | |||
</view> --> | |||
<view> | |||
<text>{{data.merchantName}}</text> | |||
<text class='title'>{{data.title}}</text> | |||
<text class='title' wx:if="{{data.title!=''}}">{{data.title}}</text> | |||
</view> | |||
<view class='fenxiang' wx:if="{{data.type!=50&&data.type!=51}}" bindtap='showshare'> | |||
<image class="fenxiang" src='{{fenxiang}}' mode="widthFix"></image> | |||
@@ -35,7 +35,7 @@ | |||
<text>商户位置:</text> | |||
</view> | |||
<view class='merchants'> | |||
<text wx:for="{{shopVoList}}" wx:key="{{index}}"> | |||
<text wx:for="{{shopVoList}}" wx:key="{{index}}" > | |||
{{item.buildingName}}{{item.floorName}}--{{item.shopNumber}} | |||
</text> | |||
</view> | |||
@@ -48,7 +48,7 @@ | |||
<text>客服电话:</text> | |||
</view> | |||
<view class='frHr'> | |||
<view style='display:inline-block;text-align:left;margin-right:20rpx;'> | |||
<view style='display:inline-block;text-align:left;margin-right:20rpx;'class='posi'> | |||
<text wx:if="{{data.linkLinePhone}}">{{data.linkLinePhone}}</text> | |||
<text wx:else>{{data.merchantLinkPhone}}</text> | |||
</view> | |||
@@ -60,7 +60,7 @@ | |||
.merchant-brand view:nth-child(1) { | |||
width: 98%; | |||
height: 130rpx; | |||
/* height: 700rpx; */ | |||
display: flex; | |||
flex-direction: column; | |||
white-space: nowrap; | |||
@@ -94,6 +94,7 @@ | |||
.merchant-shop text, .merchant-phone text { | |||
font-size: 30rpx; | |||
/* color: #A6A6A6; */ | |||
} | |||
.merchant-shop .fl{ | |||
color: #A6A6A6; | |||
@@ -116,6 +117,7 @@ | |||
.merchant-shop view:nth-child(2) { | |||
font-size: 30rpx; | |||
color: #A6A6A6; | |||
} | |||
.merchant-activity view:nth-child(1) { | |||
font-size:30rpx; | |||
@@ -138,7 +140,7 @@ | |||
padding: 20rpx 0; | |||
display: block; | |||
font-size: 30rpx; | |||
background: linear-gradient(0deg, rgba(235, 235, 235, 1) 0%, rgba(255, 255, 255, 0.8) 100%); | |||
background: #F4F5F9; | |||
} | |||
.merchant-activity{ | |||
@@ -174,15 +176,18 @@ | |||
} | |||
.merchants text { | |||
display: block; | |||
display: inline-block; | |||
/* text-align: left; */ | |||
font-size: 26rpx; | |||
margin-bottom: 6rpx; | |||
/* height: 26rpx; */ | |||
line-height: 24rpx; | |||
line-height: 22rpx; | |||
color: #A6A6A6; | |||
margin-right: 10rpx; | |||
} | |||
.posi{ | |||
color: #FD832D!important; | |||
} | |||
.merchants { | |||
float: left; | |||
display: block!important; | |||
@@ -193,7 +198,7 @@ | |||
.merchant-brand { | |||
border: none !important; | |||
width: 92%; | |||
margin: 20rpx auto 0; | |||
margin: 20rpx auto 20rpx; | |||
} | |||
.merchant-brand view:nth-child(2) text:nth-child(1) { | |||
margin-top: 20rpx; | |||
@@ -238,6 +243,7 @@ | |||
line-height: 88rpx; | |||
margin-bottom: 30rpx; | |||
padding: 0 15%; | |||
background: #FFF; | |||
} | |||
.swiper-tab-item { | |||
@@ -262,10 +268,10 @@ | |||
.fenxiang { | |||
position: absolute; | |||
right: 0; | |||
top: 27rpx; | |||
top: 0; | |||
width: 108rpx; | |||
} | |||
.merchant-phones ,.merchant-activity{ | |||
.merchant-activity{ | |||
padding: 0 4% 10rpx; | |||
} | |||
.fenxiang image { | |||
@@ -327,6 +333,8 @@ | |||
.swiperactive { | |||
min-height: 400rpx; | |||
padding-bottom: 44rpx; | |||
padding:0 4% 10rpx; | |||
} | |||
.swiperactive image{ | |||
display: block; | |||
@@ -337,7 +345,6 @@ | |||
/* margin: 30rpx auto 0; */ | |||
display:block; | |||
text-align:center; | |||
color: #A6A6A6; | |||
} | |||
.modal { | |||
width: 100%; | |||
@@ -447,5 +454,5 @@ button::after{ border: none; } | |||
color: #FD832D; | |||
font-size: 24rpx; | |||
margin-left: 12rpx; | |||
margin-top: 12rpx; | |||
margin-top: 10rpx; | |||
} |
@@ -117,36 +117,7 @@ Page({ | |||
url: '/pages/rushToBuy/index', | |||
}) | |||
}, | |||
// 跳往卡列表 | |||
gotodiscountcard: function() { | |||
wx.navigateTo({ | |||
url: '/pages/discountCardList/discountCardList', | |||
}) | |||
}, | |||
//跳往积分商城 | |||
gotouser: function() { | |||
wx.navigateTo({ | |||
url: `/pages/integralmall/index` | |||
}) | |||
}, | |||
//跳往砍价专场 | |||
gobargain: function() { | |||
wx.navigateTo({ | |||
url: '/pages/bargain/bargain', | |||
}) | |||
}, | |||
//跳往拼团专场 | |||
gogroup: function() { | |||
wx.navigateTo({ | |||
url: '/pages/spellGroup/spellGroup', | |||
}) | |||
}, | |||
//跳往显示抢购 | |||
gotoRushList: function () { | |||
wx.navigateTo({ | |||
url: '/pages/rushToBuy/index', | |||
}) | |||
}, | |||
//搜索门店 | |||
// searchbar:function(){ | |||
// wx.switchTab({ | |||
@@ -58,7 +58,7 @@ | |||
</view> | |||
</view> | |||
<!-- 每日头条 限时抢购 --> | |||
<view class='toutiao' bindtap='gotoRushList'> | |||
<view class='toutiao' bindtap='gotoRushBuy'> | |||
<view class='imgBox'> | |||
<image src='{{toutiao}}' mode='aspectFill'></image> | |||
</view> | |||
@@ -68,9 +68,9 @@ | |||
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | |||
<text>退款失败</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==2}}" class="btnGm" data-id="{{item.id}}" bindtap="gotopayAgain" data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" > | |||
<!-- <view wx:if="{{item.orderStatus==2}}" class="btnGm" data-id="{{item.id}}" bindtap="gotopay" data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" > | |||
<text class='txGm'>再次购买</text> | |||
</view> | |||
</view> --> | |||
</view> | |||
</view> | |||
<view class="dingdan" wx:if="{{list.length==0}}"> | |||