地图优化

@@ -14,7 +14,7 @@ const renNum=function(){
   return arr;
   return arr;
 }
 }
 const cates_version='?1.1';
 const cates_version='?1.1';
-const hasSellerConcat=false;//变量存储所有商户
+const hasSellerConcat=true;//变量存储所有商户
 Page({
 Page({
 
 
   /**
   /**
@@ -37,6 +37,7 @@ Page({
     hasSuggestion:false,
     hasSuggestion:false,
     current:0,
     current:0,
   },
   },
+  hasSellerConcat:hasSellerConcat,
   transverseViewHeight:transverseViewHeight,//横向滚动高度,苹果要比安卓多20
   transverseViewHeight:transverseViewHeight,//横向滚动高度,苹果要比安卓多20
   //qqmapsdk:null,
   //qqmapsdk:null,
   sellers: [],
   sellers: [],
@@ -385,7 +386,7 @@ Page({
             }else{
             }else{
               seller.distance+='米';
               seller.distance+='米';
             }
             }
-            if(hasSellerConcat){
+            if(this.hasSellerConcat){
               this.sellersIds.push(seller.id);
               this.sellersIds.push(seller.id);
             }
             }
             hasMark=true;
             hasMark=true;
@@ -441,7 +442,7 @@ Page({
       }
       }
       this.sellersNow=now_sid;
       this.sellersNow=now_sid;
       let obj={}
       let obj={}
-      if(hasSellerConcat){
+      if(this.hasSellerConcat){
         obj.markers=this.data.markers.concat(markers);
         obj.markers=this.data.markers.concat(markers);
       }else{
       }else{
         obj.markers=markers;
         obj.markers=markers;
@@ -484,9 +485,15 @@ Page({
   },
   },
   bindMultiPickerChange(e){
   bindMultiPickerChange(e){
     console.log(e);
     console.log(e);
+    let val=util.val(e);
     this.setData({
     this.setData({
-      multiIndex:util.val(e)
+      multiIndex:val
     })
     })
+    this.hasSellerConcat=hasSellerConcat;
+    if(val[0]>0 || val[1]>0){
+      this.hasSellerConcat=false;
+      this.sellersIds=[];
+    }
     this.getMarkers();
     this.getMarkers();
   },
   },
   setSuggestion(suggestion){
   setSuggestion(suggestion){