golist

@@ -85,10 +85,10 @@ Component({
         this.param.cuisine=mapParam.cuisine
       }
       App.Customer.SellerLists(this.param).then(res=>{
-        this.setData({
-          hasMore:res.data.length==this.size,
-          markers:res.data,
-        })
+        // this.setData({
+        //   hasMore:res.data.length==this.size,
+        //   markers:res.data,
+        // })
         this.triggerEvent('event',{type:'getListEnd',total:res.data.length})
       })
     },

 <!--components/reserve/caixi.wxml-->
+<!--
 <cover-view class="mask" hidden="{{hidden}}">
     <cover-view class="header flex-lr" style="height: {{titleBarHeight}}px;padding-top: {{statusBarHeight}}px;" catchtap="hide">
         <cover-view class="searchList flex-ll">
@@ -37,3 +38,4 @@
         </cover-view>
     </cover-view>
 </cover-view>
+-->

@@ -4,6 +4,7 @@ import util from '../../utils/util';
 import App from '../../utils/api';
 import DA from './data';
 import reddot from '../../utils/reddot';
+import PubSub from '../../utils/PubSub'
 const {regeneratorRuntime} = global
 const mapScale=15//18;
 const transverseViewHeight=232;
@@ -82,6 +83,18 @@ Page({
       "statReachBottom": true,
       "lauchOpts": options, //渠道分析
     });
+    PubSub.on(
+      'searchParam',
+      data=>{
+        console.log('searchParam.msg',data)
+        if(data.fun=='tagsChange'){
+          this.tagsChange(data.e);
+        }
+        if(data.fun=='caixiActive'){
+          this.caixiActive(data.e);
+        }
+      }
+    )
     reddot.init()
   },
 
@@ -537,6 +550,7 @@ Page({
     let sdobj={
       map: map,
       hasSuggestion:false,
+      hasGetSellersEnd:false,
     }
     if(!this.hasSellerConcat){
       sdobj.markers=[]
@@ -578,6 +592,7 @@ Page({
       map: map,
       hasSuggestion:true,
       suggestion:suggestion,
+      hasGetSellersEnd:false,
     }
     if(!this.hasSellerConcat){
       sdobj.markers=[]
@@ -652,7 +667,6 @@ Page({
         }
       })
     }
-    if(mks.length<1) return mks;
     //if(this.data.hasSuggestion){
       let map = this.data.map;
       mks.push({

@@ -67,7 +67,7 @@
                         </view>
                     </swiper-item>
                 </block>
-                <swiper-item bindtap="gotoDetail2">
+                <swiper-item bindtap="gotoDetail2" wx:if="{{hasGetSellersEnd}}">
                     <view class="seller seller-last" id="seller-last">
                         <view class="empty">
                             <view class="info">
@@ -83,10 +83,13 @@
                 <view class="seller" wx:if="{{hasGetSellersEnd}}">
                     <view class="empty" bindtap="listShow">
                         <view class="info">
-                            <view class="info-msg Semibold">已扩大范围为你找到餐厅，去查看</view>
+                            <view class="info-msg Semibold">已扩大范围为你找到餐厅</view>
                             <view class="info-txt">当前范围没有找到符合条件的餐厅</view>
+                            <view class="info-button flex-lr">
+                                去挑选
+                                <view class="info-button-gt"></view>
+                            </view>
                         </view>
-                        <view class="icon"></view>
                     </view>
                 </view>
             </view>

@@ -63,7 +63,6 @@
   border-radius: 6rpx;
   box-shadow: 0 4rpx 8rpx 0 #E0E0E0;
   position: relative;
-  margin: 20rpx auto 0;
 }
 .transverse-list .seller-last .empty{
   width: 100%;
@@ -131,12 +130,12 @@
   border-radius: 30rpx;
   line-height: 60rpx;
   color:#999999;
-  font-size: 28rpx;
+  font-size: 24rpx;
 }
 .searchAddr .icon{
-  min-width: 26rpx;
-  width: 26rpx;
-  height: 26rpx;
+  min-width: 22rpx;
+  width: 22rpx;
+  height: 22rpx;
   margin: 0 20rpx;
 }
 .searchAddr .title{
@@ -159,7 +158,7 @@
 .searchList .icon{
   min-width: 24rpx;
   width: 24rpx;
-  height: 18rpx;
+  height: 24rpx;
   margin: 0 8rpx 0 14rpx;
 }
 .searchList .title{
@@ -174,6 +173,45 @@
   line-height: 300rpx;
   font-size: 34rpx;
 }
+.empty-txt .seller{
+
+}
+.empty-txt .seller .empty{
+  background-image: url("http://qn.colorcun.com/reserve/images/empty-seller.png");
+  background-size: 100% 100%;
+  border-left-width: 0;
+  margin: 20rpx auto 0;
+}
+.empty-txt .seller .empty .info{
+  margin-top: 52rpx;
+  margin-left: 30rpx;
+}
+.empty-txt .seller .empty .info .info-msg{
+  margin-bottom: 14rpx;
+  font-size: 34rpx;
+}
+.empty-txt .seller .empty .info .info-txt{
+  font-size: 24rpx;
+}
+.info-button{
+  margin-top: 50rpx;
+  border: 2rpx solid #F05522;
+  border-radius: 28rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  padding: 0 20rpx;
+  color: #F05522;
+  font-size: 28rpx;
+  width: 106rpx;
+  max-width: 106rpx;
+}
+.info-button-gt{
+  background-image: url("http://qn.colorcun.com/reserve/images/gt-cheng.png");
+  background-size: 100% 100%;
+  width: 10rpx;
+  height: 20rpx;
+
+}
 
 .transverse-search .tags{
   height: 50rpx;

@@ -3,6 +3,7 @@ import util from '../../utils/util';
 import App from '../../utils/api';
 import DA from './data';
 const {regeneratorRuntime} = global
+import PubSub from '../../utils/PubSub'
 Page({
 
   /**
@@ -144,6 +145,13 @@ Page({
         value:[e.detail]
       }
     })
+    PubSub.emit(
+      'searchParam',
+      {
+        fun:'caixiActive',
+        e:e,
+      }
+    )
   },
   bindMultiPickerChange(e){
     console.log(e);
@@ -168,6 +176,13 @@ Page({
     this.setData({
       tags:tags,
     })
+    PubSub.emit(
+      'searchParam',
+      {
+        fun:'tagsChange',
+        e:e,
+      }
+    )
     setTimeout(()=>{this.getList();},0)
   },
 })
\ No newline at end of file