地图优化

@@ -14,6 +14,7 @@ const renNum=function(){
   return arr;
   return arr;
 }
 }
 const cates_version='?1.1';
 const cates_version='?1.1';
+const hasSellerConcat=true;//变量存储所有商户
 Page({
 Page({
 
 
   /**
   /**
@@ -28,7 +29,7 @@ Page({
     },
     },
     markers: [],
     markers: [],
     //polygons:{},
     //polygons:{},
-    sellers:[],
+    //sellers:[],
     multiArray: [['不确定'], ['全部菜系']],
     multiArray: [['不确定'], ['全部菜系']],
     multiIndex: [0, 0],
     multiIndex: [0, 0],
     //scrollIntoView:'',
     //scrollIntoView:'',
@@ -269,6 +270,7 @@ Page({
     let markers=this.data.markers;
     let markers=this.data.markers;
     console.log('markertap',e)
     console.log('markertap',e)
     let bl=1.2;
     let bl=1.2;
+    let current=0,hasCurrent=true;
     markers.forEach((m,i)=>{
     markers.forEach((m,i)=>{
       m.iconPath=m.iconPath.replace('/cates-active/','/cates/')
       m.iconPath=m.iconPath.replace('/cates-active/','/cates/')
       m.zIndex=m.zIndexBak
       m.zIndex=m.zIndexBak
@@ -298,22 +300,19 @@ Page({
           m.callout.borderColor= '#F05522';
           m.callout.borderColor= '#F05522';
           m.callout.bgColor= '#F05522';
           m.callout.bgColor= '#F05522';
         }
         }
+        hasCurrent=false
+      }
+      if(m.display!='none' && hasCurrent){
+        current++
       }
       }
     })
     })
     let obj={
     let obj={
       markers:markers,
       markers:markers,
     };
     };
+    console.log('markertap::current,',current);
     if(flag){
     if(flag){
-      let current=0;
       //obj.scrollIntoView='seller-'+e.markerId;
       //obj.scrollIntoView='seller-'+e.markerId;
-      this.sellers.forEach(se=>{
-        if(se.id==e.markerId){
-          obj.current=current;
-          return true;
-        }else if(se.display!='none'){
-          current++;
-        }
-      })
+      obj.current=current;
       this.hasMarkertap=true;
       this.hasMarkertap=true;
     }
     }
     this.setData(obj)
     this.setData(obj)
@@ -355,7 +354,6 @@ Page({
       },300)
       },300)
     }
     }
     let markers = [];
     let markers = [];
-    let sellers=this.data.sellers;
     let param={
     let param={
       lat: this.user.latitude,
       lat: this.user.latitude,
       lng: this.user.longitude,
       lng: this.user.longitude,
@@ -386,9 +384,10 @@ Page({
             }else{
             }else{
               seller.distance+='米';
               seller.distance+='米';
             }
             }
-            this.sellersIds.push(seller.id);
+            if(hasSellerConcat){
+              this.sellersIds.push(seller.id);
+            }
             hasMark=true;
             hasMark=true;
-            sellers.push(seller);
           }
           }
           if(hasMark){
           if(hasMark){
             let marker={
             let marker={
@@ -401,6 +400,7 @@ Page({
               //title:seller.seller_name,
               //title:seller.seller_name,
               zIndex:sellersLength-si,
               zIndex:sellersLength-si,
               zIndexBak:sellersLength-si,
               zIndexBak:sellersLength-si,
+              seller:seller,
             };
             };
             if(seller.mode.length>0){
             if(seller.mode.length>0){
               seller.mode.forEach(x=>{
               seller.mode.forEach(x=>{
@@ -439,23 +439,21 @@ Page({
         console.log('接口报错了');
         console.log('接口报错了');
       }
       }
       this.sellersNow=now_sid;
       this.sellersNow=now_sid;
-      sellers.forEach(se=>{
-        se.display='none'
-        if(now_sid._indexOf(se.id)>-1){
-          se.display='';
-        }
-      })
-      this.sellers = sellers;
-      let obj={
-        sellers:sellers,
-      }
+      let obj={}
       if(markers.length>0){
       if(markers.length>0){
-        obj.markers=this.data.markers.concat(markers);
-      }
-      if(sellers.length<this.data.current){
-        obj.current=0
+        if(hasSellerConcat){
+          obj.markers=this.data.markers.concat(markers);
+        }else{
+          obj.markers=markers;
+        }
+        obj.markers.forEach(mk=>{
+          //mk.display='none';
+          if(now_sid._indexOf(mk.id)>-1){
+            mk.display='';
+          }
+        })
+        this.setData(obj)
       }
       }
-      this.setData(obj)
     })
     })
 
 
   },
   },
@@ -523,9 +521,12 @@ Page({
       return;
       return;
     }
     }
     let i=e.detail.current
     let i=e.detail.current
-    this.activeSellerID=this.sellersNow[i];
+    // this.activeSellerID=this.sellersNow[i];
+    // this.markertap({
+    //   markerId:this.activeSellerID
+    // },false)
     this.markertap({
     this.markertap({
-      markerId:this.activeSellerID
+      markerId:this.data.markers[i].id
     },false)
     },false)
   },
   },
   gotoDetail(e){
   gotoDetail(e){

@@ -50,10 +50,10 @@
                     interval="2000" duration="500"
                     interval="2000" duration="500"
                     previous-margin="{{20}}px" next-margin="{{20}}px"
                     previous-margin="{{20}}px" next-margin="{{20}}px"
                     current="{{current}}" bindchange="bindtransition">
                     current="{{current}}" bindchange="bindtransition">
-                <block wx:for="{{sellers}}" wx:key="sellers.key">
+                <block wx:for="{{markers}}" wx:key="markers.key">
                     <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
                     <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
                         <view class="seller" id="seller-{{item.id}}">
                         <view class="seller" id="seller-{{item.id}}">
-                            <sb-tr seller="{{item}}" hasActivity="{{true}}"></sb-tr>
+                            <sb-tr seller="{{item.seller}}" hasActivity="{{true}}"></sb-tr>
                         </view>
                         </view>
                     </swiper-item>
                     </swiper-item>
                 </block>
                 </block>