xt / xcx-book · Commits

Go to a project

Commit 74f3a2becd2fdcfe64e206a1571971a475c7bbe6

Authored by vking
1 parent 802b2de1
build: skipped

new 2.0

Inline Side-by-side
Showing 11 changed files with 99 additions and 155 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 bindtap="hide" 3 bindtap="hide"
4 style="height: {{caixiOpened || filterOpened?height+'px':'auto'}};"> 4 style="height: {{caixiOpened || filterOpened?height+'px':'auto'}};">
5 <view catchtap="catchtap" 5 <view catchtap="catchtap"
6 - 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':''}}"> 6 + 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':''}}">
7 <view class="view cu-tag round {{caixiOpened?'opened text-blue':''}} {{multiIndex[0]>0?'bg-blue light':''}} " bindtap="caixiShow"> 7 <view class="view cu-tag round {{caixiOpened?'opened text-blue':''}} {{multiIndex[0]>0?'bg-blue light':''}} " bindtap="caixiShow">
8 <block wx:if="{{multiIndex[0]==0}}">菜系</block> 8 <block wx:if="{{multiIndex[0]==0}}">菜系</block>
9 <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block> 9 <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <view class="view flex avatar-block"> 4 <view class="view flex avatar-block">
5 <view class="view avatar"> 5 <view class="view avatar">
6 <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> 6 <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>
7 - <view class="avatar-txt text-white text-xs text-center" wx:if="{{seller.brand.name}}">{{seller.brand.name}}</view> 7 + <view class="avatar-txt text-white text-xs text-center text-cut" wx:if="{{seller.brand.name}}">{{seller.brand.name}}</view>
8 </view> 8 </view>
9 <view class="view detail margin-left-sm flex-treble margin-top-sm text-cut"> 9 <view class="view detail margin-left-sm flex-treble margin-top-sm text-cut">
10 <view class="view flex align-center justify-between" style="height: 52rpx;"> 10 <view class="view flex align-center justify-between" style="height: 52rpx;">
@@ -170,4 +170,9 @@ Page({ @@ -170,4 +170,9 @@ Page({
170 this.location=e.detail 170 this.location=e.detail
171 this.GetCollectionSellerList(); 171 this.GetCollectionSellerList();
172 }, 172 },
  173 + sellerCardEvent(e){
  174 + if(e.detail.type=='phone'){
  175 + this.selectComponent('#as').show(e.detail.seller);
  176 + }
  177 + },
173 }) 178 })
@@ -3,10 +3,14 @@ @@ -3,10 +3,14 @@
3 "navigationBarTextStyle": "black", 3 "navigationBarTextStyle": "black",
4 "navigationBarTitleText":"周到安排", 4 "navigationBarTitleText":"周到安排",
5 "usingComponents": { 5 "usingComponents": {
6 - "formids":"/components/formids/formids",  
7 - "getpos":"/components/userinfo/getpos",  
8 - "sb-tr":"/components/reserve/seller-box-transverse/seller-box",  
9 "nav":"/components/nav/nav", 6 "nav":"/components/nav/nav",
10 - "hr":"/components/hr" 7 + "hr":"/components/hr",
  8 +
  9 + "getpos":"/components/2.0/userinfo/getpos",
  10 + "a2l":"/components/tips/add-to-lite",
  11 + "filter-group":"/components/2.0/filter/filter-group",
  12 + "seller-card":"/components/2.0/seller/card",
  13 + "chatbot":"/components/userinfo/chatbot",
  14 + "as-phone":"/components/2.0/dialog/phone"
11 } 15 }
12 } 16 }
1 <!--pages/me/follow.wxml--> 1 <!--pages/me/follow.wxml-->
2 -<nav>订好座，就用周到安排</nav> 2 +<nav>关注</nav>
3 <view class="pages"> 3 <view class="pages">
4 <view class="flex-vc empty" wx:if="{{sellers.length<1}}"> 4 <view class="flex-vc empty" wx:if="{{sellers.length<1}}">
5 - <block wx:if="{{!hasFirstShow}}">  
6 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/follow-empty.png"></image>  
7 - <view>您还没有收藏任何餐厅哦</view>  
8 - </block> 5 + <image src="http://nosqn.colorcun.com/2.0/home%20%2818%29.png" style="width: 520rpx;height: 348rpx;"></image>
  6 + <view style="font-size: 28rpx;margin-top: 40rpx;">暂时没有关注的店铺哦</view>
