Commit 74f3a2becd2fdcfe64e206a1571971a475c7bbe6

Authored by vking
1 parent 802b2de1

new 2.0

... ... @@ -3,7 +3,7 @@
bindtap="hide"
style="height: {{caixiOpened || filterOpened?height+'px':'auto'}};">
<view catchtap="catchtap"
class="view bg-white flex flex-sub filter-group padding-top padding-left-lg padding-right-lg padding-bottom-sm {{caixiOpened || filterOpened?'filter-group-opened':''}}">
class="view bg-white flex flex-sub filter-group padding-top-sm padding-left-lg padding-right-lg padding-bottom-sm {{caixiOpened || filterOpened?'filter-group-opened':''}}">
<view class="view cu-tag round {{caixiOpened?'opened text-blue':''}} {{multiIndex[0]>0?'bg-blue light':''}} " bindtap="caixiShow">
<block wx:if="{{multiIndex[0]==0}}">菜系</block>
<block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
... ...
... ... @@ -4,7 +4,7 @@
<view class="view flex avatar-block">
<view class="view avatar">
<image src="{{seller.seller_image?seller.seller_image+'?imageView2/2/w/320/interlace/0/q/100':'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'}}" class="avatar-image" mode="aspectFill" lazy-load></image>
<view class="avatar-txt text-white text-xs text-center" wx:if="{{seller.brand.name}}">{{seller.brand.name}}</view>
<view class="avatar-txt text-white text-xs text-center text-cut" wx:if="{{seller.brand.name}}">{{seller.brand.name}}</view>
</view>
<view class="view detail margin-left-sm flex-treble margin-top-sm text-cut">
<view class="view flex align-center justify-between" style="height: 52rpx;">
... ...
... ... @@ -170,4 +170,9 @@ Page({
this.location=e.detail
this.GetCollectionSellerList();
},
sellerCardEvent(e){
if(e.detail.type=='phone'){
this.selectComponent('#as').show(e.detail.seller);
}
},
})
\ No newline at end of file
... ...
... ... @@ -3,10 +3,14 @@
"navigationBarTextStyle": "black",
"navigationBarTitleText":"周到安排",
"usingComponents": {
"formids":"/components/formids/formids",
"getpos":"/components/userinfo/getpos",
"sb-tr":"/components/reserve/seller-box-transverse/seller-box",
"nav":"/components/nav/nav",
"hr":"/components/hr"
"hr":"/components/hr",
"getpos":"/components/2.0/userinfo/getpos",
"a2l":"/components/tips/add-to-lite",
"filter-group":"/components/2.0/filter/filter-group",
"seller-card":"/components/2.0/seller/card",
"chatbot":"/components/userinfo/chatbot",
"as-phone":"/components/2.0/dialog/phone"
}
}
\ No newline at end of file
... ...
<!--pages/me/follow.wxml-->
<nav>订好座,就用周到安排</nav>
<nav>关注</nav>
<view class="pages">
<view class="flex-vc empty" wx:if="{{sellers.length<1}}">
<block wx:if="{{!hasFirstShow}}">
<image src="http://nosqn.colorcun.com/custom/lite-online/image/follow-empty.png"></image>
<view>您还没有收藏任何餐厅哦</view>
</block>
<image src="http://nosqn.colorcun.com/2.0/home%20%2818%29.png" style="width: 520rpx;height: 348rpx;"></image>
<view style="font-size: 28rpx;margin-top: 40rpx;">暂时没有关注的店铺哦</view>
</view>
<view class="follow" wx:else="">
<view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">
<sb-tr seller="{{item}}"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityRed="true"
hasSlogan="{{false}}"
sellerStyle="noborder"></sb-tr>
</view>
<hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
<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}}" bindevent="sellerCardEvent" ></seller-card>
</navigator>
</block>
<hr class="seller flex-vc margin-bottom" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
</view>
</view>
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
\ No newline at end of file
<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
<as-phone id="as"></as-phone>
\ No newline at end of file
... ...
/* pages/me/follow.wxss */
.pages{
width: 90%;
margin: 0 auto;
font-size: 30rpx;
padding-bottom: 98rpx;
}
.empty{margin-top: 230rpx;}
.empty image{
width: 191px;
height: 158px;
}
.empty view{
font-size: 28rpx;
margin-top: 86rpx;
}
.follow {
padding-bottom: 50rpx;
}
.follow .seller{
padding-top:20rpx;
}
\ No newline at end of file
@import "/colorui/main.wxss";
.empty{margin-top: 172rpx;}
... ...
... ... @@ -18,7 +18,7 @@
<image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
</view>
</map>
<view class="view content" style="height: 70vh;">
<view class="view content padding-top-xs" style="height: 70vh;">
<filter-group height="{{height}}"
id="filter-group"
bindevent="filterGroupEvent"
... ...
... ... @@ -270,7 +270,7 @@ Page({
this.setData({
rsl:[],
hasMore:res.data.length==this.size,
markers:this.sellerFormat(res.data),
sellers:this.sellerFormat(res.data),
hasLoading:false,
hasDisabled:this.getHasDisabled(res.data.length>0,this.data.multiIndex[0]>0 || tags.length>0 || this.findSellerData)
})
... ... @@ -503,4 +503,9 @@ Page({
)
}
},
sellerCardEvent(e){
if(e.detail.type=='phone'){
this.selectComponent('#as').show(e.detail.seller);
}
},
})
\ No newline at end of file
... ...
... ... @@ -5,12 +5,17 @@
"usingComponents": {
"formids":"/components/formids/formids",
"nav":"/components/nav/nav",
"getpos":"/components/userinfo/getpos",
"sb-tr":"/components/reserve/seller-box-transverse/seller-box",
"caixi":"/components/reserve/caixi",
"search-how":"/components/reserve/search/how/index",
"as-phone":"/components/actionSheet/phone",
"hr":"/components/hr",
"filter":"/components/reserve/search/filter"
"filter":"/components/reserve/search/filter",
"getpos":"/components/2.0/userinfo/getpos",
"a2l":"/components/tips/add-to-lite",
"filter-group":"/components/2.0/filter/filter-group",
"seller-card":"/components/2.0/seller/card",
"chatbot":"/components/userinfo/chatbot",
"as-phone":"/components/2.0/dialog/phone"
}
}
\ No newline at end of file
... ...
<!--pages/reserve/indexList.wxml-->
<nav>周到安排</nav>
<view class="header">
<!--
<view class="searchAddrView" bindtap="dispalySearchHow">
<view class="searchAddr flex-ll">
<image class="icon" src="http://nosqn.colorcun.com/reserve/images/find-black.png"></image>
<input style="width: 100%;" placeholder="{{placeholder}}"
type="text" disabled
value="{{keyword}}"/>
</view>
</view>
-->
<view class="view content">
<view class="searchAddrView searchKeyword" bindtap="gotoSearch">
<view class="searchAddr flex-ll">
<image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image>
... ... @@ -20,105 +10,61 @@
<view class="clean" catchtap="moveToLocation" wx:if="{{keyword && hasSuggestion}}"></view>
</view>
</view>
<view class="transverse-search {{hasDisabled?'disabled':''}}">
<view
bindtap="caixiShow"
class="tags {{multiIndex[0]>0?'active':''}}"
>
<view class="picker flex-lr">
<view class="input">
<block wx:if="{{multiIndex[0]==0}}">菜系</block>
<block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
</view>
<view class="more"></view>
</view>
<filter-group height="{{height}}"
id="filter-group"
bindevent="filterGroupEvent"
disabled="{{(sellers.length<1 && !hasFilterData) || hasLoading}}"></filter-group>
<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:for="{{tags}}" wx:key="tags.key">
<view class="tags {{item.active?'active':''}}"
bindtap="tagsChange"
data-id="{{item.id}}">{{item.name}}</view>
</block>
<view
bindtap="filterShow"
class="tags {{filterParams.consumeStr?'active':''}}"
>
<view class="picker flex-lr">
<view class="input">
{{filterParams.consumeStr?filterParams.consumeStr:'筛选'}}
</view>
<view class="more"></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>
</view>
<view class="pages" wx:if="{{hasLoading}}">
<view class="flex-vc empty">
<view class="timg"></view>
<view class="timg-txt">更多餐厅加载中…</view>
</view>
</view>
<view class="pages" wx:else="">
<view class="flex-vc empty" wx:if="{{markers.length<1}}">
<block wx:if="{{!hasFirstShow}}">
<image src="http://nosqn.colorcun.com/custom/lite-online/image/follow-empty.png"></image>
<block wx:if="{{hasDisabled}}">
<view>该地区没有可供预订的餐厅,努力开通中</view>
</block>
<block wx:else="">
<view class="empry-info1">未找到符合要求的餐厅</view>
<view class="empry-info2">修改或减少条件,获取更多餐厅</view>
</block>
<button class="button-none info-button"
open-type="contact">
人工帮订
</button>
</block>
</view>
<block wx:else="">
<view class="follow" >
<view class="seller" wx:for="{{markers}}" wx:key="sellers.key"
bindtap="gotoDetail" data-sid="{{item.id}}">
<sb-tr seller="{{item}}"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityRed="true"
hasSlogan="{{false}}" hasShafa
hasSuggestion="{{hasSuggestion}}"
sellerStyle="noborder noshadow noradius"></sb-tr>
<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>
<hr class="flex-vc nomore" wx:if="{{!hasMore}}" bgColor="#ffffff">我是有底线的</hr>
</block>
<block wx:else="">
<scroll-view class="view scroll-view" scroll-y="true"
scroll-into-view="seller-{{scrollSellerID}}"
scroll-with-animation
bindscroll="scrollEvent"
style="width:100%;height: calc(100vh - 150px);">
<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}}" bindevent="sellerCardEvent" ></seller-card>
</navigator>
</block>
<view class="view" style="height: 50rpx;"></view>
</scroll-view>
</block>
</view>
<caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"
bindactive="caixiActive" id="caixi"
></caixi>
<search-how id="search-how" findSellerData="{{findSellerData}}" bindevent="howEvent"></search-how>
<block wx:if="{{rsl.length>0}}">
<view class="transverse-flxed">
<view class="line-push">为你推荐</view>
<view class="transverse-list">
<swiper
indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
interval="2000" duration="500"
previous-margin="{{10}}px" next-margin="{{10}}px" style="height: 330rpx;"
current="{{current}}" bindchange="bindtransition" bindanimationfinish="bindtransition">
<block wx:for="{{rsl}}" wx:key="rsl.key">
<swiper-item bindtap="gotoDetail" data-sid="{{item.id}}">
<view class="seller" id="seller-{{item.id}}">
<sb-tr seller="{{item}}"
hasInSwiper bindevent="sbtrEvent"
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityTese="true"
hasSlogan="{{false}}"></sb-tr>
</view>
</swiper-item>
</block>
</swiper>
</view>
</view>
</block>
<getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
<as-phone id="as"></as-phone>
<filter id="filter" bindevent="filterEvent"></filter>
\ No newline at end of file
<as-phone id="as"></as-phone>
\ No newline at end of file
... ...
/* pages/reserve/indexList.wxss */
@import "/colorui/main.wxss";
.header{
height: 81rpx;
position: fixed;
... ... @@ -181,7 +182,7 @@
.searchKeyword{
height: 64rpx;
line-height: 64rpx;
margin-bottom: 15rpx;
margin-bottom: 0rpx;
}
.searchKeyword .searchAddr{
height:64rpx;
... ...