Commit 6d4fdfa6b634f900f28291453aca00c36bf822ec

Authored by vking
1 parent 6bf7a16c

remove s接口

@@ -500,13 +500,13 @@ Page({ @@ -500,13 +500,13 @@ Page({
500 if(this.findSellerData){ 500 if(this.findSellerData){
501 param=Object.assign(param,this.findSellerData.paramObj) 501 param=Object.assign(param,this.findSellerData.paramObj)
502 } 502 }
503 - this.selectComponent('#list').getList(param); 503 + //this.selectComponent('#list').getList(param);
504 this.param=param; 504 this.param=param;
505 let now_sid=[]; 505 let now_sid=[];
506 App.Customer.SellerList(param).then(async res => { 506 App.Customer.SellerList(param).then(async res => {
507 //this.mapData.region.southwest.latitude=''; 507 //this.mapData.region.southwest.latitude='';
508 if (res.ret == 200) { 508 if (res.ret == 200) {
509 - let sellersList=res.data; 509 + let sellersList=res.data.list;
510 let sellersLength=sellersList.length; 510 let sellersLength=sellersList.length;
511 sellersList.forEach((seller,si) => { 511 sellersList.forEach((seller,si) => {
512 now_sid.push(seller.id); 512 now_sid.push(seller.id);
@@ -584,7 +584,8 @@ Page({ @@ -584,7 +584,8 @@ Page({
584 let obj={ 584 let obj={
585 hasSellers:now_sid.length>0, 585 hasSellers:now_sid.length>0,
586 hasGetSellersEnd:true, 586 hasGetSellersEnd:true,
587 - hasSearchLimit:(tags.length>0 || this.data.multiIndex[0]>0) || this.findSellerData 587 + hasSearchLimit:(tags.length>0 || this.data.multiIndex[0]>0) || this.findSellerData,
  588 + listMoreCount:res.data.flag
588 } 589 }
589 if(this.hasSellerConcat){ 590 if(this.hasSellerConcat){
590 obj.markers=this.data.markers.concat(markers); 591 obj.markers=this.data.markers.concat(markers);
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
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 "caixi":"/components/reserve/caixi", 12 "caixi":"/components/reserve/caixi",
13 - "list":"/components/reserve/seller-box-transverse-cview/list",  
14 "activity-enter":"/components/activity/enter", 13 "activity-enter":"/components/activity/enter",
15 "as-phone":"/components/actionSheet/phone", 14 "as-phone":"/components/actionSheet/phone",
16 "activity-tips":"/components/tips/discount" 15 "activity-tips":"/components/tips/discount"
@@ -133,14 +133,12 @@ @@ -133,14 +133,12 @@
133 <view bindtap="moveToLocation" class="moveToLocation"> 133 <view bindtap="moveToLocation" class="moveToLocation">
134 <image src="http://nosqn.colorcun.com/reserve/images/golocal.png"></image> 134 <image src="http://nosqn.colorcun.com/reserve/images/golocal.png"></image>
135 </view> 135 </view>
136 -<view class="toast" wx:if="{{hasGetSellersEnd && listMoreCount<1 && !hasSearchLimit && markers.length<2}}">该地区没有可供预订的餐厅哦!努力开通中</view>  
137 -<view class="toast" wx:if="{{hasGetSellersEnd && markers.length<2 && listMoreCount>0}}">移动或缩放地图,获取更多餐厅</view> 136 +<view class="toast" wx:if="{{hasGetSellersEnd && listMoreCount<1 && !hasSearchLimit}}">该地区没有可供预订的餐厅哦!努力开通中</view>
  137 +<view class="toast" wx:if="{{hasGetSellersEnd && markers.length<3 && listMoreCount>0}}">移动或缩放地图,获取更多餐厅</view>
138 <getpos bindpos="onpos" id="getpos"></getpos> 138 <getpos bindpos="onpos" id="getpos"></getpos>
139 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box> 139 <seller-box id="seller-box" bindevent="sellerBoxEvent"></seller-box>
140 <cover-view class="tab-patch"></cover-view> 140 <cover-view class="tab-patch"></cover-view>
141 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l> 141 <a2l bindshow="a2lshow" bindhide="a2lshow" key="INDEX"></a2l>
142 -<list id="list" bindevent="listEvent"  
143 - multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list>  
144 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" 142 <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
145 bindactive="caixiActive" id="caixi" 143 bindactive="caixiActive" id="caixi"
146 ></caixi> 144 ></caixi>
@@ -63,7 +63,7 @@ export default { @@ -63,7 +63,7 @@ export default {
63 63
64 //地图页-商家 64 //地图页-商家
65 'App.Customer.SellerList': { 65 'App.Customer.SellerList': {
66 - alias: 'App.Customer.NewSellerList' 66 + //alias: 'App.Customer.NewSellerList'
67 }, 67 },
68 68
69 //地图页-商家-列表 69 //地图页-商家-列表