xt / xcx-book · Commits

Go to a project

Commit af1ee56b9fd3e368168191cedf90a4e668f11ee7

Authored by vking
1 parent 9d595995
build: skipped

search page map

Inline Side-by-side
Showing 7 changed files with 62 additions and 8 deletions
@@ -93,8 +93,20 @@ Component({ @@ -93,8 +93,20 @@ Component({
93 let type = util.attr(e, 'type'); 93 let type = util.attr(e, 'type');
94 if (type == 'oncall') { 94 if (type == 'oncall') {
95 if(this.data.seller.is_online_reserve==1){ 95 if(this.data.seller.is_online_reserve==1){
  96 + let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
  97 + if(this.data.seller.findSellerParamObj){
  98 + let findSellerParamObj=this.data.seller.findSellerParamObj
  99 + findSellerParamObj={
  100 + date:findSellerParamObj.when_date,
  101 + pnum:findSellerParamObj.several,
  102 + }
  103 + if(findSellerParamObj.daily>-1){
  104 + findSellerParamObj.section=['','morning','noon','night',''][findSellerParamObj.daily]
  105 + }
  106 + url=util.http_build_query(findSellerParamObj,url)
  107 + }
96 return wx.navigateTo({ 108 return wx.navigateTo({
97 - url:util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail') 109 + url:url,
98 }) 110 })
99 } 111 }
100 let seller_tel = this.data.seller.seller_tel; 112 let seller_tel = this.data.seller.seller_tel;
@@ -57,8 +57,12 @@ @@ -57,8 +57,12 @@
57 <view class="number Semibold"> 57 <view class="number Semibold">
58 <block wx:if="{{seller.average>0 && hasAverage}}">¥{{seller.average}}元/人</block> 58 <block wx:if="{{seller.average>0 && hasAverage}}">¥{{seller.average}}元/人</block>
59 </view> 59 </view>
60 - <view class="phone flex-vc" id="reserve-button" catchtap="tapButton" data-type="oncall">  
61 - <text class="reserve-text">{{seller.is_online_reserve==1?'包间预订':'联系餐厅'}}</text> 60 + <view class="phone flex-cc" id="reserve-button" catchtap="tapButton" data-type="oncall">
  61 + <block wx:if="seller.is_online_reserve==1">
  62 + <view class="reserve-icon"></view>
  63 + <text class="reserve-text">订包间</text>
  64 + </block>
  65 + <text class="reserve-text" wx:else="">联系餐厅</text>
62 </view> 66 </view>
63 </view> 67 </view>
64 </view> 68 </view>
@@ -226,4 +226,11 @@ @@ -226,4 +226,11 @@
226 overflow: hidden; 226 overflow: hidden;
227 text-overflow:ellipsis; 227 text-overflow:ellipsis;
228 max-width: 320rpx; 228 max-width: 320rpx;
  229 +}
  230 +.reserve-icon{
  231 + background-image: url("http://qn.colorcun.com/reserve/images/ding.png");
  232 + width: 24rpx;
  233 + height: 24rpx;
  234 + background-size: 100% 100%;
  235 + margin-right: 10rpx;
229 } 236 }
@@ -504,6 +504,9 @@ Page({ @@ -504,6 +504,9 @@ Page({
504 hasMark=true; 504 hasMark=true;
505 } 505 }
506 if(hasMark){ 506 if(hasMark){
  507 + if(this.findSellerData){
  508 + seller.findSellerParamObj=this.findSellerData.paramObj
  509 + }
507 let marker={ 510 let marker={
508 id: seller.id, 511 id: seller.id,
509 iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version, 512 iconPath: "http://qn.colorcun.com/custom/lite-online/cates/circle1x5.png"+cates_version,
@@ -559,7 +562,7 @@ Page({ @@ -559,7 +562,7 @@ Page({
559 let obj={ 562 let obj={
560 hasSellers:now_sid.length>0, 563 hasSellers:now_sid.length>0,
561 hasGetSellersEnd:true, 564 hasGetSellersEnd:true,
562 - hasSearchLimit:tags.length>0 || this.data.multiIndex[0]>0 565 + hasSearchLimit:(tags.length>0 || this.data.multiIndex[0]>0) || this.findSellerData
563 } 566 }
564 if(this.hasSellerConcat){ 567 if(this.hasSellerConcat){
565 obj.markers=this.data.markers.concat(markers); 568 obj.markers=this.data.markers.concat(markers);
@@ -658,7 +661,7 @@ Page({ @@ -658,7 +661,7 @@ Page({
658 if(!this.hasSellerConcat){ 661 if(!this.hasSellerConcat){
659 sdobj.markers=[] 662 sdobj.markers=[]
660 } 663 }
661 - 664 + //this.findSellerData=null//清理搜索
662 this.setData(sdobj) 665 this.setData(sdobj)
663 }, 666 },
664 667
@@ -887,6 +890,7 @@ Page({ @@ -887,6 +890,7 @@ Page({
887 }, 890 },
888 findSellerData:null, 891 findSellerData:null,
889 findSeller(){ 892 findSeller(){
  893 + if(this.data.listMoreCount<1 && !this.data.hasSearchLimit) return
890 wx.navigateTo({ 894 wx.navigateTo({
891 url: './findSeller', 895 url: './findSeller',
892 success: res=> { 896 success: res=> {
@@ -96,8 +96,9 @@ @@ -96,8 +96,9 @@
96 <view class="seller" wx:if="{{hasGetSellersEnd}}"> 96 <view class="seller" wx:if="{{hasGetSellersEnd}}">
97 <view class="empty"> 97 <view class="empty">
98 <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow"> 98 <view class="info" wx:if="{{listMoreCount>0}}" bindtap="listShow">
99 - <view class="info-msg Semibold">已扩大范围为你找到餐厅</view>  
100 - <view class="info-button flex-lr"> 99 + <view class="info-msg Semibold" style="margin-top: 58rpx;">已扩大范围为你找到餐厅</view>
  100 + <view class="info-txt">当前范围没有找到符合条件的餐厅</view>
  101 + <view class="info-button flex-lr" style="display: flex;margin-top: 50rpx;margin-left: 0;">
101 <view>去挑选</view> 102 <view>去挑选</view>
102 <view class="info-button-gt"></view> 103 <view class="info-button-gt"></view>
103 </view> 104 </view>
@@ -112,7 +113,7 @@ @@ -112,7 +113,7 @@
112 <view class="info-button-gt"></view> 113 <view class="info-button-gt"></view>
113 </button> 114 </button>
114 </view> 115 </view>
115 - <view class="info" wx:else="hasSearchLimit" bindtap="setTSLocal"> 116 + <view class="info" wx:else="" bindtap="setTSLocal">
116 <view class="info-msg Semibold">你可以切换到其他城市看看</view> 117 <view class="info-msg Semibold">你可以切换到其他城市看看</view>
117 <view class="info-button full flex-lr"> 118 <view class="info-button full flex-lr">
118 <view>唐山市</view> 119 <view>唐山市</view>
@@ -117,6 +117,27 @@ page{ @@ -117,6 +117,27 @@ page{
117 .enabled .tags{ 117 .enabled .tags{
118 color: #353535; 118 color: #353535;
119 } 119 }
  120 +.disabled .fingSeller{
  121 + color: #999;
  122 +}
  123 +.disabled .fingSeller .icon{
  124 + position: relative;
  125 + background: none;
  126 +}
  127 +.disabled .fingSeller .icon:after{
  128 + content: '';
  129 + display: block;
  130 + width: 100%;
  131 + height: 100%;
  132 + position: absolute;
  133 + top: 0;
  134 + right: 0;
  135 + bottom: 0;
  136 + left: 0;
  137 + background: url('http://qn.colorcun.com/reserve/images/find-black.png');
  138 + background-size: 100% 100%;
  139 + opacity: 0.5;
  140 +}
120 .tags.active .picker .more{ 141 .tags.active .picker .more{
121 background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); 142 background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png");
122 } 143 }
@@ -268,6 +268,11 @@ Page({ @@ -268,6 +268,11 @@ Page({
268 // } 268 // }
269 // } 269 // }
270 // }) 270 // })
  271 + sellers.forEach(seller=>{
  272 + if(this.findSellerData){
  273 + seller.findSellerParamObj=this.findSellerData.paramObj
  274 + }
  275 + })
271 return sellers; 276 return sellers;
272 }, 277 },
273 dispalySearchHow(){ 278 dispalySearchHow(){