@@ -1,5 +1,3 @@ | |||||
.applyshop { | .applyshop { | ||||
font-size: 30rpx; | font-size: 30rpx; | ||||
height: 70rpx; | height: 70rpx; | ||||
@@ -25,9 +23,7 @@ | |||||
} | } | ||||
.posi_logo view:nth-child(1) { | .posi_logo view:nth-child(1) { | ||||
/* width: 100rpx; *//* margin-right: 16rpx; */ | |||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
/* height: 100rpx; */ | |||||
} | } | ||||
.posi_logo view:nth-child(1) image { | .posi_logo view:nth-child(1) image { | ||||
@@ -70,3 +66,13 @@ | |||||
padding: 20rpx 0; | padding: 20rpx 0; | ||||
font-size: 32rpx; | font-size: 32rpx; | ||||
} | } | ||||
.tel { | |||||
position: absolute; | |||||
right: 0; | |||||
top: 0; | |||||
bottom: 0; | |||||
margin: auto; | |||||
width: 50rpx; | |||||
height: 50rpx; | |||||
z-index: 10; | |||||
} |
@@ -90,7 +90,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 适用门店 --> | <!-- 适用门店 --> | ||||
<store showMore="{{showMore}}" merchantVoList="{{merchantVoList}}"></store> | |||||
<store merchantVoList="{{merchantVoList}}"></store> | |||||
<view class='notes'> | <view class='notes'> | ||||
<view> | <view> | ||||
<text>购买须知</text> | <text>购买须知</text> | ||||
@@ -8,9 +8,6 @@ const QR = require("../../../utils/memberqrcode.js"); | |||||
//券详情页面 | //券详情页面 | ||||
Page({ | Page({ | ||||
data: { | data: { | ||||
showMore: true, | |||||
more: "点击查看更多", | |||||
hidden: "hidden", | |||||
navigationBarHeight, | navigationBarHeight, | ||||
code: "", | code: "", | ||||
topLine: imgurl.topLine.url, | topLine: imgurl.topLine.url, | ||||
@@ -37,25 +34,6 @@ Page({ | |||||
staticGamedata: {}, | staticGamedata: {}, | ||||
showIf: false, | showIf: false, | ||||
}, | }, | ||||
// 点击查看更多 | |||||
more: function () { | |||||
let that = this; | |||||
if (that.data.more == '点击查看更多') { | |||||
this.setData({ | |||||
hidden: "", | |||||
height: that.data.data.merchantVoList.length * 140 + 'rpx', | |||||
more: "点击收起", | |||||
showMore: true | |||||
}) | |||||
} else { | |||||
this.setData({ | |||||
hidden: "hidden", | |||||
height: 4 * 140 + 'rpx', | |||||
more: "点击查看更多", | |||||
showMore: true | |||||
}) | |||||
} | |||||
}, | |||||
onUnload:function(){ | onUnload:function(){ | ||||
let that = this; | let that = this; | ||||
clearInterval(that.data.setInter); | clearInterval(that.data.setInter); | ||||
@@ -70,14 +48,6 @@ Page({ | |||||
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, | url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, | ||||
}) | }) | ||||
}, | }, | ||||
/** | |||||
* 跳转到门店列表的详情页面 | |||||
*/ | |||||
gotoDetail(e) { | |||||
wx.navigateTo({ | |||||
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` | |||||
}) | |||||
}, | |||||
// 获取游戏 | // 获取游戏 | ||||
getStaticGame(token) { | getStaticGame(token) { | ||||
let _this = this; | let _this = this; | ||||
@@ -130,10 +100,9 @@ Page({ | |||||
couponOrderId: options.quancode | couponOrderId: options.quancode | ||||
} | } | ||||
}).then(res => { | }).then(res => { | ||||
console.log(res); | |||||
that.setData({ | that.setData({ | ||||
couponorderstatus: res.data.couponOrderStatus, | couponorderstatus: res.data.couponOrderStatus, | ||||
data: res.data | |||||
data: res.data, | |||||
}); | }); | ||||
if (res.data.couponOrderStatus == 1) { | if (res.data.couponOrderStatus == 1) { | ||||
/** | /** | ||||
@@ -195,16 +164,6 @@ Page({ | |||||
validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") | validEndDate: util.formatTime(that.data.data.validEndDate, "yyyy-MM-dd hh:mm:ss") | ||||
}) | }) | ||||
} | } | ||||
if (that.data.data.merchantVoList && that.data.data.merchantVoList.length <= 4) { | |||||
that.setData({ | |||||
height: that.data.data.merchantVoList.length * 140 + 'rpx', | |||||
showMore: false | |||||
}) | |||||
} else if (that.data.data.merchantVoList && that.data.data.merchantVoList.length > 4) { | |||||
that.setData({ | |||||
height: 4 * 140 + 'rpx' | |||||
}) | |||||
} | |||||
let url = JSON.stringify({ | let url = JSON.stringify({ | ||||
END:"C", | END:"C", | ||||
TYPE:"couponorder", | TYPE:"couponorder", | ||||
@@ -1,5 +1,6 @@ | |||||
{ | { | ||||
"usingComponents": { | "usingComponents": { | ||||
"navbar": "../../../components/navbar/navbar" | |||||
"navbar": "../../../components/navbar/navbar", | |||||
"store": "../../../components/store/index" | |||||
} | } | ||||
} | } |
@@ -49,8 +49,9 @@ | |||||
<text>优惠券码:</text>{{code}}</view> | <text>优惠券码:</text>{{code}}</view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='applyshop'>适用门店</view> | |||||
<!-- 适用门店 --> | |||||
<store merchantVoList="{{data.merchantVoList}}"></store> | |||||
<!-- <view class='applyshop'>适用门店</view> | |||||
<view class='posi' style='overflow:{{hidden}};height:{{height}}'> | <view class='posi' style='overflow:{{hidden}};height:{{height}}'> | ||||
<view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | <view class='posi_logo' wx:for="{{data.merchantVoList}}" wx:key="index"> | ||||
<view bindtap='gotoDetail' data-id='{{item.id}}'> | <view bindtap='gotoDetail' data-id='{{item.id}}'> | ||||
@@ -68,7 +69,7 @@ | |||||
<image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | <image wx:if="{{item.linkLinePhone}}" bindtap='phone' data-merchantLinkPhone='{{item.linkLinePhone}}' class="tel" src="{{teljpgUrl}}" mode="widthFix" /> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> | |||||
<view class='bottom' bindtap='more' wx:if="{{showMore}}">{{more}}</view> --> | |||||
<image class='line' mode="widthFix" src="{{btomLine}}"></image> | <image class='line' mode="widthFix" src="{{btomLine}}"></image> | ||||
<view class='note'> | <view class='note'> | ||||
@@ -10,10 +10,8 @@ | |||||
border-radius: 16rpx; | border-radius: 16rpx; | ||||
} | } | ||||
page { | page { | ||||
/* background: #02c0ff; */ | |||||
background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); | background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%); | ||||
height: auto !important; | height: auto !important; | ||||
/* padding-bottom: 20rpx; */ | |||||
} | } | ||||
.panel, .zhuangtai image { | .panel, .zhuangtai image { | ||||
@@ -197,70 +195,6 @@ page { | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
text-align: left; | text-align: left; | ||||
} | } | ||||
.applyshop { | |||||
font-size: 30rpx; | |||||
height: 70rpx; | |||||
line-height: 70rpx; | |||||
color: #333; | |||||
text-indent: 1em; | |||||
padding-top: 20rpx; | |||||
} | |||||
.posi { | |||||
position: relative; | |||||
width: 100%; | |||||
background: #FFF; | |||||
/* margin: 18rpx 0 0; */ | |||||
} | |||||
.posi_logo { | |||||
position: relative; | |||||
width: 92%; | |||||
display: flex; | |||||
padding: 20rpx 0; | |||||
background: #fff; | |||||
z-index: 10; | |||||
margin: 0 auto; | |||||
} | |||||
.posi_logo view:nth-child(1) { | |||||
/* width: 100rpx; *//* margin-right: 16rpx; */ | |||||
border-radius: 16rpx; | |||||
/* height: 100rpx; */ | |||||
} | |||||
.posi_logo view:nth-child(1) image { | |||||
display: block; | |||||
width: 100rpx; | |||||
height: 100rpx; | |||||
border-radius: 16rpx; | |||||
margin-right: 16rpx; | |||||
border: 1px solid #e5e5e5; | |||||
} | |||||
.name{ | |||||
font-size: 32rpx; | |||||
color: #333; | |||||
letter-spacing: 0; | |||||
width: 500rpx; | |||||
white-space: nowrap; | |||||
text-overflow: ellipsis; | |||||
overflow: hidden; | |||||
} | |||||
.posi_logo view:nth-child(2) view:nth-child(1) { | |||||
font-size: 32rpx; | |||||
color: #333; | |||||
letter-spacing: 0; | |||||
} | |||||
.shopVoList { | |||||
display: flex !important; | |||||
padding-left: 0 !important; | |||||
flex-direction: row !important; | |||||
} | |||||
.shopVoList text { | |||||
font-size: 20rpx !important; | |||||
color: #b8b8b8 !important; | |||||
} | |||||
.tit { | .tit { | ||||
padding: 53rpx 0 0; | padding: 53rpx 0 0; | ||||
@@ -270,17 +204,6 @@ page { | |||||
letter-spacing: 0; | letter-spacing: 0; | ||||
} | } | ||||
.tel { | |||||
position: absolute; | |||||
right: 30rpx; | |||||
top: 0; | |||||
bottom: 0; | |||||
margin: auto; | |||||
width: 50rpx; | |||||
height: 50rpx; | |||||
z-index: 10; | |||||
} | |||||
.notes view:nth-child(1) { | .notes view:nth-child(1) { | ||||
width: 92%; | width: 92%; | ||||
height: 87rpx; | height: 87rpx; | ||||
@@ -374,12 +297,3 @@ page { | |||||
border: 1px solid red; | border: 1px solid red; | ||||
padding: 3rpx; | padding: 3rpx; | ||||
} | } | ||||
.bottom { | |||||
text-align: center; | |||||
height: 70rpx; | |||||
line-height: 70rpx; | |||||
color: #999; | |||||
font-size: 32rpx; | |||||
background: #fff; | |||||
margin-top: 20rpx; | |||||
} |