xt / xcx-book · Commits

Go to a project

Commit dfaa800527a7753fba44f40494e1a05a72438bf1

Authored by vking
2 parents 159b8389 a2901be3

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

# Conflicts:
#	pages/reserve/index.json
#	pages/reserve/index.wxml
Inline Side-by-side
Showing 2 changed files with 0 additions and 2 deletions
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
10 "a2l":"/components/tips/add-to-lite", 10 "a2l":"/components/tips/add-to-lite",
11 "boost":"/components/tips/boost", 11 "boost":"/components/tips/boost",
12 - "ds":"/components/tips/discount",  
13 "caixi":"/components/reserve/caixi", 12 "caixi":"/components/reserve/caixi",
14 "list":"/components/reserve/seller-box-transverse-cview/list", 13 "list":"/components/reserve/seller-box-transverse-cview/list",
15 "activity-enter":"/components/activity/enter" 14 "activity-enter":"/components/activity/enter"
@@ -136,7 +136,6 @@ @@ -136,7 +136,6 @@
136 <getpos bindpos="onpos" id="getpos"></getpos> 136 <getpos bindpos="onpos" id="getpos"></getpos>
137 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box> 137 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
138 <cover-view class="tab-patch"></cover-view> 138 <cover-view class="tab-patch"></cover-view>
139 -<ds wx:if="{{hasSetActivity && hasGetPos}}" map="{{map}}" id="ds"></ds>  
140 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l> 139 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l>
141 <list id="list" bindevent="listEvent" 140 <list id="list" bindevent="listEvent"
142 multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list> 141 multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list>