9 </view> 7 </view>
10 <view class="follow" wx:else=""> 8 <view class="follow" wx:else="">
11 - <view class="seller" wx:for="{{sellers}}" wx:key="sellers.key"  
12 - bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.hasFollow}}">  
13 - <sb-tr seller="{{item}}"  
14 - hasActivityTags="{{false}}"  
15 - hasActivityShort="{{true}}"  
16 - hasBrand="true" hasActivityRed="true"  
17 - hasSlogan="{{false}}"  
18 - sellerStyle="noborder"></sb-tr>  
19 - </view>  
20 - <hr class="seller flex-vc" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr> 9 + <block wx:for="{{sellers}}" wx:key="sellers" >
  10 + <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
  11 + <seller-card class="seller-card" id="seller-{{item.id}}"
  12 + activeSellerID="{{activeSellerID}}"
  13 + seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
  14 + </navigator>
  15 + </block>
  16 + <hr class="seller flex-vc margin-bottom" wx:if="{{!hasMore}}" style="margin-top: 20rpx;">我是有底线的</hr>
21 </view> 17 </view>
22 </view> 18 </view>
23 -<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>  
  19 +<getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
  20 +<as-phone id="as"></as-phone>
1 /* pages/me/follow.wxss */ 1 /* pages/me/follow.wxss */
2 -.pages{  
3 - width: 90%;  
4 - margin: 0 auto;  
5 - font-size: 30rpx;  
6 - padding-bottom: 98rpx;  
7 -}  
8 -.empty{margin-top: 230rpx;}  
9 -.empty image{  
10 - width: 191px;  
11 - height: 158px;  
12 -}  
13 -.empty view{  
14 - font-size: 28rpx;  
15 - margin-top: 86rpx;  
16 -}  
17 -.follow {  
18 - padding-bottom: 50rpx;  
19 -}  
20 -.follow .seller{  
21 - padding-top:20rpx;  
22 -}  
  2 +@import "/colorui/main.wxss";
  3 +.empty{margin-top: 172rpx;}
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image> 18 <image class="moveToLocation-image" src="http://nosqn.colorcun.com/2.0/home%20%2811%29.png"></image>
19 </view> 19 </view>
20 </map> 20 </map>
21 -<view class="view content" style="height: 70vh;"> 21 +<view class="view content padding-top-xs" style="height: 70vh;">
22 <filter-group height="{{height}}" 22 <filter-group height="{{height}}"
23 id="filter-group" 23 id="filter-group"
24 bindevent="filterGroupEvent" 24 bindevent="filterGroupEvent"
@@ -270,7 +270,7 @@ Page({ @@ -270,7 +270,7 @@ Page({
270 this.setData({ 270 this.setData({
271 rsl:[], 271 rsl:[],
272 hasMore:res.data.length==this.size, 272 hasMore:res.data.length==this.size,
273 - markers:this.sellerFormat(res.data), 273 + sellers:this.sellerFormat(res.data),
274 hasLoading:false, 274 hasLoading:false,
275 hasDisabled:this.getHasDisabled(res.data.length>0,this.data.multiIndex[0]>0 || tags.length>0 || this.findSellerData) 275 hasDisabled:this.getHasDisabled(res.data.length>0,this.data.multiIndex[0]>0 || tags.length>0 || this.findSellerData)
276 }) 276 })
@@ -503,4 +503,9 @@ Page({ @@ -503,4 +503,9 @@ Page({
503 ) 503 )
504 } 504 }
505 }, 505 },
  506 + sellerCardEvent(e){
  507 + if(e.detail.type=='phone'){
  508 + this.selectComponent('#as').show(e.detail.seller);
  509 + }
  510 + },
506 }) 511 })
@@ -5,12 +5,17 @@ @@ -5,12 +5,17 @@
5 "usingComponents": { 5 "usingComponents": {
6 "formids":"/components/formids/formids", 6 "formids":"/components/formids/formids",
7 "nav":"/components/nav/nav", 7 "nav":"/components/nav/nav",
8 - "getpos":"/components/userinfo/getpos",  
9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 8 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
10 "caixi":"/components/reserve/caixi", 9 "caixi":"/components/reserve/caixi",
11 "search-how":"/components/reserve/search/how/index", 10 "search-how":"/components/reserve/search/how/index",
12 - "as-phone":"/components/actionSheet/phone",  
13 "hr":"/components/hr", 11 "hr":"/components/hr",
14 - "filter":"/components/reserve/search/filter" 12 + "filter":"/components/reserve/search/filter",
  13 +
  14 + "getpos":"/components/2.0/userinfo/getpos",
  15 + "a2l":"/components/tips/add-to-lite",
  16 + "filter-group":"/components/2.0/filter/filter-group",
  17 + "seller-card":"/components/2.0/seller/card",
  18 + "chatbot":"/components/userinfo/chatbot",
  19 + "as-phone":"/components/2.0/dialog/phone"
15 } 20 }
16 } 21 }
1 <!--pages/reserve/indexList.wxml--> 1 <!--pages/reserve/indexList.wxml-->
2 <nav>周到安排</nav> 2 <nav>周到安排</nav>
3 -<view class="header">  
4 - <!--  
5 - <view class="searchAddrView" bindtap="dispalySearchHow">  
6 - <view class="searchAddr flex-ll">  
7 - <image class="icon" src="http://nosqn.colorcun.com/reserve/images/find-black.png"></image>  
8 - <input style="width: 100%;" placeholder="{{placeholder}}"  
9 - type="text" disabled  
10 - value="{{keyword}}"/>  
11 - </view>  
12 - </view>  
13 - --> 3 +<view class="view content">
14 <view class="searchAddrView searchKeyword" bindtap="gotoSearch"> 4 <view class="searchAddrView searchKeyword" bindtap="gotoSearch">
15 <view class="searchAddr flex-ll"> 5 <view class="searchAddr flex-ll">
16 <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image> 6 <image class="icon" src="http://nosqn.colorcun.com/custom/lite-online/image/search26.png"></image>
@@ -20,105 +10,61 @@ @@ -20,105 +10,61 @@
20 <view class="clean" catchtap="moveToLocation" wx:if="{{keyword && hasSuggestion}}"></view> 10 <view class="clean" catchtap="moveToLocation" wx:if="{{keyword && hasSuggestion}}"></view>
21 </view> 11 </view>
22 </view> 12 </view>
23 - <view class="transverse-search {{hasDisabled?'disabled':''}}">  
24 - <view  
25 - bindtap="caixiShow"  
26 - class="tags {{multiIndex[0]>0?'active':''}}"  
27 - >  
28 - <view class="picker flex-lr">  
29 - <view class="input">  
30 - <block wx:if="{{multiIndex[0]==0}}">菜系</block>  
31 - <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>  
32 - </view>  
33 - <view class="more"></view>  
34 - </view> 13 + <filter-group height="{{height}}"
  14 + id="filter-group"
  15 + bindevent="filterGroupEvent"
  16 + disabled="{{(sellers.length<1 && !hasFilterData) || hasLoading}}"></filter-group>
  17 + <block wx:if="{{hasLoading}}">
  18 + <view class="view flex flex-direction justify-center align-center" wx:if="{{hasLoading}}">
  19 + <image class="view" src="http://nosqn.colorcun.com/2.0/timg.gif" style="width: 40rpx;height: 40rpx;margin-top: 260rpx;"></image>
  20 + <view class="view bg-white text-sm margin-top">包间查找中，请稍后…</view>
