xt / xcx-book · Commits

Go to a project

Commit b884f60c9b88ac7644610996b774e0e15c4634d7

Authored by vking
1 parent 5320a9b0

online

Inline Side-by-side
Showing 2 changed files with 21 additions and 19 deletions
@@ -88,8 +88,8 @@ @@ -88,8 +88,8 @@
88 } 88 }
89 @keyframes discountShow 89 @keyframes discountShow
90 { 90 {
91 - from {height: 0;}  
92 - to {height: 870rpx;} 91 + from {bottom: -870rpx;}
  92 + to {bottom: 0rpx;}
93 } 93 }
94 @keyframes discountHide 94 @keyframes discountHide
95 { 95 {
@@ -54,27 +54,29 @@ @@ -54,27 +54,29 @@
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 class="addr flex-lr" wx:if="{{hasOnlineReserve}}" >  
58 - <view class="addr-view" bindtap="lookLocation">  
59 - <view class="addr-text flex-ll">  
60 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
61 - <view class="text">{{seller.real_address||seller.map_address}}</view> 57 + <view style="height: {{pagesHeight}};display:{{pagesHeight=='auto'?'block':'none'}}">
  58 + <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">
  59 + <view class="addr-view" bindtap="lookLocation">
  60 + <view class="addr-text flex-ll">
  61 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
  62 + <view class="text">{{seller.real_address||seller.map_address}}</view>
  63 + </view>
  64 + <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
62 </view> 65 </view>
63 - <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view> 66 + <formids class="flex-vc" bindclick="reserveEvent" data-act="phone">
  67 + <view class="more more-phone"></view>
  68 + </formids>
64 </view> 69 </view>
65 - <formids class="flex-vc" bindclick="reserveEvent" data-act="phone">  
66 - <view class="more more-phone"></view>  
67 - </formids>  
68 - </view>  
69 - <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >  
70 - <view class="addr-view">  
71 - <view class="addr-text flex-ll">  
72 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
73 - <view class="text">{{seller.real_address||seller.map_address}}</view> 70 + <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >
  71 + <view class="addr-view">
  72 + <view class="addr-text flex-ll">
  73 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
  74 + <view class="text">{{seller.real_address||seller.map_address}}</view>
  75 + </view>
  76 + <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
74 </view> 77 </view>
75 - <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view> 78 + <view class="more more-addr"></view>
76 </view> 79 </view>
77 - <view class="more more-addr"></view>  
78 </view> 80 </view>
79 </view> 81 </view>
80 <view class="black20line"></view> 82 <view class="black20line"></view>