Commit b8b62949ce8174a165f1a1963394bbe78829fb7f

Authored by vking
1 parent 9f8865ec

上拉进列表

@@ -872,6 +872,7 @@ Page({ @@ -872,6 +872,7 @@ Page({
872 }, 872 },
873 listShow(){ 873 listShow(){
874 //this.selectComponent('#list').show(); 874 //this.selectComponent('#list').show();
  875 + this.movableChangeInit()
875 wx.navigateTo({ 876 wx.navigateTo({
876 url:util.http_build_query({ 877 url:util.http_build_query({
877 lat:this.param.lat==def_latitude?'':this.param.lat, 878 lat:this.param.lat==def_latitude?'':this.param.lat,
@@ -892,6 +893,10 @@ Page({ @@ -892,6 +893,10 @@ Page({
892 this.findSellerData=findSellerData 893 this.findSellerData=findSellerData
893 setTimeout(()=>{this.getMarkers();},0) 894 setTimeout(()=>{this.getMarkers();},0)
894 }) 895 })
  896 + setTimeout(()=>{
  897 + this.movableChangeInit()
  898 + this.hasListShow=false
  899 + },1500)
895 } 900 }
896 }); 901 });
897 }, 902 },
@@ -949,4 +954,24 @@ Page({ @@ -949,4 +954,24 @@ Page({
949 this.selectComponent('#as').show(e.detail.seller); 954 this.selectComponent('#as').show(e.detail.seller);
950 } 955 }
951 }, 956 },
  957 + movableY0:99,
  958 + movableY1:0,
  959 + hasListShow:false,
  960 + movableChangeInit(){
  961 + this.movableY0=99
  962 + this.movableY1=0
  963 + },
  964 + movableChange(e){
  965 + if(this.hasListShow) return;
  966 + if(this.movableY0==99){
  967 + this.movableY0=e.detail.y
  968 + }else{
  969 + if(e.detail.y!=this.movableY0){
  970 + console.log('movableChange','上拉');
  971 + this.listShow();
  972 + this.movableChangeInit()
  973 + this.hasListShow=true
  974 + }
  975 + }
  976 + },
952 }) 977 })
@@ -17,15 +17,10 @@ @@ -17,15 +17,10 @@
17 layer-style="2" 17 layer-style="2"
18 style="width: 100%; height: {{map.height}}px;"></map> 18 style="width: 100%; height: {{map.height}}px;"></map>
19 </view> 19 </view>
20 - <view class="seller-view">  
21 - <!--  
22 - <view class="flex-vc transverse-view-top" bindtap="listShow" wx:if="{{hasGetSellersEnd && listMoreCount>0}}">  
23 - <view class="line"></view>  
24 - <view class="text">  
25 - <view>{{hasSellers?'查看其它':'已扩大范围为你找到'}}{{listMoreCount}}家餐厅</view>  
26 - </view>  
27 - </view>  
28 - --> 20 + <movable-area class="seller-view">
  21 + <movable-view direction="vertical" out-of-bounds
  22 + bindchange="movableChange"
  23 + class="movable-view">
29 <navigator url="./search" 24 <navigator url="./search"
30 bindtap="elog" data-ename="点击搜索框" hover-class="navigator-hover"> 25 bindtap="elog" data-ename="点击搜索框" hover-class="navigator-hover">
31 <view class="flex-ll transverse-view-search"> 26 <view class="flex-ll transverse-view-search">
@@ -96,7 +91,7 @@ @@ -96,7 +91,7 @@
96 </view> 91 </view>
97 </swiper-item> 92 </swiper-item>
98 </swiper> 93 </swiper>
99 - <view class="empty-txt flex-vc"> 94 + <view class="empty-txt flex-vc" wx:if="{{hasGetSellersEnd && markers.length<1}}">
100 <view class="seller" wx:if="{{hasGetSellersEnd}}"> 95 <view class="seller" wx:if="{{hasGetSellersEnd}}">
101 <view class="empty"> 96 <view class="empty">
102 <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow"> 97 <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">
@@ -112,7 +107,7 @@ @@ -112,7 +107,7 @@
112 <view class="info-txt">修改或减少条件,获取更多餐厅</view> 107 <view class="info-txt">修改或减少条件,获取更多餐厅</view>
113 <button class="button-none flex-lr info-button" 108 <button class="button-none flex-lr info-button"
114 style="display: flex;margin-top: 50rpx;margin-left: 0;" 109 style="display: flex;margin-top: 50rpx;margin-left: 0;"
115 - open-type="contact"> 110 + open-type="contact">
116 <view>人工帮订</view> 111 <view>人工帮订</view>
117 <view class="info-button-gt"></view> 112 <view class="info-button-gt"></view>
118 </button> 113 </button>
@@ -128,7 +123,8 @@ @@ -128,7 +123,8 @@
128 </view> 123 </view>
129 </view> 124 </view>
130 </view> 125 </view>
131 - </view> 126 + </movable-view>
  127 + </movable-area>
132 </view> 128 </view>
133 <view bindtap="moveToLocation" class="moveToLocation"> 129 <view bindtap="moveToLocation" class="moveToLocation">
134 <image src="http://nosqn.colorcun.com/reserve/images/golocal.png"></image> 130 <image src="http://nosqn.colorcun.com/reserve/images/golocal.png"></image>
@@ -373,4 +373,10 @@ page{ @@ -373,4 +373,10 @@ page{
373 padding: 0 20rpx; 373 padding: 0 20rpx;
374 background:rgba(254,254,254,1); 374 background:rgba(254,254,254,1);
375 box-sizing: border-box; 375 box-sizing: border-box;
  376 +}
  377 +
  378 +.movable-view{
  379 + width: 100%;
  380 + padding-top: 20rpx;
  381 + height: 426rpx;
376 } 382 }