35 </view> 21 </view>
36 - <block wx:for="{{tags}}" wx:key="tags.key">  
37 - <view class="tags {{item.active?'active':''}}"  
38 - bindtap="tagsChange"  
39 - data-id="{{item.id}}">{{item.name}}</view>  
40 - </block>  
41 - <view  
42 - bindtap="filterShow"  
43 - class="tags {{filterParams.consumeStr?'active':''}}"  
44 - >  
45 - <view class="picker flex-lr">  
46 - <view class="input">  
47 - {{filterParams.consumeStr?filterParams.consumeStr:'筛选'}}  
48 - </view>  
49 - <view class="more"></view>  
50 - </view> 22 + </block>
  23 + <block wx:elif="{{sellers.length<1}}">
  24 + <view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:if="{{!hasSellers}}">
  25 + <view class="view text-lg">该地区没有可提供服务的餐厅</view>
  26 + <view class="view" style="margin-top: 16rpx;">您可以切换到其他城市看看</view>
  27 + <view style="margin-top: 80rpx;"
  28 + bindtap="setLoacl" data-val="39.684670,118.176300"
  29 + class="cu-btn round view text-def text-white bg-blue-blue">去唐山市</view>
51 </view> 30 </view>
52 - </view>  
53 -</view>  
54 -<view class="pages" wx:if="{{hasLoading}}">  
55 - <view class="flex-vc empty">  
56 - <view class="timg"></view>  
57 - <view class="timg-txt">更多餐厅加载中…</view>  
58 - </view>  
59 -</view>  
60 -<view class="pages" wx:else="">  
61 - <view class="flex-vc empty" wx:if="{{markers.length<1}}">  
62 - <block wx:if="{{!hasFirstShow}}">  
63 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/follow-empty.png"></image>  
64 - <block wx:if="{{hasDisabled}}">  
65 - <view>该地区没有可供预订的餐厅，努力开通中</view>  
66 - </block>  
67 - <block wx:else="">  
68 - <view class="empry-info1">未找到符合要求的餐厅</view>  
69 - <view class="empry-info2">修改或减少条件，获取更多餐厅</view>  
70 - </block>  
71 - <button class="button-none info-button"  
72 - open-type="contact">  
73 - 人工帮订  
74 - </button>  
75 - </block>  
76 - </view>  
77 - <block wx:else="">  
78 - <view class="follow" >  
79 - <view class="seller" wx:for="{{markers}}" wx:key="sellers.key"  
80 - bindtap="gotoDetail" data-sid="{{item.id}}">  
81 - <sb-tr seller="{{item}}"  
82 - hasActivityTags="{{false}}"  
83 - hasActivityShort="{{true}}"  
84 - hasBrand="true" hasActivityRed="true"  
85 - hasSlogan="{{false}}" hasShafa  
86 - hasSuggestion="{{hasSuggestion}}"  
87 - sellerStyle="noborder noshadow noradius"></sb-tr> 31 + <view class="view flex flex-direction justify-center align-center empty-box margin-sm" wx:elif="{{hasFilterData}}">
  32 + <view class="view text-lg">未找到符合要求的餐厅</view>
  33 + <view class="view" style="margin-top: 16rpx;">修改或减少条件，获得更多餐厅</view>
  34 + <chatbot>
  35 + <view style="margin-top: 80rpx;"
  36 + bindtap="setLoacl" data-val="39.684670,118.176300"
  37 + class="cu-btn round view text-def text-white bg-blue-blue">人工抢订</view>
  38 + </chatbot>
  39 + </view>
  40 + <view class="view flex flex-direction justify-center align-center empty-box empty-box-move margin-sm"
  41 + wx:else="">
  42 + <view class="view flex text-df tips align-center text-orange">
  43 + <view class="view icon"></view>
  44 + <view class="view">往任意方向拖动地图，可查找不同范围的餐厅</view>
