xt / xcx-book · Commits

Go to a project

Commit 5687be3c6ec6241636cdce9d6192bf51be3a6fb2

Authored by wangfan
1 parent 146b7fdb
build: skipped

golist

Inline Side-by-side
Showing 3 changed files with 103 additions and 19 deletions
@@ -7,7 +7,7 @@ import reddot from '../../utils/reddot'; @@ -7,7 +7,7 @@ import reddot from '../../utils/reddot';
7 import PubSub from '../../utils/PubSub' 7 import PubSub from '../../utils/PubSub'
8 const {regeneratorRuntime} = global 8 const {regeneratorRuntime} = global
9 const mapScale=15//18; 9 const mapScale=15//18;
10 -const transverseViewHeight=232; 10 +const transverseViewHeight=235;
11 const renNum=function(){ 11 const renNum=function(){
12 let arr=[] 12 let arr=[]
13 for(let i=1;i<=30;i++){ 13 for(let i=1;i<=30;i++){
@@ -146,10 +146,10 @@ Page({ @@ -146,10 +146,10 @@ Page({
146 if(reg.test(systemInfo.system)){ 146 if(reg.test(systemInfo.system)){
147 pt = systemInfo.statusBarHeight; 147 pt = systemInfo.statusBarHeight;
148 h = 44; 148 h = 44;
149 - this.transverseViewHeight=transverseViewHeight+30; 149 + //this.transverseViewHeight=transverseViewHeight+30;
150 }else{ 150 }else{
151 if(/xiaomi/i.test(systemInfo.brand)){ 151 if(/xiaomi/i.test(systemInfo.brand)){
152 - this.transverseViewHeight=transverseViewHeight+15; 152 + //this.transverseViewHeight=transverseViewHeight+15;
153 }else{ 153 }else{
154 //this.transverseViewHeight=transverseViewHeight+20; 154 //this.transverseViewHeight=transverseViewHeight+20;
155 } 155 }
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 </cover-view> 30 </cover-view>
31 </formids> 31 </formids>
32 </view> 32 </view>
  33 + <!--
33 <view class="transverse-view"> 34 <view class="transverse-view">
34 <view class="flex-vc transverse-view-top" bindtap="listShow"> 35 <view class="flex-vc transverse-view-top" bindtap="listShow">
35 <view class="line"></view> 36 <view class="line"></view>
@@ -97,6 +98,74 @@ @@ -97,6 +98,74 @@
97 </view> 98 </view>
98 </view> 99 </view>
99 </view> 100 </view>
  101 + -->
  102 + <view class="seller-view">
  103 + <view class="flex-vc transverse-view-top" bindtap="listShow">
  104 + <view class="line"></view>
  105 + <view class="text">
  106 + <text wx:if="{{hasGetSellersEnd}}">{{hasSellers?'查看其它':'已扩大范围为你找到'}}{{listMoreCount}}家餐厅</text>
  107 + </view>
  108 + </view>
  109 + <view class="transverse-search flex-ll">
  110 + <view
  111 + bindtap="caixiShow"
  112 + class="tags {{multiIndex[0]>0?'active':''}}"
  113 + >
  114 + <view class="picker flex-lr">
  115 + <view class="input">
  116 + <block wx:if="{{multiIndex[0]==0}}">菜系</block>
  117 + <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block>
  118 + </view>
  119 + <view class="more"></view>
  120 + </view>
  121 + </view>
  122 + <block wx:for="{{tags}}" wx:key="tags.key">
  123 + <view class="tags {{item.active?'active':''}}"
  124 + bindtap="tagsChange"
  125 + data-id="{{item.id}}">{{item.name}}</view>
  126 + </block>
  127 + </view>
  128 + <view class="transverse-list">
  129 + <swiper
  130 + indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
  131 + interval="2000" duration="500"
  132 + previous-margin="{{15}}px" next-margin="{{15}}px" style="height: 350rpx;"
  133 + current="{{current}}" bindchange="bindtransition" hidden="{{!hasSellers}}">
  134 + <block wx:for="{{markers}}" wx:key="markers.key" wx:if="{{item.id!='location'}}">
  135 + <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
  136 + <view class="seller" id="seller-{{item.id}}">
  137 + <sb-tr seller="{{item.seller}}" hasActivityTags="{{true}}"></sb-tr>
  138 + </view>
  139 + </swiper-item>
  140 + </block>
  141 + <swiper-item bindtap="gotoDetail2" wx:if="{{hasGetSellersEnd}}">
  142 + <view class="seller seller-last" id="seller-last">
  143 + <view class="empty">
  144 + <view class="info">
  145 + <view class="info-msg Semibold">缩放地图发现更多餐厅</view>
  146 + <view class="info-txt">往任意方向拖动地图，可搜索不同范围</view>
  147 + </view>
  148 + <view class="icon"></view>
  149 + </view>
  150 + </view>
  151 + </swiper-item>
  152 + </swiper>
  153 + <view class="empty-txt flex-vc">
  154 + <view class="seller" wx:if="{{hasGetSellersEnd}}">
  155 + <view class="empty" bindtap="listShow">
  156 + <view class="info">
  157 + <view class="info-msg Semibold">已扩大范围为你找到餐厅</view>
  158 + <view class="info-txt">当前范围没有找到符合条件的餐厅</view>
  159 + <view class="info-button flex-lr">
  160 + 去挑选
  161 + <view class="info-button-gt"></view>
  162 + </view>
  163 + </view>
  164 + </view>
  165 + </view>
  166 + </view>
  167 + </view>
  168 + </view>
100 </view> 169 </view>
101 <cover-view bindtap="moveToLocation" class="moveToLocation"> 170 <cover-view bindtap="moveToLocation" class="moveToLocation">
102 <cover-image src="http://qn.colorcun.com/reserve/images/golocal.png"></cover-image> 171 <cover-image src="http://qn.colorcun.com/reserve/images/golocal.png"></cover-image>
1 /* pages/reservr/index.wxss */ 1 /* pages/reservr/index.wxss */
  2 +page{
  3 + background-color: #efefef;
  4 +}
2 .pages{ 5 .pages{
3 width: 100%; 6 width: 100%;
4 margin: 0 0 0; 7 margin: 0 0 0;
@@ -16,7 +19,7 @@ @@ -16,7 +19,7 @@
16 } 19 }
17 .moveToLocation{ 20 .moveToLocation{
18 position: fixed; 21 position: fixed;
19 - bottom: 504rpx; 22 + bottom: 520rpx;
20 left: 20rpx; 23 left: 20rpx;
21 width: 62rpx; 24 width: 62rpx;
22 height: 62rpx; 25 height: 62rpx;
@@ -34,24 +37,14 @@ @@ -34,24 +37,14 @@
34 overflow: hidden; 37 overflow: hidden;
35 } 38 }
36 39
37 -.transverse-search{  
38 - background-color: #fefefe;  
39 - height: 60rpx;  
40 - width: 90%;  
41 - margin: 0 auto;  
42 - padding-top: 20rpx;  
43 - font-size: 24rpx;  
44 - padding-left: 40rpx;  
45 -  
46 -}  
47 .transverse-list{ 40 .transverse-list{
48 background-color: #fefefe; 41 background-color: #fefefe;
49 /*height: 264rpx;*/ 42 /*height: 264rpx;*/
50 width: 100%; 43 width: 100%;
51 } 44 }
52 .transverse-list .seller{ 45 .transverse-list .seller{
53 - width: 96%;  
54 - margin: 16rpx auto 0; 46 + width: 98%;
  47 + margin: 0 auto;
55 } 48 }
56 .transverse-list .seller .empty{ 49 .transverse-list .seller .empty{
57 height: 300rpx; 50 height: 300rpx;
@@ -65,7 +58,7 @@ @@ -65,7 +58,7 @@
65 position: relative; 58 position: relative;
66 } 59 }
67 .transverse-list .seller-last .empty{ 60 .transverse-list .seller-last .empty{
68 - width: 100%; 61 + width: 99%;
69 } 62 }
70 .seller .empty .info{ 63 .seller .empty .info{
71 height: 124rpx; 64 height: 124rpx;
@@ -180,7 +173,8 @@ @@ -180,7 +173,8 @@
180 background-image: url("http://qn.colorcun.com/reserve/images/empty-seller.png"); 173 background-image: url("http://qn.colorcun.com/reserve/images/empty-seller.png");
181 background-size: 100% 100%; 174 background-size: 100% 100%;
182 border-left-width: 0; 175 border-left-width: 0;
183 - margin: 20rpx auto 0; 176 + margin: 0 auto;
  177 + width: 90%;
184 } 178 }
185 .empty-txt .seller .empty .info{ 179 .empty-txt .seller .empty .info{
186 margin-top: 52rpx; 180 margin-top: 52rpx;
@@ -230,8 +224,22 @@ @@ -230,8 +224,22 @@
230 font-weight: 900; 224 font-weight: 900;
231 } 225 }
232 226
  227 +
  228 +/* seller-view start*/
  229 +.seller-view{
  230 + height: 470rpx;
  231 + position:fixed;
  232 + bottom: 0;
  233 + width: 100%;
  234 + background-color: #fefefe;
  235 + border-radius: 20rpx 20rpx 0 0;
  236 + box-shadow: -4rpx 0 4rpx 2rpx #C5C1C1;
  237 + overflow: hidden;
  238 +}
233 .transverse-view-top{ 239 .transverse-view-top{
234 - height: 60rpx; 240 + height: 58rpx;
  241 + overflow: hidden;
  242 + background-color:#FFFFFF;
235 } 243 }
236 .transverse-view-top .line{ 244 .transverse-view-top .line{
237 height: 6rpx; 245 height: 6rpx;
@@ -245,4 +253,11 @@ @@ -245,4 +253,11 @@
245 font-size: 24rpx; 253 font-size: 24rpx;
246 color: #999999; 254 color: #999999;
247 margin-top: 4rpx; 255 margin-top: 4rpx;
  256 +}
  257 +.transverse-search{
  258 + background-color: #fefefe;
  259 + height: 90rpx;
  260 + font-size: 24rpx;
  261 + padding-left: 40rpx;
  262 + line-height: 90rpx;
248 } 263 }