Commit e8110ed0d9671c053cbc5a6903e9dd40e51fb810

Authored by vking
1 parent a3866694

4.当详情页有优惠券的时候,优惠券多需要滑动查看时,下面的详情页一直在动,滑动优惠券感觉 不顺畅;(eg:一键订测试大饭店)

5.(看看是否可以将优惠券的弹出,做成从下往上滑出来; 关闭的时候从上往下收起来;)
... ... @@ -15,6 +15,7 @@ Component({
*/
data: {
display:false,
hiddenAni:'',
},
/**
... ... @@ -23,13 +24,20 @@ Component({
methods: {
hide(){
this.setData({
display:false,
hiddenAni:'discountHide',
})
this.triggerEvent('hide')
setTimeout(()=>{
this.setData({
display:false,
hiddenAni:'',
})
this.triggerEvent('hide')
},250)
},
show(){
this.setData({
display:true,
hiddenAni:'',
})
this.triggerEvent('show')
},
... ...
<!--components/reserve/discount.wxml-->
<view class="mask" bindtap="hide" wx:if="{{display}}">
<view class="discount" catchtap="">
<view class="discount {{hiddenAni}}" catchtap="">
<view class="discount-name Semibold" bindtap="hide">
优惠信息
<view class="close"></view>
... ...
... ... @@ -10,6 +10,9 @@
padding: 30rpx 5%;
animation: discountShow 0.3s;
}
.discount.discountHide{
animation: discountHide 0.3s;
}
.discount view{
background-size: 100% 100%;
}
... ...
... ... @@ -54,7 +54,7 @@
<text class="label_text" >{{seller.label_cstr}}</text>
</view>
</view>
<view style="height: {{pagesHeight}};display:{{pagesHeight=='auto'?'block':'none'}}">
<view style="display:{{pagesHeight=='auto'?'block':'none'}}">
<view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">
<view class="addr-view" bindtap="lookLocation">
<view class="addr-text flex-ll">
... ... @@ -79,103 +79,105 @@
</view>
</view>
</view>
<view class="black20line"></view>
<view class="seller" wx:if="{{seller.activity.length>0}}">
<formids bindclick="showDiscount">
<view class="activity-view-easy flex-lr" >
<view class="activity-left flex-ll">
<view class="icon"></view>
<block wx:for="{{seller.activity}}"
wx:key="seller.activity.key"
wx:if="{{index<2}}">
<view class="discount" >{{item.title}}</view>
</block>
</view>
<view class="flex-rr activity-right">
<view class="more-text">更多</view>
<view class="more"></view>
<view style="display:{{pagesHeight=='auto'?'block':'none'}}">
<view class="black20line"></view>
<view class="seller" wx:if="{{seller.activity.length>0}}">
<formids bindclick="showDiscount">
<view class="activity-view-easy flex-lr" >
<view class="activity-left flex-ll">
<view class="icon"></view>
<block wx:for="{{seller.activity}}"
wx:key="seller.activity.key"
wx:if="{{index<2}}">
<view class="discount" >{{item.title}}</view>
</block>
</view>
<view class="flex-rr activity-right">
<view class="more-text">更多</view>
<view class="more"></view>
</view>
</view>
</view>
</formids>
<!--
<formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">
<view class="activity-view" >
<view class="activity" >
<view class="flex-lr">
<view class="activity-left">
<view class="activity-first flex-ll" style="align-items: flex-start">
<image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
<view class="flex-cc discount" wx:for="{{seller.activity}}"
wx:key="seller.activity.key"
wx:if="{{index<2}}">
<view class="discount-left"></view>
<view class="discount-text">{{item.title}}</view>
<view class="discount-right"></view>
</formids>
<!--
<formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">
<view class="activity-view" >
<view class="activity" >
<view class="flex-lr">
<view class="activity-left">
<view class="activity-first flex-ll" style="align-items: flex-start">
<image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
<view class="flex-cc discount" wx:for="{{seller.activity}}"
wx:key="seller.activity.key"
wx:if="{{index<2}}">
<view class="discount-left"></view>
<view class="discount-text">{{item.title}}</view>
<view class="discount-right"></view>
</view>
</view>
</view>
<view class="activity-right flex-rr Semibold">
<view></view>
<view class="more"></view>
</view>
</view>
<view class="activity-right flex-rr Semibold">
<view></view>
<view class="more"></view>
<view class="activity-text">
该优惠仅适用于一键订平台预订客户
</view>
</view>
<view class="activity-text">
该优惠仅适用于一键订平台预订客户
</view>
</view>
</view>
</formids>
-->
</view>
<view class="black20line" wx:if="{{seller.activity.length>0}}"></view>
<view class="block" wx:if="{{seller.room_image.length>0}}">
<view class="header flex-ll">
<view class="line"></view>
<view class="name">包间环境</view>
</formids>
-->
</view>
<scroll-view
scroll-x
class="baos"
scroll-into-view="{{toView}}"
scroll-top="{{scrollTop}}"
>
<view class="black20line" wx:if="{{seller.activity.length>0}}"></view>
<view class="block" wx:if="{{seller.room_image.length>0}}">
<view class="header flex-ll">
<view class="line"></view>
<view class="name">包间环境</view>
</view>
<scroll-view
scroll-x
class="baos"
scroll-into-view="{{toView}}"
scroll-top="{{scrollTop}}"
>
<block wx:for="{{seller.room_image}}" wx:key="sellers.key">
<view class="image">
<image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
</view>
</block>
<block wx:for="{{seller.room_image}}" wx:key="sellers.key">
<view class="image">
<image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
</view>
</block>
</scroll-view>
</view>
<view class="block" wx:if="{{seller.dishes.length>0}}">
<view class="header flex-ll">
<view class="line"></view>
<view class="name">推荐菜品</view>
</scroll-view>
</view>
<scroll-view
scroll-x
class="cais"
scroll-into-view="{{toView}}"
scroll-top="{{scrollTop}}"
>
<block wx:for="{{seller.dishes}}" wx:key="sellers.key">
<view class="cais-views" wx:if="{{item.image}}">
<view class="image-view" >
<view class="image">
<image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"
src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
<view class="block" wx:if="{{seller.dishes.length>0}}">
<view class="header flex-ll">
<view class="line"></view>
<view class="name">推荐菜品</view>
</view>
<scroll-view
scroll-x
class="cais"
scroll-into-view="{{toView}}"
scroll-top="{{scrollTop}}"
>
<block wx:for="{{seller.dishes}}" wx:key="sellers.key">
<view class="cais-views" wx:if="{{item.image}}">
<view class="image-view" >
<view class="image">
<image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"
src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
</view>
<view class="text Semibold">{{item.name}}</view>
</view>
<view class="text Semibold">{{item.name}}</view>
</view>
</block>
</scroll-view>
<view class="cais-text">
<block wx:for="{{seller.dishes}}" wx:key="sellers.key">
<view wx:if="{{!item.image}}">{{item.name}}</view>
</block>
</view>
</block>
</scroll-view>
<view class="cais-text">
<block wx:for="{{seller.dishes}}" wx:key="sellers.key">
<view wx:if="{{!item.image}}">{{item.name}}</view>
</block>
</view>
</view>
</view>
... ...