88 </view> 45 </view>
  46 + <view class="view text-lg">地图显示范围无餐厅</view>
  47 + <view style="margin-top: 80rpx;"
  48 + bindtap="reduceMapScale" data-val="39.684670,118.176300"
  49 + class="cu-btn round view text-def text-white bg-blue-blue">扩大搜索范围</view>
89 </view> 50 </view>
90 - <hr class="flex-vc nomore" wx:if="{{!hasMore}}" bgColor="#ffffff">我是有底线的</hr> 51 + </block>
  52 + <block wx:else="">
  53 + <scroll-view class="view scroll-view" scroll-y="true"
  54 + scroll-into-view="seller-{{scrollSellerID}}"
  55 + scroll-with-animation
  56 + bindscroll="scrollEvent"
  57 + style="width:100%;height: calc(100vh - 150px);">
  58 + <block wx:for="{{sellers}}" wx:key="sellers" >
  59 + <navigator url="/pages/reserve/detail?id={{item.id}}" hover-class="navigator-hover">
  60 + <seller-card class="seller-card" id="seller-{{item.id}}"
  61 + activeSellerID="{{activeSellerID}}"
  62 + seller="{{item}}" bindevent="sellerCardEvent" ></seller-card>
  63 + </navigator>
  64 + </block>
  65 + <view class="view" style="height: 50rpx;"></view>
  66 + </scroll-view>
