@@ -103,7 +103,7 @@ visibility: hidden; | |||||
} | } | ||||
view, | view, | ||||
text { | text { | ||||
font-family: PingFangSC-Semibold; | |||||
font-family: PingFangSC-Regular; | |||||
} | } | ||||
page { | page { | ||||
width: 100%; | width: 100%; | ||||
@@ -8,12 +8,16 @@ | |||||
<view class="coupons-info-name tit">{{data.title}}</view> | <view class="coupons-info-name tit">{{data.title}}</view> | ||||
<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"> | ||||
<text>{{data.salePriceStr}}<text style="font-size:24rpx;display:inline-block;margin-right:10rpx;">元</text></text> | |||||
<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> | |||||
满{{data.usePriceStr}}元可用 | |||||
</view> | |||||
<view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | |||||
仅限本店使用 | |||||
<view class='price'> | |||||
<text>{{data.salePriceStr}}<text style="font-size:24rpx;display:inline-block;margin-right:10rpx;">元</text></text> | |||||
<view class="coupons-info-manjian" style="margin-top:10rpx;" wx:if="{{data.type == 1}}"> | |||||
<text>{{data.priceStr}}元</text> | |||||
<text>满{{data.usePriceStr}}元可用</text> | |||||
</view> | |||||
<view class="coupons-info-manjian" wx:elif="{{data.type == 2||data.type == 3||data.type==4||data.type==5}}"> | |||||
<text>{{data.priceStr}}元</text> | |||||
<text>仅限本店使用</text> | |||||
</view> | |||||
</view> | </view> | ||||
<view class="coupons-info-manjian1">{{data.merchantName}}</view> | <view class="coupons-info-manjian1">{{data.merchantName}}</view> | ||||
</view> | </view> | ||||
@@ -53,12 +53,13 @@ | |||||
} | } | ||||
.coupons-info-price-p { | .coupons-info-price-p { | ||||
display: inline-block; | |||||
font-size: 40rpx; | |||||
display: block; | |||||
font-size: 50rpx; | |||||
color: #FF4949; | color: #FF4949; | ||||
line-height: 56rpx; | |||||
} | } | ||||
.price{ | |||||
line-height: 36rpx; | |||||
} | |||||
.tit { | .tit { | ||||
overflow: hidden; | overflow: hidden; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
@@ -118,7 +119,7 @@ | |||||
.coupons-btn-gms { | .coupons-btn-gms { | ||||
background: #999 !important; | background: #999 !important; | ||||
border-radius: 10rpx !important; | |||||
border-radius: 60rpx !important; | |||||
opacity: 0.6; | opacity: 0.6; | ||||
margin: 0 !important; | margin: 0 !important; | ||||
padding: 0 !important; | padding: 0 !important; | ||||
@@ -134,18 +135,19 @@ | |||||
.subtitle { | .subtitle { | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #919191; | color: #919191; | ||||
text-align: left; | |||||
overflow: hidden; | overflow: hidden; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
width: 300rpx; | width: 300rpx; | ||||
height: 33rpx; | height: 33rpx; | ||||
line-height: 33rpx; | line-height: 33rpx; | ||||
font-weight:lighter; | |||||
margin-bottom: 18rpx; | |||||
} | } | ||||
.coupons-info-manjian { | .coupons-info-manjian { | ||||
font-weight: normal; | font-weight: normal; | ||||
font-size: 24rpx; | |||||
font-size: 20rpx; | |||||
line-height: 34rpx; | line-height: 34rpx; | ||||
display: inline-block; | display: inline-block; | ||||
color: #FF4949; | color: #FF4949; | ||||
@@ -154,17 +156,30 @@ | |||||
.coupons-info-manjian1 { | .coupons-info-manjian1 { | ||||
font-weight: normal; | font-weight: normal; | ||||
line-height: 28rpx; | |||||
font-size: 20rpx; | font-size: 20rpx; | ||||
line-height: 22rpx; | |||||
color: #919191; | color: #919191; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
display: inline-block; | |||||
overflow: hidden; | overflow: hidden; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
text-overflow: ellipsis; | text-overflow: ellipsis; | ||||
width: 300rpx; | width: 300rpx; | ||||
margin-top: 16rpx; | |||||
} | |||||
.coupons-info-manjian text{ | |||||
display: block; | |||||
line-height: 20rpx; | |||||
} | |||||
.coupons-info-manjian text:nth-of-type(1){ | |||||
display: block; | |||||
text-decoration:line-through; | |||||
color: #FF4949; | |||||
opacity: .6; | |||||
} | |||||
.coupons-info-manjian text:nth-of-type(2){ | |||||
display: block; | |||||
color: #ccc; | |||||
} | } | ||||
/**上拉加载更多**/ | /**上拉加载更多**/ | ||||
.userinfo { | .userinfo { | ||||
@@ -186,7 +201,7 @@ | |||||
.sy { | .sy { | ||||
display: block; | display: block; | ||||
text-align: center; | |||||
text-align: right; | |||||
width: 181rpx; | width: 181rpx; | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #999; | color: #999; | ||||
@@ -178,7 +178,7 @@ page { | |||||
width: 100rpx; | width: 100rpx; | ||||
height: 100rpx; | height: 100rpx; | ||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
border: 2px solid #e5e5e5; | |||||
border: 1px solid #e5e5e5; | |||||
} | } | ||||
.posi_logo view:nth-child(2) { | .posi_logo view:nth-child(2) { | ||||
@@ -217,7 +217,7 @@ page { | |||||
.notes view:nth-child(1) text { | .notes view:nth-child(1) text { | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #919191; | |||||
color: #333; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
} | } | ||||
@@ -231,7 +231,7 @@ page { | |||||
.notes view:nth-child(2)>text { | .notes view:nth-child(2)>text { | ||||
font-size: 24rpx; | font-size: 24rpx; | ||||
color: #333; | |||||
color: #919191; | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
line-height: 42rpx; | line-height: 42rpx; | ||||
} | } | ||||
@@ -1,7 +1,7 @@ | |||||
<view class="container page"> | <view class="container page"> | ||||
<view class="coupon_detail clearfix"> | <view class="coupon_detail clearfix"> | ||||
<view class="fl wmfl"> | <view class="fl wmfl"> | ||||
<image src="{{data.coverImg}}" /> | |||||
<image src="{{data.coverImg}}" mode='aspectFill' /> | |||||
</view> | </view> | ||||
<view class="fr"> | <view class="fr"> | ||||
<text class="title">{{data.title}}</text> | <text class="title">{{data.title}}</text> | ||||
@@ -37,7 +37,7 @@ | |||||
.detail_msg { | .detail_msg { | ||||
display: flex; | display: flex; | ||||
padding-bottom: 30rpx; | |||||
padding-bottom: 26rpx; | |||||
} | } | ||||
.expiretime { | .expiretime { | ||||
@@ -46,7 +46,7 @@ | |||||
text-align: left; | text-align: left; | ||||
text-indent: 1em; | text-indent: 1em; | ||||
height: 40rpx; | height: 40rpx; | ||||
line-height: 40rpx; | |||||
line-height: 36rpx; | |||||
font-size: 22rpx; | font-size: 22rpx; | ||||
color: #333; | color: #333; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
@@ -85,16 +85,27 @@ | |||||
.info view:nth-child(1) text { | .info view:nth-child(1) text { | ||||
font-size: 32rpx; | font-size: 32rpx; | ||||
line-height: 32rpx; | line-height: 32rpx; | ||||
height: 32rpx; | |||||
color: #333; | color: #333; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
width: 400rpx; | |||||
display: inline-block; | |||||
white-space: nowrap; | |||||
text-overflow: ellipsis; | |||||
overflow: hidden; | |||||
} | } | ||||
.info view:nth-child(2) { | .info view:nth-child(2) { | ||||
padding-left: 4%; | |||||
padding-left: 2%; | |||||
font-size: 22rpx; | font-size: 22rpx; | ||||
color: #333; | color: #333; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
margin-top: 6rpx; | margin-top: 6rpx; | ||||
display: inline-block; | |||||
white-space: nowrap; | |||||
text-overflow: ellipsis; | |||||
overflow: hidden; | |||||
width: 400rpx; | |||||
} | } | ||||
.info view:nth-child(3) { | .info view:nth-child(3) { | ||||
@@ -114,10 +125,12 @@ | |||||
color: #02c0ff; | color: #02c0ff; | ||||
font-size: 28rpx; | font-size: 28rpx; | ||||
} | } | ||||
.active{ | |||||
color:#fff; | |||||
background: #02c0ff; | |||||
.active { | |||||
color: #fff; | |||||
background: #02c0ff; | |||||
} | } | ||||
.txt1 { | .txt1 { | ||||
font-size: 22rpx; | font-size: 22rpx; | ||||
color: #333; | color: #333; | ||||
@@ -7,5 +7,4 @@ | |||||
<text>独家福利,抢完即止</text> | <text>独家福利,抢完即止</text> | ||||
</view> | </view> | ||||
<c-coupons id="lists" bind:myevent="onGetCode" /> | <c-coupons id="lists" bind:myevent="onGetCode" /> | ||||
<!-- <official-account class="gzh"></official-account> --> | |||||
</view> | </view> |
@@ -63,17 +63,3 @@ page { | |||||
bottom: 0; | bottom: 0; | ||||
z-index: 10; | z-index: 10; | ||||
} | } | ||||
.gzh{ | |||||
display: none; | |||||
position: absolute; | |||||
bottom: 6%; | |||||
width: 90%; | |||||
left: 0; | |||||
right: 0; | |||||
margin: auto; | |||||
z-index: 1000000; | |||||
background: #ccc; | |||||
border-radius: 16rpx; | |||||
overflow: hidden; | |||||
box-shadow:0 6px 20px 0 rgba(0,0,0,0.15); | |||||
} |
@@ -32,14 +32,14 @@ | |||||
.index-scroll-view .commodity { | .index-scroll-view .commodity { | ||||
display: inline-block; | display: inline-block; | ||||
margin: 16rpx 30rpx 0; | |||||
margin: 16rpx 30rpx 16rpx; | |||||
margin-right: 0; | margin-right: 0; | ||||
overflow: hidden; | |||||
/* overflow: hidden; */ | |||||
position: relative; | position: relative; | ||||
background: #fff; | background: #fff; | ||||
/* border: 1rpx solid #dddee1; */ | /* border: 1rpx solid #dddee1; */ | ||||
width: 355rpx; | width: 355rpx; | ||||
box-shadow: 0 0 10px 0 rgba(211,211,211,0.50); | |||||
box-shadow: 0 0 10px 0 rgba(211,211,211,0.30); | |||||
border-radius: 10rpx; | border-radius: 10rpx; | ||||
} | } | ||||
.index-scroll-view .commodity:last-child{ | .index-scroll-view .commodity:last-child{ | ||||
@@ -60,6 +60,10 @@ | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
line-height: 33rpx; | line-height: 33rpx; | ||||
padding-left: 4%; | padding-left: 4%; | ||||
height: 66rpx; | |||||
overflow: hidden; | |||||
white-space: wrap; | |||||
text-overflow: ellipsis; | |||||
} | } | ||||
.info view:nth-child(1) text { | .info view:nth-child(1) text { | ||||
@@ -66,8 +66,11 @@ | |||||
</view> | </view> | ||||
<view class="margin"></view> | <view class="margin"></view> | ||||
<!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
<view bindlongtap='showVersion' class='version'> | |||||
<view wx:if="{{flag=='show'}}">版本号:2.0.7</view> | |||||
<view bindlongtap='showVersion' class='version'> | |||||
<view wx:if="{{flag=='show'}}">版本号:2.0.8</view> | |||||
<view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
</view> | </view> | ||||
</view> | |||||
<view class='of'> | |||||
<official-account class="gzh"></official-account> | |||||
</view> | </view> |
@@ -206,3 +206,20 @@ | |||||
.user-out-btn::after { | .user-out-btn::after { | ||||
opacity: 0; | opacity: 0; | ||||
} | } | ||||
.gzh{ | |||||
display: none; | |||||
position: absolute; | |||||
bottom: 6%; | |||||
width: 90%; | |||||
left: 0; | |||||
right: 0; | |||||
margin: auto; | |||||
z-index: 1000000; | |||||
background: #ccc; | |||||
border-radius: 16rpx; | |||||
overflow: hidden; | |||||
box-shadow:0 6px 20px 0 rgba(0,0,0,0.15); | |||||
} | |||||
.of{ | |||||
display: block; | |||||
} |
@@ -90,6 +90,7 @@ class HttpBasics { | |||||
* @param {*} reject | * @param {*} reject | ||||
*/ | */ | ||||
responseMap = (res, resolve, reject) => { | responseMap = (res, resolve, reject) => { | ||||
console.log(res); | |||||
// 网络状态码200 | // 网络状态码200 | ||||
if (res.statusCode == 200) { | if (res.statusCode == 200) { | ||||
// 服务器code 200 成功 | // 服务器code 200 成功 | ||||
@@ -97,13 +98,14 @@ class HttpBasics { | |||||
resolve(res.data); | resolve(res.data); | ||||
} else { | } else { | ||||
wx.hideLoading(); | wx.hideLoading(); | ||||
// wx.showToast({ | |||||
// title: res.data.message | |||||
// }); | |||||
wx.showToast({ | |||||
title: res.data.message | |||||
}); | |||||
reject(res.data); | reject(res.data); | ||||
} | } | ||||
} else { | |||||
console.error("请求出错:", res); | |||||
} | |||||
else { | |||||
console.log("请求出错:", res); | |||||
reject(res.data); | reject(res.data); | ||||
} | } | ||||
}; | }; | ||||