xt / xcx-book · Commits

Go to a project

Commit 075b711c5f2367e8ef8131a3035127d717747980

Authored by vking
1 parent 86de933d
build: skipped

new 2.0

Inline Side-by-side
Showing 3 changed files with 48 additions and 47 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 </view> 28 </view>
29 </view> 29 </view>
30 </view> 30 </view>
31 - <view class="view flex align-center justify-between margin-top-sm reserve-view"> 31 + <view class="view flex align-center justify-between margin-top-sm reserve-view" catchtap="catchtap">
32 <view class="view rooms flex-treble flex" style="overflow-x: auto"> 32 <view class="view rooms flex-treble flex" style="overflow-x: auto">
33 <block wx:for="{{seller.class}}" wx:key="seclass"> 33 <block wx:for="{{seller.class}}" wx:key="seclass">
34 <view class="cu-tag round line-blue text-blue view">{{item.name}}</view> 34 <view class="cu-tag round line-blue text-blue view">{{item.name}}</view>
@@ -149,7 +149,7 @@ Page({ @@ -149,7 +149,7 @@ Page({
149 lat: this.user.latitude == def_latitude ? '' : this.user.latitude, 149 lat: this.user.latitude == def_latitude ? '' : this.user.latitude,
150 lng: this.user.longitude == def_longitude ? '' : this.user.longitude, 150 lng: this.user.longitude == def_longitude ? '' : this.user.longitude,
151 offset: 0, 151 offset: 0,
152 - rows: 100, 152 + rows: 200,
153 distance: 100000, 153 distance: 100000,
154 map: JSON.stringify({...this.mapData.region, scale: 50}) 154 map: JSON.stringify({...this.mapData.region, scale: 50})
155 } 155 }
@@ -192,6 +192,7 @@ Page({ @@ -192,6 +192,7 @@ Page({
192 let markers=[] 192 let markers=[]
193 let sellersLength=this.sellers.length 193 let sellersLength=this.sellers.length
194 this.sellers.forEach((seller,si)=>{ 194 this.sellers.forEach((seller,si)=>{
  195 + if(seller.scale>this.mapData.scale) return;
195 let marker = { 196 let marker = {
196 id: seller.id, 197 id: seller.id,
197 iconPath: "http://nosqn.colorcun.com/custom/lite-online/cates/circle1x5.png" + cates_version, 198 iconPath: "http://nosqn.colorcun.com/custom/lite-online/cates/circle1x5.png" + cates_version,
@@ -16,57 +16,57 @@ @@ -16,57 +16,57 @@
16 style="width: 100%; height: 360rpx;"></map> 16 style="width: 100%; height: 360rpx;"></map>
17 <view class="view content" style="height: {{height}}px;"> 17 <view class="view content" style="height: {{height}}px;">
18 <filter-group height="{{height}}" bindevent="filterGroupEvent" disabled="{{sellers.length<1 && !hasFilterData}}"></filter-group> 18 <filter-group height="{{height}}" bindevent="filterGroupEvent" disabled="{{sellers.length<1 && !hasFilterData}}"></filter-group>
19 - <scroll-view class="view scroll-view" scroll-y="true"  
20 - scroll-into-view="seller-{{activeSellerID}}"  
21 - scroll-with-animation  
22 - bindscroll="scroll" style="width:100%;height: {{height-50}}px;"> 19 + <block wx:if="{{hasLoading}}">
23 <view class="view flex flex-direction justify-center align-center" wx:if="{{hasLoading}}"> 20 <view class="view flex flex-direction justify-center align-center" wx:if="{{hasLoading}}">
24 <image class="view" src="http://nosqn.colorcun.com/2.0/timg.gif" style="width: 40rpx;height: 40rpx;margin-top: 260rpx;"></image> 21 <image class="view" src="http://nosqn.colorcun.com/2.0/timg.gif" style="width: 40rpx;height: 40rpx;margin-top: 260rpx;"></image>
25 <view class="view bg-white text-sm margin-top">包间查找中，请稍后…</view> 22 <view class="view bg-white text-sm margin-top">包间查找中，请稍后…</view>
26 </view> 23 </view>
27 - <block wx:else="">  
28 - <block wx:if="{{sellers.length>0}}">  
29 - <block wx:for="{{sellers}}" wx:key="sellers" >  
30 - <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">  
31 - <seller-card class="seller-card" id="seller-{{item.id}}"  
32 - activeSellerID="{{activeSellerID}}"  
33 - seller="{{item}}" ></seller-card>  
34 - </navigator>  
35 - </block>  
36 - </block>  
37 - <block wx:else="">  
38 - <view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:if="{{!hasSellers}}">  
39 - <view class="view text-lg">该地区没有可提供服务的餐厅</view>  
40 - <view class="view" style="margin-top: 16rpx;">您可以切换到其他城市看看</view>  
41 - <view style="margin-top: 80rpx;"  
42 - bindtap="setLoacl" data-val="39.684670,118.176300"  
43 - class="cu-btn round view text-def text-white bg-blue-blue">去唐山市</view>  
44 - </view>  
45 - <view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:elif="{{hasFilterData}}">  
46 - <view class="view text-lg">未找到符合要求的餐厅</view>  
47 - <view class="view" style="margin-top: 16rpx;">修改或减少条件，获得更多餐厅</view>  
48 - <chatbot>  
49 - <view style="margin-top: 80rpx;"  
50 - bindtap="setLoacl" data-val="39.684670,118.176300"  
51 - class="cu-btn round view text-def text-white bg-blue-blue">人工抢订</view>  
52 - </chatbot>  
53 - </view>  
54 - <view class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm"  
55 - wx:else="">  
56 - <view class="view flex text-df tips align-center text-orange">  
57 - <view class="view icon"></view>  
58 - <view class="view">往任意方向拖动地图，可查找不同范围的餐厅</view>  
59 - </view>  
60 - <view class="view text-lg">地图显示范围无餐厅</view>  
61 - <view style="margin-top: 80rpx;"  
62 - bindtap="reduceMapScale" data-val="39.684670,118.176300"  
63 - class="cu-btn round view text-def text-white bg-blue-blue">扩大搜索范围</view>  
64 - </view> 24 + </block>
  25 + <block wx:elif="{{sellers.length<1}}">
  26 + <view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:if="{{!hasSellers}}">
  27 + <view class="view text-lg">该地区没有可提供服务的餐厅</view>
  28 + <view class="view" style="margin-top: 16rpx;">您可以切换到其他城市看看</view>
  29 + <view style="margin-top: 80rpx;"
  30 + bindtap="setLoacl" data-val="39.684670,118.176300"
  31 + class="cu-btn round view text-def text-white bg-blue-blue">去唐山市</view>
  32 + </view>
  33 + <view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:elif="{{hasFilterData}}">
  34 + <view class="view text-lg">未找到符合要求的餐厅</view>
  35 + <view class="view" style="margin-top: 16rpx;">修改或减少条件，获得更多餐厅</view>
  36 + <chatbot>
  37 + <view style="margin-top: 80rpx;"
  38 + bindtap="setLoacl" data-val="39.684670,118.176300"
  39 + class="cu-btn round view text-def text-white bg-blue-blue">人工抢订</view>
  40 + </chatbot>
  41 + </view>
  42 + <view class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm"
  43 + wx:else="">
  44 + <view class="view flex text-df tips align-center text-orange">
  45 + <view class="view icon"></view>
  46 + <view class="view">往任意方向拖动地图，可查找不同范围的餐厅</view>
  47 + </view>
  48 + <view class="view text-lg">地图显示范围无餐厅</view>
  49 + <view style="margin-top: 80rpx;"
  50 + bindtap="reduceMapScale" data-val="39.684670,118.176300"
  51 + class="cu-btn round view text-def text-white bg-blue-blue">扩大搜索范围</view>
  52 + </view>
  53 + </block>
  54 + <block wx:else="">
  55 + <scroll-view class="view scroll-view" scroll-y="true"
  56 + scroll-into-view="seller-{{activeSellerID}}"
  57 + scroll-with-animation
  58 + bindscroll="scroll" style="width:100%;height: {{height-50}}px;">
  59 + <block wx:for="{{sellers}}" wx:key="sellers" >
  60 + <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
  61 + <seller-card class="seller-card" id="seller-{{item.id}}"
  62 + activeSellerID="{{activeSellerID}}"
  63 + seller="{{item}}" ></seller-card>
  64 + </navigator>
65 </block> 65 </block>
66 - </block> 66 + <view class="view" style="height: 192rpx;"></view>
  67 + </scroll-view>
  68 + </block>
67 69
68 - <view class="view" style="height: 192rpx;"></view>  
69 - </scroll-view>  
70 </view> 70 </view>
71 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos> 71 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
72 <view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center"> 72 <view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">