C端调整

@@ -15,7 +15,7 @@ const renNum=function(){
   return arr;
 }
 const cates_version='?1.1';
-const hasSellerConcat=true;//变量存储所有商户
+const hasSellerConcat=false;//变量存储所有商户
 const def_latitude=39.684670;
 const def_longitude=118.176300;
 Page({
@@ -205,11 +205,14 @@ Page({
     this.user.latitude = res.latitude;
     this.user.longitude = res.longitude;
     map.height = this.systemInfo.windowHeight-this.transverseViewHeight
-    this.setData({
+    let sdobj={
       map: map,
-      markers:[],
       hasSuggestion:false,
-    })
+    }
+    if(!this.hasSellerConcat){
+      sdobj.markers=[]
+    }
+    this.setData(sdobj)
     if(this.mapCtx){
       //this.mapCtx.moveToLocation();
       this.mapCtx.getRegion({
@@ -527,11 +530,14 @@ Page({
     map.longitude = this.user.longitude;
     map.scale=mapScale;
     map.height = this.systemInfo.windowHeight-this.transverseViewHeight
-    this.setData({
+    let sdobj={
       map: map,
-      markers:[],
       hasSuggestion:false,
-    })
+    }
+    if(!this.hasSellerConcat){
+      sdobj.markers=[]
+    }
+    this.setData(sdobj)
     this.mapCtx.moveToLocation({
       success:(res)=>{
         console.log('moveToLocation',res)
@@ -549,9 +555,11 @@ Page({
     if(val[0]>0){
       this.hasSellerConcat=false;
     }else{
-      this.setData({
-        markers:[],
-      })
+      if(!this.hasSellerConcat){
+        this.setData({
+          markers:[]
+        })
+      }
     }
     setTimeout(()=>{this.getMarkers();},0)
   },
@@ -562,12 +570,15 @@ Page({
     map.longitude=suggestion.longitude
     this.sellersIds=[]
     this.sellers=[]
-    this.setData({
-      markers:[],
-      suggestion:suggestion,
+    let sdobj={
+      map: map,
       hasSuggestion:true,
-      map:map,
-    })
+      suggestion:suggestion,
+    }
+    if(!this.hasSellerConcat){
+      sdobj.markers=[]
+    }
+    this.setData(sdobj)
   },
 
   getClassNameFlag:true,
@@ -670,9 +681,11 @@ Page({
     if(activeNum>0){
       this.hasSellerConcat=false;
     }else{
-      this.setData({
-        markers:[],
-      })
+      if(!this.hasSellerConcat){
+        this.setData({
+          markers:[]
+        })
+      }
     }
     setTimeout(()=>{this.getMarkers();},0)