new 2.0

@@ -8,7 +8,7 @@
         </view>
         <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 title text-bold text-cut">{{seller.sellername}}</view>
+                <view class="view title text-bold text-cut margin-right-sm">{{seller.sellername}}</view>
                 <view class="view text-gray" style="font-size: 26rpx;">{{util.distance(seller.distance||seller.distance_centre)}}</view>
             </view>
             <view class="view flex align-center justify-between text-gray margin-top-xs" style="height: 36rpx;">
@@ -24,7 +24,7 @@
             <view class="view flex align-center margin-top-xs active" style="height: 36rpx;">
                 <block wx:for="{{seller.activity}}" wx:key="selleractivitykey" wx:if="{{index<3}}">
                     <view class="cu-tag line-yellow view">
-                        <text class="text-orange">{{item.title}}</text>
+                        <text class="text-orange">{{(item.type==2?'满赠':item.title)}}</text>
                     </view>
                 </block>
             </view>

@@ -262,6 +262,7 @@ Page({
       this.markertap({markerId:this.data.markers[0].id})
     }
   },
+  hasScrollToIng:false,
   markertap(e,scrollTo=true){
     if(!e.markerId || e.markerId=='local') return;
     let markers=this.data.markers
@@ -294,10 +295,13 @@ Page({
       markers: markers,
       activeSellerID:this.activeSellerID,
     };
+    this.hasScrollToIng=false
     if(scrollTo){
       obj.scrollSellerID=this.activeSellerID
+      this.hasScrollToIng=true
     }
     this.setData(obj)
+    setTimeout(()=>{this.hasScrollToIng=false},800)
   },
   filterGroupData:{},
   filterGroupEvent(e){
@@ -311,10 +315,11 @@ Page({
     }
   },
   scrollEvent(e){
+    if(this.hasScrollToIng)return;
     let idx=0
     if(e.detail.scrollTop>20){
-      idx=parseInt(e.detail.scrollTop/162)
-      let ms=(e.detail.scrollTop%162)>100?1:0;
+      idx=parseInt(e.detail.scrollTop/182)
+      let ms=(e.detail.scrollTop%(182*(idx>0?idx:1)))>80?1:0;
       idx+=ms;
     }
     this.debounce(()=>{

@@ -13,7 +13,11 @@
      enable-rotate
      subkey="SDEBZ-I74W4-QLGUX-XXYXU-HIR23-3QFBJ"
      layer-style="2"
-     style="width: 100%; height: 30vh;"></map>
+     style="width: 100%; height: 30vh;position: relative;">
+    <view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">
+        <image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
+    </view>
+</map>
 <view class="view content" style="height: 70vh;">
     <filter-group height="{{height}}"
                   id="filter-group"
@@ -59,7 +63,7 @@
                      scroll-into-view="seller-{{scrollSellerID}}"
                      scroll-with-animation
                      bindscroll="scrollEvent"
-                     style="width:100%;height: {{height-50}}px;">
+                     style="width:100%;height: calc(70vh - 50px);">
             <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}}"
@@ -73,9 +77,6 @@
 
 </view>
 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
-<view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">
-    <image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
-</view>
 <navigator url="/pages/me/index" hover-class="navigator-hover">
     <view style="top:{{meTop}}px;"
             class="me view flex flex-direction align-center justify-center bg-white round">

@@ -5,11 +5,11 @@ page{
   /*--barHeight: calc(98rpx + env(safe-area-inset-bottom));*/
 }
 .moveToLocation{
-  position: fixed;
+  position: absolute;
   width: 80rpx;
   height: 80rpx;
   right:0rpx;
-  top:280rpx;
+  bottom:0;
 }
 .moveToLocation-image{
   width: 40rpx;