距离展示调整

@@ -47,7 +47,11 @@ Component({
     sellerStyle: {//特殊样式
     sellerStyle: {//特殊样式
       type: String,
       type: String,
       value: '',
       value: '',
-    }
+    },
+    hasSuggestion:{//是否有搜索目的地
+      type: Boolean,
+      value: false,
+    },
   },
   },
 
 
   /**
   /**

@@ -17,7 +17,7 @@
             <view class="text flex-ll">
             <view class="text flex-ll">
                 <view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view>
                 <view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</view>
                 <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
                 <view class="text-item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
-                <view class="text-item" wx:if="{{seller.distance>=0 && seller.distance!==''}}">{{util.distance(seller.distance_centre||seller.distance)}}</view>
+                <view class="text-item" wx:if="{{seller.distance>=0 && seller.distance!==''}}">{{hasSuggestion?'距搜索地':''}}{{util.distance(seller.distance_centre||seller.distance)}}</view>
             </view>
             </view>
             <view wx:if="{{hasStat}}" class="stat">
             <view wx:if="{{hasStat}}" class="stat">
                 <stat stat="{{seller.score}}"></stat>
                 <stat stat="{{seller.score}}"></stat>

@@ -462,7 +462,7 @@ Page({
     if(tags.length>0){
     if(tags.length>0){
       param.tags=tags;
       param.tags=tags;
     }
     }
-    param.centre_pos=`${this.mapData.latitude},${this.mapData.longitude}`
+    param.centre_pos=`${param.lat},${param.lng}`
     if(this.data.hasSuggestion){
     if(this.data.hasSuggestion){
       param.centre_pos=`${this.data.suggestion.latitude},${this.data.suggestion.longitude}`
       param.centre_pos=`${this.data.suggestion.latitude},${this.data.suggestion.longitude}`
     }
     }
@@ -730,6 +730,8 @@ Page({
 
 
     if(this.data.hasSuggestion){
     if(this.data.hasSuggestion){
       map=this.data.suggestion
       map=this.data.suggestion
+    }else{
+      map=this.data.map
     }
     }
     mks.push({
     mks.push({
       id: 'location',
       id: 'location',
@@ -806,6 +808,7 @@ Page({
         multiIndex:this.data.multiIndex,
         multiIndex:this.data.multiIndex,
         tags:this.param.tags,
         tags:this.param.tags,
         centre_pos:this.param.centre_pos,
         centre_pos:this.param.centre_pos,
+        hasSuggestion:this.data.hasSuggestion?1:''
       },'./indexList')
       },'./indexList')
     });
     });
   },
   },

@@ -71,6 +71,7 @@
                                    hasActivityTags="{{false}}"
                                    hasActivityTags="{{false}}"
                                    hasActivityShort="{{true}}"
                                    hasActivityShort="{{true}}"
                                    hasBrand="true" hasActivityTese="true"
                                    hasBrand="true" hasActivityTese="true"
+                                   hasSuggestion="{{hasSuggestion}}"
                                    hasSlogan="{{false}}"></sb-tr>
                                    hasSlogan="{{false}}"></sb-tr>
                         </view>
                         </view>
                     </swiper-item>
                     </swiper-item>

@@ -20,6 +20,7 @@ Page({
     markers:[],
     markers:[],
     hasMore:true,
     hasMore:true,
     hasDisabled:true,
     hasDisabled:true,
+    hasSuggestion:false,
   },
   },
 
 
   /**
   /**
@@ -28,6 +29,11 @@ Page({
   onLoad: async function (options) {
   onLoad: async function (options) {
     //lat=34.21719&lng=108.89155&map={"errMsg":"getMapRegion:ok","southwest":{"longitude":108.87545674591064,"latitude":34.204520114013846},"northeast":{"longitude":108.90764325408935,"latitude":34.229857981005225},"scale":15}&multiIndex=1&tags=1,2
     //lat=34.21719&lng=108.89155&map={"errMsg":"getMapRegion:ok","southwest":{"longitude":108.87545674591064,"latitude":34.204520114013846},"northeast":{"longitude":108.90764325408935,"latitude":34.229857981005225},"scale":15}&multiIndex=1&tags=1,2
     this.options=options;
     this.options=options;
+    if(options.hasSuggestion){
+      this.setData({
+        hasSuggestion:true
+      })
+    }
     let tags=[
     let tags=[
       {id:1,name:'环境好'},
       {id:1,name:'环境好'},
       {id:2,name:'菜品有特色'},
       {id:2,name:'菜品有特色'},

@@ -43,6 +43,7 @@
                        hasActivityShort="{{true}}"
                        hasActivityShort="{{true}}"
                        hasBrand="true" hasActivityTese="true"
                        hasBrand="true" hasActivityTese="true"
                        hasSlogan="{{false}}"
                        hasSlogan="{{false}}"
+                       hasSuggestion="{{hasSuggestion}}"
                        sellerStyle="noborder noshadow noradius"></sb-tr>
                        sellerStyle="noborder noshadow noradius"></sb-tr>
             </view>
             </view>
         </view>
         </view>

@@ -60,12 +60,12 @@ export default {
 
 
   //地图页-商家
   //地图页-商家
   'App.Customer.SellerList': {
   'App.Customer.SellerList': {
-    alias: 'App.Customer.NewSellerList'
+    //alias: 'App.Customer.NewSellerList'
   },
   },
 
 
   //地图页-商家-列表
   //地图页-商家-列表
   'App.Customer.SellerLists':{
   'App.Customer.SellerLists':{
-    alias: 'App.Customer.NewSellerLists'
+    //alias: 'App.Customer.NewSellerLists'
   },
   },
 
 
   //桌位列表
   //桌位列表