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 @@
</view>
</view>
</view>
<view class="view flex align-center justify-between margin-top-sm reserve-view">
<view class="view flex align-center justify-between margin-top-sm reserve-view" catchtap="catchtap">
<view class="view rooms flex-treble flex" style="overflow-x: auto">
<block wx:for="{{seller.class}}" wx:key="seclass">
<view class="cu-tag round line-blue text-blue view">{{item.name}}</view>
... ...
... ... @@ -149,7 +149,7 @@ Page({
lat: this.user.latitude == def_latitude ? '' : this.user.latitude,
lng: this.user.longitude == def_longitude ? '' : this.user.longitude,
offset: 0,
rows: 100,
rows: 200,
distance: 100000,
map: JSON.stringify({...this.mapData.region, scale: 50})
}
... ... @@ -192,6 +192,7 @@ Page({
let markers=[]
let sellersLength=this.sellers.length
this.sellers.forEach((seller,si)=>{
if(seller.scale>this.mapData.scale) return;
let marker = {
id: seller.id,
iconPath: "http://nosqn.colorcun.com/custom/lite-online/cates/circle1x5.png" + cates_version,
... ...
... ... @@ -16,57 +16,57 @@
style="width: 100%; height: 360rpx;"></map>
<view class="view content" style="height: {{height}}px;">
<filter-group height="{{height}}" bindevent="filterGroupEvent" disabled="{{sellers.length<1 && !hasFilterData}}"></filter-group>
<scroll-view class="view scroll-view" scroll-y="true"
scroll-into-view="seller-{{activeSellerID}}"
scroll-with-animation
bindscroll="scroll" style="width:100%;height: {{height-50}}px;">
<block wx:if="{{hasLoading}}">
<view class="view flex flex-direction justify-center align-center" wx:if="{{hasLoading}}">
<image class="view" src="http://nosqn.colorcun.com/2.0/timg.gif" style="width: 40rpx;height: 40rpx;margin-top: 260rpx;"></image>
<view class="view bg-white text-sm margin-top">包间查找中，请稍后…</view>
</view>
<block wx:else="">
<block wx:if="{{sellers.length>0}}">
<block wx:for="{{sellers}}" wx:key="sellers" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" ></seller-card>
</navigator>
</block>
</block>
<block wx:else="">
<view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:if="{{!hasSellers}}">
<view class="view text-lg">该地区没有可提供服务的餐厅</view>
<view class="view" style="margin-top: 16rpx;">您可以切换到其他城市看看</view>
<view style="margin-top: 80rpx;"
bindtap="setLoacl" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">去唐山市</view>
</view>
<view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:elif="{{hasFilterData}}">
<view class="view text-lg">未找到符合要求的餐厅</view>
<view class="view" style="margin-top: 16rpx;">修改或减少条件，获得更多餐厅</view>
<chatbot>
<view style="margin-top: 80rpx;"
bindtap="setLoacl" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">人工抢订</view>
</chatbot>
</view>
<view class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm"
wx:else="">
<view class="view flex text-df tips align-center text-orange">
<view class="view icon"></view>
<view class="view">往任意方向拖动地图，可查找不同范围的餐厅</view>
</view>
<view class="view text-lg">地图显示范围无餐厅</view>
<view style="margin-top: 80rpx;"
bindtap="reduceMapScale" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">扩大搜索范围</view>
</view>
</block>
<block wx:elif="{{sellers.length<1}}">
<view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:if="{{!hasSellers}}">
<view class="view text-lg">该地区没有可提供服务的餐厅</view>
<view class="view" style="margin-top: 16rpx;">您可以切换到其他城市看看</view>
<view style="margin-top: 80rpx;"
bindtap="setLoacl" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">去唐山市</view>
</view>
<view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:elif="{{hasFilterData}}">
<view class="view text-lg">未找到符合要求的餐厅</view>
<view class="view" style="margin-top: 16rpx;">修改或减少条件，获得更多餐厅</view>
<chatbot>
<view style="margin-top: 80rpx;"
bindtap="setLoacl" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">人工抢订</view>
</chatbot>
</view>
<view class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm"
wx:else="">
<view class="view flex text-df tips align-center text-orange">
<view class="view icon"></view>
<view class="view">往任意方向拖动地图，可查找不同范围的餐厅</view>
</view>
<view class="view text-lg">地图显示范围无餐厅</view>
<view style="margin-top: 80rpx;"
bindtap="reduceMapScale" data-val="39.684670,118.176300"
class="cu-btn round view text-def text-white bg-blue-blue">扩大搜索范围</view>
</view>
</block>
<block wx:else="">
<scroll-view class="view scroll-view" scroll-y="true"
scroll-into-view="seller-{{activeSellerID}}"
scroll-with-animation
bindscroll="scroll" style="width:100%;height: {{height-50}}px;">
<block wx:for="{{sellers}}" wx:key="sellers" >
<navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
<seller-card class="seller-card" id="seller-{{item.id}}"
activeSellerID="{{activeSellerID}}"
seller="{{item}}" ></seller-card>
</navigator>
</block>
</block>
<view class="view" style="height: 192rpx;"></view>
</scroll-view>
</block>
<view class="view" style="height: 192rpx;"></view>
</scroll-view>
</view>
<getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
<view bindtap="moveToLocation" class="view moveToLocation flex align-center justify-center">
... ...