91 </block> 67 </block>
92 </view> 68 </view>
93 -<caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}"  
94 - bindactive="caixiActive" id="caixi"  
95 -></caixi>  
96 -<search-how id="search-how" findSellerData="{{findSellerData}}" bindevent="howEvent"></search-how>  
97 -<block wx:if="{{rsl.length>0}}">  
98 - <view class="transverse-flxed">  
99 - <view class="line-push">为你推荐</view>  
100 - <view class="transverse-list">  
101 - <swiper  
102 - indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"  
103 - interval="2000" duration="500"  
104 - previous-margin="{{10}}px" next-margin="{{10}}px" style="height: 330rpx;"  
105 - current="{{current}}" bindchange="bindtransition" bindanimationfinish="bindtransition">  
106 - <block wx:for="{{rsl}}" wx:key="rsl.key">  
107 - <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}">  
108 - <view class="seller" id="seller-{{item.id}}">  
109 - <sb-tr seller="{{item}}"  
110 - hasInSwiper bindevent="sbtrEvent"  
111 - hasActivityTags="{{false}}"  
112 - hasActivityShort="{{true}}"  
113 - hasBrand="true" hasActivityTese="true"  
114 - hasSlogan="{{false}}"></sb-tr>  
115 - </view>  
116 - </swiper-item>  
117 - </block>  
118 - </swiper>  
119 - </view>  
120 - </view>  
121 -</block>  
122 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos> 69 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
123 -<as-phone id="as"></as-phone>  
124 -<filter id="filter" bindevent="filterEvent"></filter>  
  70 +<as-phone id="as"></as-phone>
1 /* pages/reserve/indexList.wxss */ 1 /* pages/reserve/indexList.wxss */
  2 +@import "/colorui/main.wxss";
2 .header{ 3 .header{
3 height: 81rpx; 4 height: 81rpx;
4 position: fixed; 5 position: fixed;
@@ -181,7 +182,7 @@ @@ -181,7 +182,7 @@
181 .searchKeyword{ 182 .searchKeyword{
182 height: 64rpx; 183 height: 64rpx;
183 line-height: 64rpx; 184 line-height: 64rpx;
184 - margin-bottom: 15rpx; 185 + margin-bottom: 0rpx;
185 } 186 }
186 .searchKeyword .searchAddr{ 187 .searchKeyword .searchAddr{
187 height:64rpx; 188 height:64rpx;