@@ -21,18 +21,18 @@ | |||||
<view class="coupons-info-name subtitle">{{data.subTitle}}</view> | <view class="coupons-info-name subtitle">{{data.subTitle}}</view> | ||||
<view class="coupons-info-price-p"> | <view class="coupons-info-price-p"> | ||||
<view class='price'> | <view class='price'> | ||||
<text wx:if="{{data.targetAd == 1||data.targetAd == 5}}">{{data.salePriceStr}}<text class='saleprice'>元</text></text> | |||||
<text wx:if="{{data.targetAd == 2}}"><text class='saleprice'>抢购价</text>{{data.salePriceStr}}<text class='saleprice'>元</text></text> | |||||
<text wx:if="{{data.targetAd == 6}}"><text class='saleprice'>可砍至</text>{{data.salePriceStr}}<text class='saleprice'>元</text></text> | |||||
<text wx:if="{{data.targetAd == 7}}"><text class='saleprice'>拼团价</text>{{data.salePriceStr}}<text class='saleprice'>元</text></text> | |||||
<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 == 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> | |||||
<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> | <view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> | ||||
<view class='view01' wx:if="{{data.unit==0}}">{{data.priceStr}}元</view> | |||||
<view class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</view> | |||||
<view wx:if="{{data.unit==1}}">{{data.priceStr}}小时</view> | <view wx:if="{{data.unit==1}}">{{data.priceStr}}小时</view> | ||||
<!-- <text class='txt2'>满{{data.usePriceStr}}元可用</text> --> | <!-- <text class='txt2'>满{{data.usePriceStr}}元可用</text> --> | ||||
</view> | </view> | ||||
<view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | <view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | ||||
<text class='view01' wx:if="{{data.unit==0}}">{{data.priceStr}}元</text> | |||||
<text class='view01' wx:if="{{data.unit==0}}">¥{{data.priceStr}}</text> | |||||
<text wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text> | <text wx:if="{{data.unit==1}}">{{data.priceStr}}小时</text> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -2,9 +2,10 @@ | |||||
.coupons { | .coupons { | ||||
position: relative; | position: relative; | ||||
width: 335rpx; | |||||
width: 346rpx; | |||||
display: inline-block; | display: inline-block; | ||||
overflow: hidden; | overflow: hidden; | ||||
border-radius:12rpx; | |||||
} | } | ||||
.coupons-border { | .coupons-border { | ||||
@@ -17,15 +18,17 @@ | |||||
} | } | ||||
.coupons-img { | .coupons-img { | ||||
border-radius: 10rpx; | |||||
/* border-radius: 10rpx; */ | |||||
} | } | ||||
.coupons-img image { | .coupons-img image { | ||||
display: block; | display: block; | ||||
width: 335rpx; | |||||
height: 203rpx; | |||||
border-top-left-radius: 10rpx; | |||||
border-top-right-radius: 10rpx; | |||||
width: 300rpx; | |||||
height: 176rpx; | |||||
margin: 20rpx auto 0; | |||||
/* border-top-left-radius: 10rpx; | |||||
border-top-right-radius: 10rpx; */ | |||||
} | } | ||||
.coupons-info { | .coupons-info { | ||||
@@ -36,8 +39,8 @@ | |||||
} | } | ||||
.coupons-info-name { | .coupons-info-name { | ||||
font-size: 28rpx; | |||||
color: #333; | |||||
font-size: 30rpx; | |||||
color: #3C3C3C; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
line-height: 38rpx; | line-height: 38rpx; | ||||
} | } | ||||
@@ -55,18 +58,22 @@ | |||||
display: block; | display: block; | ||||
font-size: 50rpx; | font-size: 50rpx; | ||||
color: #ff4949; | color: #ff4949; | ||||
margin-bottom: 26rpx; | |||||
} | } | ||||
.price { | .price { | ||||
font-size: 34rpx; | |||||
font-size: 40rpx; | |||||
font-family: PingFang-SC-Bold; | font-family: PingFang-SC-Bold; | ||||
font-weight: bold; | font-weight: bold; | ||||
color: rgba(255, 50, 50, 1); | |||||
line-height: 44rpx; | |||||
color: #FD782D; | |||||
/* line-height: 44rpx; */ | |||||
margin-left: 16rpx; | margin-left: 16rpx; | ||||
padding-top: 16rpx; | |||||
/* padding-top: 16rpx; */ | |||||
} | |||||
.rmb{ | |||||
font-size: 24rpx!important; | |||||
margin-right: 4rpx!important; | |||||
} | } | ||||
.tit { | .tit { | ||||
overflow: hidden; | overflow: hidden; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
@@ -106,12 +113,12 @@ | |||||
.coupons-btn { | .coupons-btn { | ||||
position: absolute; | position: absolute; | ||||
bottom: 0; | |||||
right: 0; | |||||
bottom: 16rpx; | |||||
right: 24rpx; | |||||
} | } | ||||
.coupons-btn-gm { | .coupons-btn-gm { | ||||
border-radius: 10px 0px 5px 0px !important; | |||||
border-radius: 10px!important; | |||||
margin: 0 !important; | margin: 0 !important; | ||||
padding: 0 !important; | padding: 0 !important; | ||||
font-size: 26rpx; | font-size: 26rpx; | ||||
@@ -120,7 +127,7 @@ | |||||
height: 51rpx !important; | height: 51rpx !important; | ||||
width: 100rpx !important; | width: 100rpx !important; | ||||
line-height: 51rpx !important; | line-height: 51rpx !important; | ||||
background: #af6e34 !important; | |||||
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%)!important; | |||||
} | } | ||||
.coupons-btn-gms { | .coupons-btn-gms { | ||||
@@ -144,6 +151,7 @@ | |||||
color: #999; | color: #999; | ||||
overflow: hidden; | overflow: hidden; | ||||
height: 24rpx; | height: 24rpx; | ||||
width: 65%; | |||||
padding-left: 10rpx; | padding-left: 10rpx; | ||||
line-height: 24rpx; | line-height: 24rpx; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
@@ -265,6 +273,8 @@ scroll-view { | |||||
} | } | ||||
.navigator { | .navigator { | ||||
display: inline-block; | display: inline-block; | ||||
background: #fff; | |||||
border-radius: 12rpx; | |||||
} | } | ||||
.navigator:nth-of-type(2n+1) { | .navigator:nth-of-type(2n+1) { | ||||
@@ -26,16 +26,18 @@ | |||||
} | } | ||||
.i-tabs-tab-title { | .i-tabs-tab-title { | ||||
font-size: 30rpx; | |||||
font-size: 26rpx; | |||||
line-height: 30rpx; | line-height: 30rpx; | ||||
text-align: center; | text-align: center; | ||||
box-sizing: border-box; | box-sizing: border-box; | ||||
color: #3C3C3C; | |||||
color: #A6A6A6; | |||||
} | } | ||||
.i-tabs-tab-title-current { | .i-tabs-tab-title-current { | ||||
color: #FD782D; | |||||
color: #3C3C3C; | |||||
font-size: 30rpx; | font-size: 30rpx; | ||||
font-weight: 500; | |||||
font-family:PingFangSC-Medium; | |||||
} | } | ||||
.i-tabs-tab-scroll { | .i-tabs-tab-scroll { | ||||
@@ -8,7 +8,7 @@ | |||||
justify-content: space-around; | justify-content: space-around; | ||||
align-items: center; | align-items: center; | ||||
-webkit-box-align: center; | -webkit-box-align: center; | ||||
background: #fff | |||||
/* background: #fff */ | |||||
} | } | ||||
.i-tabs::after { | .i-tabs::after { | ||||
@@ -2,7 +2,7 @@ | |||||
.index-coupons { | .index-coupons { | ||||
padding: 0 30rpx; | padding: 0 30rpx; | ||||
margin-top: 40rpx; | margin-top: 40rpx; | ||||
background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); | |||||
/* background:linear-gradient(0deg,rgba(235,235,235,1) 0%,rgba(255,255,255,0.8) 100%); */ | |||||
} | } | ||||
.loading { | .loading { | ||||
text-align: center; | text-align: center; | ||||
@@ -14,7 +14,7 @@ | |||||
.coupons c-coupons{ | .coupons c-coupons{ | ||||
width: 335rpx; | width: 335rpx; | ||||
height: 354rpx; | height: 354rpx; | ||||
margin-bottom: 22rpx; | |||||
margin-bottom: 34rpx; | |||||
} | } | ||||
.coupons c-coupons:nth-of-type(2n+1){ | .coupons c-coupons:nth-of-type(2n+1){ | ||||
float: left; | float: left; | ||||
@@ -8,6 +8,12 @@ Page({ | |||||
data: { | data: { | ||||
newUrl: "", | newUrl: "", | ||||
cover: "", | cover: "", | ||||
kanjia:imgurl.kanjia.url, | |||||
pintuan: imgurl.pintuan.url, | |||||
xiaofeika: imgurl.xiaofeika.url, | |||||
xingyun: imgurl.xingyun.url, | |||||
jfshangcheng: imgurl.jfshangcheng.url, | |||||
toutiao: imgurl.toutiao.url, | |||||
usergift: imgurl.usergift.url, | usergift: imgurl.usergift.url, | ||||
guanbi1: imgurl.guanbi1.url, | guanbi1: imgurl.guanbi1.url, | ||||
icon0001: imgurl.icon0001.url, | icon0001: imgurl.icon0001.url, | ||||
@@ -294,6 +300,32 @@ Page({ | |||||
url: '/pages/czdetail/czdetail', | url: '/pages/czdetail/czdetail', | ||||
}) | }) | ||||
}, | }, | ||||
gotoBargain: function () { | |||||
wx.navigateTo({ | |||||
url: '/pages/bargain/bargain', | |||||
}) | |||||
}, | |||||
gotoSpellGroup: function () { | |||||
wx.navigateTo({ | |||||
url: '/pages/spellGroup/spellGroup', | |||||
}) | |||||
}, | |||||
gotoCard: function () { | |||||
wx.navigateTo({ | |||||
url: '/pages/discountCardList/discountCardList', | |||||
}) | |||||
}, | |||||
gotoGame: function () { | |||||
wx.navigateTo({ | |||||
url: '/pages/game/index', | |||||
}) | |||||
}, | |||||
gotoJfsc: function () { | |||||
wx.navigateTo({ | |||||
url: '/pages/integralmall/index', | |||||
}) | |||||
}, | |||||
/** | /** | ||||
* | * | ||||
* @param {code,page} | * @param {code,page} | ||||
@@ -5,8 +5,10 @@ | |||||
<view class='infoLeft'> | <view class='infoLeft'> | ||||
<!-- 成长值 --> | <!-- 成长值 --> | ||||
<view class="user-data fl" bindtap='gotoChengzhangzhi'> | <view class="user-data fl" bindtap='gotoChengzhangzhi'> | ||||
<!-- <open-data type="userNickName"></open-data> --> | |||||
<text class='chengzhang'>{{levelName}}</text> | |||||
<open-data type="userNickName"></open-data> | |||||
<view class='chengzhangBox'> | |||||
<text class='chengzhang'>{{levelName}}</text> | |||||
</view> | |||||
<view class="view"> | <view class="view"> | ||||
<!-- 成长值<text class="score">{{score}}</text> --> | <!-- 成长值<text class="score">{{score}}</text> --> | ||||
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#FC8B37" /> | <progress percent="{{upgradePercent}}" stroke-width="6" activeColor="#FC8B37" /> | ||||
@@ -25,7 +27,6 @@ | |||||
<view class="user-avatar"> | <view class="user-avatar"> | ||||
<open-data class="open" type="userAvatarUrl"></open-data> | <open-data class="open" type="userAvatarUrl"></open-data> | ||||
</view> | </view> | ||||
<!-- 二维码 --> | <!-- 二维码 --> | ||||
<view class='qrcode fr' bindtap='qrcode'> | <view class='qrcode fr' bindtap='qrcode'> | ||||
<image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | <image src="{{barcode}}" class='qrcodeimg' mode='widthFix'></image> | ||||
@@ -34,7 +35,36 @@ | |||||
<!-- banner --> | <!-- banner --> | ||||
<c-banner wx:key="unique" list="{{list}}" /> | <c-banner wx:key="unique" list="{{list}}" /> | ||||
<!-- 频道 --> | <!-- 频道 --> | ||||
<view></view> | |||||
<view class='channelBox'> | |||||
<view class='kjBox' bindtap='gotoBargain'> | |||||
<image src='{{kanjia}}' mode='aspectFill'></image> | |||||
<text>砍价</text> | |||||
</view> | |||||
<view class='kjBox' bindtap='gotoSpellGroup'> | |||||
<image src='{{pintuan}}' mode='aspectFill'></image> | |||||
<text>拼团</text> | |||||
</view> | |||||
<view class='kjBox' bindtap='gotoCard'> | |||||
<image src='{{xiaofeika}}' mode='aspectFill'></image> | |||||
<text>消费卡</text> | |||||
</view> | |||||
<view class='kjBox' bindtap='gotoGame'> | |||||
<image src='{{xingyun}}' mode='aspectFill'></image> | |||||
<text>幸运卡牌</text> | |||||
</view> | |||||
<view class='kjBox' bindtap='gotoJfsc'> | |||||
<image src='{{jfshangcheng}}' mode='aspectFill'></image> | |||||
<text>积分商城</text> | |||||
</view> | |||||
</view> | |||||
<!-- 每日头条 --> | |||||
<view class='toutiao'> | |||||
<view class='imgBox'> | |||||
<image src='{{toutiao}}' mode='aspectFill'></image> | |||||
</view> | |||||
<text>今日好货推荐,满1000减200元…</text> | |||||
<view class='qg'><text>抢购</text></view> | |||||
</view> | |||||
<!-- 砍价专场 --> | <!-- 砍价专场 --> | ||||
<c-bargain id="bargain"/> | <c-bargain id="bargain"/> | ||||
<!-- 专题 --> | <!-- 专题 --> | ||||
@@ -55,7 +55,7 @@ page { | |||||
.userinfo{ | .userinfo{ | ||||
position:relative; | position:relative; | ||||
margin: 0 auto 30rpx; | |||||
margin: 0 0 30rpx 40rpx; | |||||
width: 690rpx; | width: 690rpx; | ||||
/* padding: 0 0 20rpx; */ | /* padding: 0 0 20rpx; */ | ||||
height: 96rpx; | height: 96rpx; | ||||
@@ -112,15 +112,14 @@ page { | |||||
bottom: 0; | bottom: 0; | ||||
z-index: 1000; | z-index: 1000; | ||||
background: rgba(0, 0, 0, 0.6); | background: rgba(0, 0, 0, 0.6); | ||||
} | } | ||||
.qrcode image { | .qrcode image { | ||||
position: absolute; | |||||
/* position: absolute; | |||||
top: 0; | top: 0; | ||||
bottom: 0; | |||||
right: 20rpx; | |||||
margin: auto; | |||||
width: 84rpx; | |||||
bottom: 0; */ | |||||
margin: 15rpx 20rpx 15rpx; | |||||
z-index:100; | z-index:100; | ||||
} | } | ||||
@@ -202,9 +201,9 @@ page { | |||||
margin: auto; | margin: auto; | ||||
} | } | ||||
.user-avatar open-data { | .user-avatar open-data { | ||||
display:block; | |||||
width:100%; | |||||
height:100%; | |||||
display:block; | |||||
width:100%; | |||||
height:100%; | |||||
} | } | ||||
.user-data { | .user-data { | ||||
margin-left: 116rpx; | margin-left: 116rpx; | ||||
@@ -216,10 +215,29 @@ height:100%; | |||||
margin-top: 16rpx; | margin-top: 16rpx; | ||||
margin-bottom: 26rpx; | margin-bottom: 26rpx; | ||||
} | } | ||||
.user-data open-data{ | |||||
float: left; | |||||
} | |||||
.chengzhangBox{ | |||||
width:70rpx; | |||||
height:32rpx; | |||||
background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); | |||||
border-radius:9px 9px 9px 0px; | |||||
font-family:PingFangSC-Regular; | |||||
font-weight:400; | |||||
color:rgba(255,255,255,1); | |||||
line-height:30rpx; | |||||
text-align: center; | |||||
vertical-align: middle; | |||||
float: left; | |||||
margin-top: 8rpx; | |||||
margin-left: 8rpx; | |||||
} | |||||
.chengzhang { | .chengzhang { | ||||
font-size: 29rpx; | |||||
font-size: 22rpx; | |||||
font-weight: 400; | font-weight: 400; | ||||
color: #AF6E34; | |||||
color: #FFFFFF; | |||||
margin-left: 4rpx; | |||||
} | } | ||||
.integral{ | .integral{ | ||||
margin-left: 70rpx; | margin-left: 70rpx; | ||||
@@ -242,6 +260,8 @@ height:100%; | |||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #999999; | color: #999999; | ||||
line-height: 12rpx; | line-height: 12rpx; | ||||
float: left; | |||||
margin-top: 10rpx; | |||||
} | } | ||||
.view>.score{ | .view>.score{ | ||||
margin-left:9rpx; | margin-left:9rpx; | ||||
@@ -251,11 +271,15 @@ height:100%; | |||||
font-family:PingFang-SC-Bold; | font-family:PingFang-SC-Bold; | ||||
} | } | ||||
.qrcode{ | .qrcode{ | ||||
width: 84rpx; | |||||
height: 84rpx; | |||||
width: 106rpx; | |||||
height: 96rpx; | |||||
background: #FFF; | |||||
margin-left: 20rpx; | |||||
border-radius:12rpx; | |||||
} | } | ||||
.qrcodeimg{ | .qrcodeimg{ | ||||
width: 100%; | |||||
width: 68rpx!important; | |||||
height: 68rpx!important; | |||||
} | } | ||||
.leftimg{ | .leftimg{ | ||||
position: absolute; | position: absolute; | ||||
@@ -318,16 +342,79 @@ height:100%; | |||||
} | } | ||||
.remainchengzhangzhi{ | .remainchengzhangzhi{ | ||||
display: block; | display: block; | ||||
color: #b2743d; | |||||
color: #A6A6A6; | |||||
font-size: 22rpx; | font-size: 22rpx; | ||||
margin-top: 5rpx; | margin-top: 5rpx; | ||||
line-height: 14rpx; | line-height: 14rpx; | ||||
float: left; | float: left; | ||||
margin: 0 10rpx; | |||||
} | } | ||||
progress{ | progress{ | ||||
display:inline-block; | |||||
width:222rpx; | |||||
width:190rpx; | |||||
border-radius:60rpx; | border-radius:60rpx; | ||||
overflow:hidden; | overflow:hidden; | ||||
float: left; | float: left; | ||||
} | |||||
.channelBox{ | |||||
width:688rpx; | |||||
height: 220rpx; | |||||
margin:0 auto; | |||||
display: flex; | |||||
justify-content: space-between; | |||||
} | |||||
.kjBox{ | |||||
width: 104rpx; | |||||
height: 148rpx; | |||||
font-size: 24rpx; | |||||
color: #A6A6A6; | |||||
margin-top: 50rpx; | |||||
text-align: center; | |||||
} | |||||
.kjBox image{ | |||||
width: 104rpx; | |||||
height: 104rpx; | |||||
} | |||||
.toutiao{ | |||||
width:688rpx; | |||||
height: 82rpx; | |||||
line-height: 82rpx; | |||||
margin:0 auto; | |||||
background: #FAFBFD; | |||||
box-shadow:0px 6rpx 16rpx 0px rgba(236,238,243,1); | |||||
border-radius:12rpx; | |||||
} | |||||
.toutiao text{ | |||||
font-size:26rpx; | |||||
font-family:PingFangSC-Regular; | |||||
font-weight:400; | |||||
color:rgba(60,60,60,1); | |||||
float: left; | |||||
} | |||||
.toutiao .imgBox{ | |||||
width: 64rpx; | |||||
height: 64rpx; | |||||
float: left; | |||||
margin:5rpx 0 5rpx 20rpx; | |||||
} | |||||
.toutiao image{ | |||||
width: 48rpx; | |||||
height: 38rpx; | |||||
margin: auto; | |||||
} | |||||
.toutiao .qg{ | |||||
width: 80rpx; | |||||
height: 44rpx; | |||||
line-height: 44rpx; | |||||
border-radius:18rpx; | |||||
border:2rpx solid #FD782D; | |||||
float: right; | |||||
text-align: center; | |||||
margin: 20rpx 20rpx 20rpx 0; | |||||
} | |||||
.toutiao .qg>text{ | |||||
width: 100%; | |||||
font-size:24rpx; | |||||
font-family:PingFangSC-Medium; | |||||
font-weight:500; | |||||
color:#FD782D; | |||||
} | } |
@@ -612,5 +612,29 @@ module.exports = { | |||||
'gray': { | 'gray': { | ||||
'url': baseUrl + "gray.png", | 'url': baseUrl + "gray.png", | ||||
'name': '积分商城' | 'name': '积分商城' | ||||
} | |||||
}, | |||||
'kanjia': { | |||||
'url': baseUrl + "kanjia.png", | |||||
'name': '砍价' | |||||
}, | |||||
'pintuan': { | |||||
'url': baseUrl + "pintuan.png", | |||||
'name': '拼团' | |||||
}, | |||||
'xiaofeika': { | |||||
'url': baseUrl + "xiaofeika.png", | |||||
'name': '消费卡' | |||||
}, | |||||
'xingyun': { | |||||
'url': baseUrl + "xingyunkapai.png", | |||||
'name': '幸运卡牌' | |||||
}, | |||||
'jfshangcheng': { | |||||
'url': baseUrl + "jifenshangcheng.png", | |||||
'name': '积分商城' | |||||
}, | |||||
'toutiao': { | |||||
'url': baseUrl + "toutiao.png", | |||||
'name': '' | |||||
}, | |||||
} | } |