Merge remote-tracking branch 'origin/master' into master-boost

# Conflicts:
#	pages/reserve/index.json
#	pages/reserve/index.wxml

@@ -9,7 +9,6 @@
     "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
     "a2l":"/components/tips/add-to-lite",
     "boost":"/components/tips/boost",
-    "ds":"/components/tips/discount",
     "caixi":"/components/reserve/caixi",
     "list":"/components/reserve/seller-box-transverse-cview/list",
     "activity-enter":"/components/activity/enter"

@@ -136,7 +136,6 @@
 <getpos bindpos="onpos" id="getpos"></getpos>
 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
 <cover-view class="tab-patch"></cover-view>
-<ds wx:if="{{hasSetActivity && hasGetPos}}" map="{{map}}" id="ds"></ds>
 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l>
 <list id="list" bindevent="listEvent"
       multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list>