xt / xcx-book · Commits

Go to a project

Commit e8110ed0d9671c053cbc5a6903e9dd40e51fb810

Authored by vking
1 parent a3866694
build: skipped

4.当详情页有优惠券的时候，优惠券多需要滑动查看时，下面的详情页一直在动，滑动优惠券感觉 不顺畅；（eg：一键订测试大饭店） 

5.（看看是否可以将优惠券的弹出，做成从下往上滑出来; 关闭的时候从上往下收起来；）
Inline Side-by-side
Showing 4 changed files with 100 additions and 87 deletions
@@ -15,6 +15,7 @@ Component({ @@ -15,6 +15,7 @@ Component({
15 */ 15 */
16 data: { 16 data: {
17 display:false, 17 display:false,
  18 + hiddenAni:'',
18 }, 19 },
19 20
20 /** 21 /**
@@ -23,13 +24,20 @@ Component({ @@ -23,13 +24,20 @@ Component({
23 methods: { 24 methods: {
24 hide(){ 25 hide(){
25 this.setData({ 26 this.setData({
26 - display:false, 27 + hiddenAni:'discountHide',
27 }) 28 })
28 - this.triggerEvent('hide') 29 + setTimeout(()=>{
  30 + this.setData({
  31 + display:false,
  32 + hiddenAni:'',
  33 + })
  34 + this.triggerEvent('hide')
  35 + },250)
29 }, 36 },
30 show(){ 37 show(){
31 this.setData({ 38 this.setData({
32 display:true, 39 display:true,
  40 + hiddenAni:'',
33 }) 41 })
34 this.triggerEvent('show') 42 this.triggerEvent('show')
35 }, 43 },
1 <!--components/reserve/discount.wxml--> 1 <!--components/reserve/discount.wxml-->
2 <view class="mask" bindtap="hide" wx:if="{{display}}"> 2 <view class="mask" bindtap="hide" wx:if="{{display}}">
3 - <view class="discount" catchtap=""> 3 + <view class="discount {{hiddenAni}}" catchtap="">
4 <view class="discount-name Semibold" bindtap="hide"> 4 <view class="discount-name Semibold" bindtap="hide">
5 优惠信息 5 优惠信息
6 <view class="close"></view> 6 <view class="close"></view>
@@ -10,6 +10,9 @@ @@ -10,6 +10,9 @@
10 padding: 30rpx 5%; 10 padding: 30rpx 5%;
11 animation: discountShow 0.3s; 11 animation: discountShow 0.3s;
12 } 12 }
  13 +.discount.discountHide{
  14 + animation: discountHide 0.3s;
  15 +}
13 .discount view{ 16 .discount view{
14 background-size: 100% 100%; 17 background-size: 100% 100%;
15 } 18 }
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <text class="label_text" >{{seller.label_cstr}}</text> 54 <text class="label_text" >{{seller.label_cstr}}</text>
55 </view> 55 </view>
56 </view> 56 </view>
57 - <view style="height: {{pagesHeight}};display:{{pagesHeight=='auto'?'block':'none'}}"> 57 + <view style="display:{{pagesHeight=='auto'?'block':'none'}}">
58 <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}"> 58 <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">
59 <view class="addr-view" bindtap="lookLocation"> 59 <view class="addr-view" bindtap="lookLocation">
60 <view class="addr-text flex-ll"> 60 <view class="addr-text flex-ll">
@@ -79,103 +79,105 @@ @@ -79,103 +79,105 @@
79 </view> 79 </view>
80 </view> 80 </view>
81 </view> 81 </view>
82 - <view class="black20line"></view>  
83 - <view class="seller" wx:if="{{seller.activity.length>0}}">  
84 - <formids bindclick="showDiscount">  
85 - <view class="activity-view-easy flex-lr" >  
86 - <view class="activity-left flex-ll">  
87 - <view class="icon"></view>  
88 - <block wx:for="{{seller.activity}}"  
89 - wx:key="seller.activity.key"  
90 - wx:if="{{index<2}}">  
91 - <view class="discount" >{{item.title}}</view>  
92 - </block>  
93 - </view>  
94 - <view class="flex-rr activity-right">  
95 - <view class="more-text">更多</view>  
96 - <view class="more"></view> 82 + <view style="display:{{pagesHeight=='auto'?'block':'none'}}">
  83 + <view class="black20line"></view>
  84 + <view class="seller" wx:if="{{seller.activity.length>0}}">
  85 + <formids bindclick="showDiscount">
  86 + <view class="activity-view-easy flex-lr" >
  87 + <view class="activity-left flex-ll">
  88 + <view class="icon"></view>
  89 + <block wx:for="{{seller.activity}}"
  90 + wx:key="seller.activity.key"
  91 + wx:if="{{index<2}}">
  92 + <view class="discount" >{{item.title}}</view>
  93 + </block>
  94 + </view>
  95 + <view class="flex-rr activity-right">
  96 + <view class="more-text">更多</view>
  97 + <view class="more"></view>
  98 + </view>
97 </view> 99 </view>
98 - </view>  
99 - </formids>  
100 - <!--  
101 - <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">  
102 - <view class="activity-view" >  
103 - <view class="activity" >  
104 - <view class="flex-lr">  
105 - <view class="activity-left">  
106 - <view class="activity-first flex-ll" style="align-items: flex-start">  
107 - <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>  
108 - <view class="flex-cc discount" wx:for="{{seller.activity}}"  
109 - wx:key="seller.activity.key"  
110 - wx:if="{{index<2}}">  
111 - <view class="discount-left"></view>  
112 - <view class="discount-text">{{item.title}}</view>  
113 - <view class="discount-right"></view> 100 + </formids>
  101 + <!--
  102 + <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">
  103 + <view class="activity-view" >
  104 + <view class="activity" >
  105 + <view class="flex-lr">
  106 + <view class="activity-left">
  107 + <view class="activity-first flex-ll" style="align-items: flex-start">
  108 + <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
  109 + <view class="flex-cc discount" wx:for="{{seller.activity}}"
  110 + wx:key="seller.activity.key"
  111 + wx:if="{{index<2}}">
  112 + <view class="discount-left"></view>
  113 + <view class="discount-text">{{item.title}}</view>
  114 + <view class="discount-right"></view>
  115 + </view>
114 </view> 116 </view>
115 </view> 117 </view>
  118 + <view class="activity-right flex-rr Semibold">
  119 + <view></view>
  120 + <view class="more"></view>
  121 + </view>
116 </view> 122 </view>
117 - <view class="activity-right flex-rr Semibold">  
118 - <view></view>  
119 - <view class="more"></view> 123 + <view class="activity-text">
  124 + 该优惠仅适用于一键订平台预订客户
120 </view> 125 </view>
121 </view> 126 </view>
122 - <view class="activity-text">  
123 - 该优惠仅适用于一键订平台预订客户  
124 - </view>  
125 </view> 127 </view>
126 - </view>  
127 - </formids>  
128 - -->  
129 - </view>  
130 - <view class="black20line" wx:if="{{seller.activity.length>0}}"></view>  
131 - <view class="block" wx:if="{{seller.room_image.length>0}}">  
132 - <view class="header flex-ll">  
133 - <view class="line"></view>  
134 - <view class="name">包间环境</view> 128 + </formids>
  129 + -->
135 </view> 130 </view>
136 - <scroll-view  
137 - scroll-x  
138 - class="baos"  
139 - scroll-into-view="{{toView}}"  
140 - scroll-top="{{scrollTop}}"  
141 - > 131 + <view class="black20line" wx:if="{{seller.activity.length>0}}"></view>
  132 + <view class="block" wx:if="{{seller.room_image.length>0}}">
  133 + <view class="header flex-ll">
  134 + <view class="line"></view>
  135 + <view class="name">包间环境</view>
  136 + </view>
  137 + <scroll-view
  138 + scroll-x
  139 + class="baos"
  140 + scroll-into-view="{{toView}}"
  141 + scroll-top="{{scrollTop}}"
  142 + >
142 143
143 - <block wx:for="{{seller.room_image}}" wx:key="sellers.key">  
144 - <view class="image">  
145 - <image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"  
146 - src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>  
147 - </view>  
148 - </block> 144 + <block wx:for="{{seller.room_image}}" wx:key="sellers.key">
  145 + <view class="image">
  146 + <image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
  147 + src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
  148 + </view>
  149 + </block>
149 150
150 - </scroll-view>  
151 - </view>  
152 - <view class="block" wx:if="{{seller.dishes.length>0}}">  
153 - <view class="header flex-ll">  
154 - <view class="line"></view>  
155 - <view class="name">推荐菜品</view> 151 + </scroll-view>
156 </view> 152 </view>
157 - <scroll-view  
158 - scroll-x  
159 - class="cais"  
160 - scroll-into-view="{{toView}}"  
161 - scroll-top="{{scrollTop}}"  
162 - >  
163 - <block wx:for="{{seller.dishes}}" wx:key="sellers.key">  
164 - <view class="cais-views" wx:if="{{item.image}}">  
165 - <view class="image-view" >  
166 - <view class="image">  
167 - <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"  
168 - src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image> 153 + <view class="block" wx:if="{{seller.dishes.length>0}}">
  154 + <view class="header flex-ll">
  155 + <view class="line"></view>
  156 + <view class="name">推荐菜品</view>
  157 + </view>
  158 + <scroll-view
  159 + scroll-x
  160 + class="cais"
  161 + scroll-into-view="{{toView}}"
  162 + scroll-top="{{scrollTop}}"
  163 + >
  164 + <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
  165 + <view class="cais-views" wx:if="{{item.image}}">
  166 + <view class="image-view" >
  167 + <view class="image">
  168 + <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"
  169 + src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
  170 + </view>
  171 + <view class="text Semibold">{{item.name}}</view>
169 </view> 172 </view>
170 - <view class="text Semibold">{{item.name}}</view>  
171 </view> 173 </view>
  174 + </block>
  175 + </scroll-view>
  176 + <view class="cais-text">
  177 + <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
  178 + <view wx:if="{{!item.image}}">{{item.name}}</view>
  179 + </block>
172 </view> 180 </view>
173 - </block>  
174 - </scroll-view>  
175 - <view class="cais-text">  
176 - <block wx:for="{{seller.dishes}}" wx:key="sellers.key">  
177 - <view wx:if="{{!item.image}}">{{item.name}}</view>  
178 - </block>  
179 </view> 181 </view>
180 </view> 182 </view>
181 </view> 183 </view>