new 2.0

@@ -6,10 +6,10 @@
             <image src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}" class="avatar-image" mode="aspectFill" lazy-load></image>
             <image src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}" class="avatar-image" mode="aspectFill" lazy-load></image>
             <view class="avatar-txt text-white text-xs text-center" wx:if="{{seller.brand.name}}">{{seller.brand.name}}</view>
             <view class="avatar-txt text-white text-xs text-center" wx:if="{{seller.brand.name}}">{{seller.brand.name}}</view>
         </view>
         </view>
-        <view class="view detail margin-left-sm flex-treble margin-top-sm">
+        <view class="view detail margin-left-sm flex-treble margin-top-sm text-cut">
             <view class="view flex align-center justify-between" style="height: 52rpx;">
             <view class="view flex align-center justify-between" style="height: 52rpx;">
-                <view class="title">{{seller.sellername}}</view>
-                <view class="text-gray" style="font-size: 26rpx;">{{util.distance(seller.distance||seller.distance_centre)}}</view>
+                <view class="view title text-cut">{{seller.sellername}}</view>
+                <view class="view text-gray" style="font-size: 26rpx;">{{util.distance(seller.distance||seller.distance_centre)}}</view>
             </view>
             </view>
             <view class="view flex align-center text-gray margin-top-xs" style="height: 36rpx;">
             <view class="view flex align-center text-gray margin-top-xs" style="height: 36rpx;">
                 <view class="caixi flex">
                 <view class="caixi flex">

@@ -99,4 +99,7 @@
     background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);
     background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);
     border-radius: 28rpx;
     border-radius: 28rpx;
     z-index: 1;
     z-index: 1;
+}
+.caixi-item+.caixi-item:before{
+    content: "/";
 }
 }

@@ -227,6 +227,16 @@ Page({
           }
           }
           markers.push(marker)
           markers.push(marker)
         })
         })
+        markers.push({
+          id: 'local',
+          iconPath: "http://nosqn.colorcun.com/2.0/home%20%288%29.png" + cates_version,
+          latitude: (this.user.latitude||def_latitude)+'',
+          longitude: (this.user.longitude||def_longitude)+'',
+          width: 15,
+          height: 29,
+          zIndex: 9999,
+          zIndexBak:9999,
+        })
         this.setData({
         this.setData({
           markers:markers,
           markers:markers,
         })
         })
@@ -239,6 +249,7 @@ Page({
     })
     })
   },
   },
   markertap(e){
   markertap(e){
+    if(!e.markerId || e.markerId=='local') return;
     let markers=this.data.markers
     let markers=this.data.markers
     this.activeSellerID = e.markerId
     this.activeSellerID = e.markerId
     let bl = 1.2;
     let bl = 1.2;

@@ -16,10 +16,17 @@
      style="width: 100%; height: 360rpx;"></map>
      style="width: 100%; height: 360rpx;"></map>
 <view class="view content" style="height: {{height}}px;">
 <view class="view content" style="height: {{height}}px;">
     <filter-group height="{{height}}"></filter-group>
     <filter-group height="{{height}}"></filter-group>
-    <scroll-view class="view scroll-view" scroll-y="true" bindscroll="scroll" style="width:100%;height: {{height-50}}px;">
-        <seller-card class="seller-card"
-                     activeSellerID="{{activeSellerID}}"
-                     seller="{{item}}" wx:for="{{sellers}}" wx:key="sellers"></seller-card>
+    <scroll-view class="view scroll-view" scroll-y="true"
+                 scroll-into-view="seller-{{activeSellerID}}"
+                 scroll-with-animation
+                 bindscroll="scroll" style="width:100%;height: {{height-50}}px;">
+        <block wx:for="{{sellers}}" wx:key="sellers">
+            <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
+                <seller-card class="seller-card" id="seller-{{item.id}}"
+                             activeSellerID="{{activeSellerID}}"
+                             seller="{{item}}" ></seller-card>
+            </navigator>
+        </block>
         <view class="view" style="height: 192rpx;"></view>
         <view class="view" style="height: 192rpx;"></view>
     </scroll-view>
     </scroll-view>
 </view>
 </view>