search page map

@@ -93,8 +93,20 @@ Component({
       let type = util.attr(e, 'type');
       if (type == 'oncall') {
         if(this.data.seller.is_online_reserve==1){
+          let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
+          if(this.data.seller.findSellerParamObj){
+            let findSellerParamObj=this.data.seller.findSellerParamObj
+            findSellerParamObj={
+              date:findSellerParamObj.when_date,
+              pnum:findSellerParamObj.several,
+            }
+            if(findSellerParamObj.daily>-1){
+              findSellerParamObj.section=['','morning','noon','night',''][findSellerParamObj.daily]
+            }
+            url=util.http_build_query(findSellerParamObj,url)
+          }
           return wx.navigateTo({
-            url:util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
+            url:url,
           })
         }
         let seller_tel = this.data.seller.seller_tel;

@@ -57,8 +57,12 @@
             <view class="number Semibold">
                 <block wx:if="{{seller.average>0 && hasAverage}}">¥{{seller.average}}元/人</block>
             </view>
-            <view class="phone flex-vc" id="reserve-button" catchtap="tapButton" data-type="oncall">
-                <text class="reserve-text">{{seller.is_online_reserve==1?'包间预订':'联系餐厅'}}</text>
+            <view class="phone flex-cc" id="reserve-button" catchtap="tapButton" data-type="oncall">
+                <block wx:if="seller.is_online_reserve==1">
+                    <view class="reserve-icon"></view>
+                    <text class="reserve-text">订包间</text>
+                </block>
+                <text class="reserve-text" wx:else="">联系餐厅</text>
             </view>
         </view>
     </view>

@@ -226,4 +226,11 @@
   overflow: hidden;
   text-overflow:ellipsis;
   max-width: 320rpx;
+}
+.reserve-icon{
+  background-image: url("http://qn.colorcun.com/reserve/images/ding.png");
+  width: 24rpx;
+  height: 24rpx;
+  background-size: 100% 100%;
+  margin-right: 10rpx;
 }
\ No newline at end of file

@@ -504,6 +504,9 @@ Page({
             hasMark=true;
           }
           if(hasMark){
+            if(this.findSellerData){
+              seller.findSellerParamObj=this.findSellerData.paramObj
+            }
             let marker={
               id: seller.id,
               iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version,
@@ -559,7 +562,7 @@ Page({
       let obj={
         hasSellers:now_sid.length>0,
         hasGetSellersEnd:true,
-        hasSearchLimit:tags.length>0 || this.data.multiIndex[0]>0
+        hasSearchLimit:(tags.length>0 || this.data.multiIndex[0]>0) || this.findSellerData
       }
       if(this.hasSellerConcat){
         obj.markers=this.data.markers.concat(markers);
@@ -658,7 +661,7 @@ Page({
     if(!this.hasSellerConcat){
       sdobj.markers=[]
     }
-
+    //this.findSellerData=null//清理搜索
     this.setData(sdobj)
   },
 
@@ -887,6 +890,7 @@ Page({
   },
   findSellerData:null,
   findSeller(){
+    if(this.data.listMoreCount<1 && !this.data.hasSearchLimit) return
     wx.navigateTo({
       url: './findSeller',
       success: res=> {

@@ -96,8 +96,9 @@
                 <view class="seller" wx:if="{{hasGetSellersEnd}}">
                     <view class="empty">
                         <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">
-                            <view class="info-msg Semibold">已扩大范围为你找到餐厅</view>
-                            <view class="info-button flex-lr">
+                            <view class="info-msg Semibold" style="margin-top: 58rpx;">已扩大范围为你找到餐厅</view>
+                            <view class="info-txt">当前范围没有找到符合条件的餐厅</view>
+                            <view class="info-button flex-lr" style="display: flex;margin-top: 50rpx;margin-left: 0;">
                                 <view>去挑选</view>
                                 <view class="info-button-gt"></view>
                             </view>
@@ -112,7 +113,7 @@
                                 <view class="info-button-gt"></view>
                             </button>
                         </view>
-                        <view class="info" wx:else="hasSearchLimit" bindtap="setTSLocal">
+                        <view class="info" wx:else="" bindtap="setTSLocal">
                             <view class="info-msg Semibold">你可以切换到其他城市看看</view>
                             <view class="info-button full flex-lr">
                                 <view>唐山市</view>

@@ -117,6 +117,27 @@ page{
 .enabled .tags{
   color: #353535;
 }
+.disabled .fingSeller{
+  color: #999;
+}
+.disabled .fingSeller .icon{
+  position: relative;
+  background: none;
+}
+.disabled .fingSeller .icon:after{
+  content: '';
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: url('http://qn.colorcun.com/reserve/images/find-black.png');
+  background-size: 100% 100%;
+  opacity: 0.5;
+}
 .tags.active .picker .more{
   background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png");
 }

@@ -268,6 +268,11 @@ Page({
     //     }
     //   }
     // })
+    sellers.forEach(seller=>{
+      if(this.findSellerData){
+        seller.findSellerParamObj=this.findSellerData.paramObj
+      }
+    })
     return sellers;
   },
   dispalySearchHow(){