Showing
8 changed files
with
302 additions
and
38 deletions
| 1 | // components/reserve/caixi.js | 1 | // components/reserve/caixi.js |
| 2 | import util from '../../../utils/util'; | 2 | import util from '../../../utils/util'; |
| 3 | +import App from '../../../utils/api'; | ||
| 4 | +const {regeneratorRuntime} = global | ||
| 3 | Component({ | 5 | Component({ |
| 4 | /** | 6 | /** |
| 5 | * 组件的属性列表 | 7 | * 组件的属性列表 |
| 6 | */ | 8 | */ |
| 7 | properties: { | 9 | properties: { |
| 8 | - markers:{ | 10 | + multiArray:{ |
| 9 | type:Array, | 11 | type:Array, |
| 10 | - value:[], | 12 | + value:[] |
| 13 | + }, | ||
| 14 | + multiIndex: { | ||
| 15 | + type:Array, | ||
| 16 | + value:[] | ||
| 17 | + }, | ||
| 18 | + tags: { | ||
| 19 | + type:Array, | ||
| 20 | + value:[] | ||
| 11 | }, | 21 | }, |
| 12 | }, | 22 | }, |
| 13 | 23 | ||
| @@ -15,9 +25,29 @@ Component({ | @@ -15,9 +25,29 @@ Component({ | ||
| 15 | * 组件的初始数据 | 25 | * 组件的初始数据 |
| 16 | */ | 26 | */ |
| 17 | data: { | 27 | data: { |
| 18 | - hidden:false | 28 | + hidden:true, |
| 29 | + statusBarHeight: 20, | ||
| 30 | + titleBarHeight:44, | ||
| 31 | + markers:[], | ||
| 32 | + hasMore:true, | ||
| 33 | + }, | ||
| 34 | + attached(){ | ||
| 35 | + //导航栏自适应 | ||
| 36 | + let systemInfo = wx.getSystemInfoSync(); | ||
| 37 | + let reg = /ios/i; | ||
| 38 | + let pt = 20;//导航状态栏上内边距 | ||
| 39 | + let h = 44;//导航状态栏高度 | ||
| 40 | + if(reg.test(systemInfo.system)){ | ||
| 41 | + pt = systemInfo.statusBarHeight; | ||
| 42 | + }else{ | ||
| 43 | + pt = systemInfo.statusBarHeight; | ||
| 44 | + h = 48; | ||
| 45 | + } | ||
| 46 | + this.setData({ | ||
| 47 | + statusBarHeight: pt, | ||
| 48 | + titleBarHeight:h, | ||
| 49 | + }) | ||
| 19 | }, | 50 | }, |
| 20 | - | ||
| 21 | /** | 51 | /** |
| 22 | * 组件的方法列表 | 52 | * 组件的方法列表 |
| 23 | */ | 53 | */ |
| @@ -27,14 +57,55 @@ Component({ | @@ -27,14 +57,55 @@ Component({ | ||
| 27 | hidden:true, | 57 | hidden:true, |
| 28 | }) | 58 | }) |
| 29 | }, | 59 | }, |
| 30 | - active(e){ | ||
| 31 | - this.triggerEvent('active',util.attr(e,'index')); | ||
| 32 | - this.hide(); | ||
| 33 | - }, | ||
| 34 | show(){ | 60 | show(){ |
| 35 | this.setData({ | 61 | this.setData({ |
| 36 | hidden:false, | 62 | hidden:false, |
| 37 | }) | 63 | }) |
| 38 | }, | 64 | }, |
| 65 | + getList(mapParam){ | ||
| 66 | + this.offset=1 //page | ||
| 67 | + this.size=20 //page size | ||
| 68 | + //计算视窗中心 | ||
| 69 | + let map=JSON.parse(mapParam.map); | ||
| 70 | + let lat=map.northeast.latitude-(map.northeast.latitude-map.southwest.latitude)/2; | ||
| 71 | + let lng=map.northeast.longitude-(map.northeast.longitude-map.southwest.longitude)/2; | ||
| 72 | + this.param={ | ||
| 73 | + lat:lat, | ||
| 74 | + lng:lng, | ||
| 75 | + lat_extend:mapParam.lat, | ||
| 76 | + lng_extend:mapParam.lng, | ||
| 77 | + offset:this.offset, | ||
| 78 | + size:this.size, | ||
| 79 | + distance:50, | ||
| 80 | + }; | ||
| 81 | + if(mapParam.tags){ | ||
| 82 | + this.param.tags=mapParam.tags | ||
| 83 | + } | ||
| 84 | + if(mapParam.cuisine){ | ||
| 85 | + this.param.cuisine=mapParam.cuisine | ||
| 86 | + } | ||
| 87 | + App.Customer.SellerLists(this.param).then(res=>{ | ||
| 88 | + this.setData({ | ||
| 89 | + hasMore:res.data.length==this.size, | ||
| 90 | + markers:res.data, | ||
| 91 | + }) | ||
| 92 | + this.triggerEvent('event',{type:'getListEnd',total:res.data.length}) | ||
| 93 | + }) | ||
| 94 | + }, | ||
| 95 | + getListMore(){ | ||
| 96 | + this.param.offset+=1; | ||
| 97 | + App.Customer.SellerLists(this.param).then(res=>{ | ||
| 98 | + this.setData({ | ||
| 99 | + hasMore:res.data.length==this.size, | ||
| 100 | + markers:this.data.markers.concat(res.data), | ||
| 101 | + }) | ||
| 102 | + }) | ||
| 103 | + }, | ||
| 104 | + caixiShow(){ | ||
| 105 | + this.triggerEvent('event',{type:'caixiShow'}) | ||
| 106 | + }, | ||
| 107 | + tagsChange(e){ | ||
| 108 | + this.triggerEvent('event',{type:'tagsChange',e:e}) | ||
| 109 | + }, | ||
| 39 | } | 110 | } |
| 40 | }) | 111 | }) |
| 1 | <!--components/reserve/caixi.wxml--> | 1 | <!--components/reserve/caixi.wxml--> |
| 2 | -<cover-view class="mask" catchtap="hide" hidden="{{hidden}}"> | ||
| 3 | - <cover-view class="list" catchtap=""> | 2 | +<cover-view class="mask" hidden="{{hidden}}"> |
| 3 | + <cover-view class="header flex-lr" style="height: {{titleBarHeight}}px;padding-top: {{statusBarHeight}}px;" catchtap="hide"> | ||
| 4 | + <cover-view class="searchList flex-ll"> | ||
| 5 | + <cover-image class="icon" src="http://qn.colorcun.com/reserve/images/hasMap.png"></cover-image> | ||
| 6 | + <cover-view class="title">地图</cover-view> | ||
| 7 | + </cover-view> | ||
| 8 | + <cover-view class="title" style="line-height: {{titleBarHeight}}px;height:{{titleBarHeight}}px;">一键订</cover-view> | ||
| 9 | + <cover-view class="icon"></cover-view> | ||
| 10 | + </cover-view> | ||
| 11 | + <cover-view class="transverse-search flex-ll"> | ||
| 12 | + <cover-view | ||
| 13 | + bindtap="caixiShow" | ||
| 14 | + class="tags {{multiIndex[0]>0?'active':''}}" | ||
| 15 | + > | ||
| 16 | + <cover-view class="picker flex-lr"> | ||
| 17 | + <cover-view class="input"> | ||
| 18 | + <block wx:if="{{multiIndex[0]==0}}">菜系</block> | ||
| 19 | + <block wx:else="">{{multiArray[0][multiIndex[0]]}}</block> | ||
| 20 | + </cover-view> | ||
| 21 | + <cover-view class="more"></cover-view> | ||
| 22 | + </cover-view> | ||
| 23 | + </cover-view> | ||
| 24 | + <block wx:for="{{tags}}" wx:key="tags.key"> | ||
| 25 | + <cover-view class="tags {{item.active?'active':''}}" | ||
| 26 | + bindtap="tagsChange" | ||
| 27 | + data-id="{{item.id}}">{{item.name}}</cover-view> | ||
| 28 | + </block> | ||
| 29 | + </cover-view> | ||
| 30 | + <cover-view class="list" catchtap="" style="top:{{statusBarHeight+titleBarHeight+30}}px;"> | ||
| 4 | <cover-view class="seller" id="seller-{{item.id}}" wx:for="{{markers}}" wx:key="markers.key"> | 31 | <cover-view class="seller" id="seller-{{item.id}}" wx:for="{{markers}}" wx:key="markers.key"> |
| 5 | - <sb-tr seller="{{item.seller}}" hasActivityTags="{{true}}"></sb-tr> | 32 | + <sb-tr seller="{{item}}" hasActivityTags="{{true}}"></sb-tr> |
| 33 | + </cover-view> | ||
| 34 | + <cover-view class="seller flex-vc" style="font-size: 28rpx;color:#999;" bindtap="{{hasMore?'getListMore':''}}"> | ||
| 35 | + {{hasMore?'点击加载更多商家':'没有更多商家了'}} | ||
| 6 | </cover-view> | 36 | </cover-view> |
| 7 | </cover-view> | 37 | </cover-view> |
| 8 | </cover-view> | 38 | </cover-view> |
| @@ -5,12 +5,89 @@ | @@ -5,12 +5,89 @@ | ||
| 5 | position: fixed; | 5 | position: fixed; |
| 6 | bottom: 0; | 6 | bottom: 0; |
| 7 | width: 95%; | 7 | width: 95%; |
| 8 | - border-radius: 10rpx 10rpx 0 0; | ||
| 9 | - padding: 40rpx 0 60rpx 5%; | 8 | + padding: 40rpx 0 40rpx 5%; |
| 10 | color: #353535; | 9 | color: #353535; |
| 11 | - height: 80%; | ||
| 12 | overflow-y:scroll; | 10 | overflow-y:scroll; |
| 13 | } | 11 | } |
| 14 | .seller{ | 12 | .seller{ |
| 15 | margin-bottom: 40rpx; | 13 | margin-bottom: 40rpx; |
| 14 | +} | ||
| 15 | +.header{ | ||
| 16 | + background-color: #fefefe; | ||
| 17 | + width: 100%; | ||
| 18 | + | ||
| 19 | +} | ||
| 20 | +.header .title{ | ||
| 21 | + font-size: 34rpx; | ||
| 22 | +} | ||
| 23 | +.header .icon{ | ||
| 24 | + min-width: 100rpx; | ||
| 25 | + width: 100rpx; | ||
| 26 | +} | ||
| 27 | +.searchList{ | ||
| 28 | + margin-left: 26rpx; | ||
| 29 | + width: 100rpx; | ||
| 30 | + height: 60rpx; | ||
| 31 | + background-color: #fefefe; | ||
| 32 | + border-radius: 30rpx; | ||
| 33 | + line-height: 60rpx; | ||
| 34 | + color:#C28C56; | ||
| 35 | +} | ||
| 36 | +.searchList .icon{ | ||
| 37 | + min-width: 24rpx; | ||
| 38 | + width: 24rpx; | ||
| 39 | + height: 24rpx; | ||
| 40 | + margin: 0 8rpx 0 14rpx; | ||
| 41 | +} | ||
| 42 | +.searchList .title{ | ||
| 43 | + line-height: 60rpx; | ||
| 44 | + height: 60rpx; | ||
| 45 | + overflow: hidden; | ||
| 46 | + width: 100%; | ||
| 47 | + text-align: left; | ||
| 48 | + font-size: 20rpx; | ||
| 49 | +} | ||
| 50 | +.transverse-search{ | ||
| 51 | + background-color: #fefefe; | ||
| 52 | + height: 60rpx; | ||
| 53 | + width: 100%; | ||
| 54 | + margin: 0 auto; | ||
| 55 | + font-size: 24rpx; | ||
| 56 | + padding-left: 40rpx; | ||
| 57 | + | ||
| 58 | +} | ||
| 59 | +.transverse-search .tags{ | ||
| 60 | + height: 50rpx; | ||
| 61 | + line-height: 50rpx; | ||
| 62 | + background-color: #F0F0F9; | ||
| 63 | + border-radius: 4rpx; | ||
| 64 | + margin-right: 30rpx; | ||
| 65 | + padding: 0 16rpx; | ||
| 66 | +} | ||
| 67 | +.transverse-search .tags:last-child{ | ||
| 68 | + margin-right: 0; | ||
| 69 | +} | ||
| 70 | +.transverse-search .tags.active{ | ||
| 71 | + background-color: #F4DAB9; | ||
| 72 | + color:#8B5318; | ||
| 73 | + font-weight: 900; | ||
| 74 | +} | ||
| 75 | + | ||
| 76 | +.picker{ | ||
| 77 | + height: 50rpx; | ||
| 78 | + line-height: 50rpx; | ||
| 79 | +} | ||
| 80 | +.picker .input{ | ||
| 81 | + height: 50rpx; | ||
| 82 | + line-height: 50rpx; | ||
| 83 | + margin-right: 10rpx; | ||
| 84 | +} | ||
| 85 | +.picker .more{ | ||
| 86 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB.png"); | ||
| 87 | + width: 12rpx; | ||
| 88 | + height: 16rpx; | ||
| 89 | + min-width:12rpx; | ||
| 90 | +} | ||
| 91 | +.tags.active .picker .more{ | ||
| 92 | + background-image: url("http://qn.colorcun.com/reserve/images/%E8%8F%9C%E7%B3%BB%E9%80%89%E4%B8%AD.png"); | ||
| 16 | } | 93 | } |
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | <cover-view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</cover-view> | 11 | <cover-view wx:if="{{hasSlogan && seller.slogan}}" class="slogan">“{{seller.slogan}}”</cover-view> |
| 12 | <cover-view class="text flex-ll"> | 12 | <cover-view class="text flex-ll"> |
| 13 | <cover-view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</cover-view> | 13 | <cover-view class="text-item" wx:if="{{seller.cate[0].name}}">{{seller.cate[0].name}}</cover-view> |
| 14 | - <cover-view class="text-item" wx:if="{{seller.distance}}">距当前位置{{seller.distance}}</cover-view> | 14 | + <cover-view class="text-item" wx:if="{{seller.distance}}">距当前位置{{se.distance}}</cover-view> |
| 15 | </cover-view> | 15 | </cover-view> |
| 16 | <cover-view wx:if="{{hasStat}}" class="stat"> | 16 | <cover-view wx:if="{{hasStat}}" class="stat"> |
| 17 | <stat stat="{{seller.score}}"></stat> | 17 | <stat stat="{{seller.score}}"></stat> |
| @@ -6,7 +6,7 @@ import DA from './data'; | @@ -6,7 +6,7 @@ import DA from './data'; | ||
| 6 | import reddot from '../../utils/reddot'; | 6 | import reddot from '../../utils/reddot'; |
| 7 | const {regeneratorRuntime} = global | 7 | const {regeneratorRuntime} = global |
| 8 | const mapScale=15//18; | 8 | const mapScale=15//18; |
| 9 | -const transverseViewHeight=202; | 9 | +const transverseViewHeight=232; |
| 10 | const renNum=function(){ | 10 | const renNum=function(){ |
| 11 | let arr=[] | 11 | let arr=[] |
| 12 | for(let i=1;i<=30;i++){ | 12 | for(let i=1;i<=30;i++){ |
| @@ -46,7 +46,8 @@ Page({ | @@ -46,7 +46,8 @@ Page({ | ||
| 46 | {id:1,name:'环境好'}, | 46 | {id:1,name:'环境好'}, |
| 47 | {id:2,name:'菜品有特色'}, | 47 | {id:2,name:'菜品有特色'}, |
| 48 | {id:3,name:'超大包间'}, | 48 | {id:3,name:'超大包间'}, |
| 49 | - ] | 49 | + ], |
| 50 | + listMoreCount:0, | ||
| 50 | }, | 51 | }, |
| 51 | hasClickMoveToLocation:false,//点击回到我的位置 | 52 | hasClickMoveToLocation:false,//点击回到我的位置 |
| 52 | hasSellerConcat:hasSellerConcat, | 53 | hasSellerConcat:hasSellerConcat, |
| @@ -413,6 +414,7 @@ Page({ | @@ -413,6 +414,7 @@ Page({ | ||
| 413 | if(tags.length>0){ | 414 | if(tags.length>0){ |
| 414 | param.tags=tags; | 415 | param.tags=tags; |
| 415 | } | 416 | } |
| 417 | + this.selectComponent('#list').getList(param); | ||
| 416 | let now_sid=[]; | 418 | let now_sid=[]; |
| 417 | App.Customer.SellerList(param).then(res => { | 419 | App.Customer.SellerList(param).then(res => { |
| 418 | this.mapData.region.southwest.latitude=''; | 420 | this.mapData.region.southwest.latitude=''; |
| @@ -649,6 +651,7 @@ Page({ | @@ -649,6 +651,7 @@ Page({ | ||
| 649 | } | 651 | } |
| 650 | }) | 652 | }) |
| 651 | } | 653 | } |
| 654 | + if(mks.length<1) return mks; | ||
| 652 | //if(this.data.hasSuggestion){ | 655 | //if(this.data.hasSuggestion){ |
| 653 | let map = this.data.map; | 656 | let map = this.data.map; |
| 654 | mks.push({ | 657 | mks.push({ |
| @@ -702,4 +705,20 @@ Page({ | @@ -702,4 +705,20 @@ Page({ | ||
| 702 | caixiShow(){ | 705 | caixiShow(){ |
| 703 | this.selectComponent('#caixi').show(); | 706 | this.selectComponent('#caixi').show(); |
| 704 | }, | 707 | }, |
| 708 | + listEvent(e){ | ||
| 709 | + let d=e.detail | ||
| 710 | + console.log('listEvent',e); | ||
| 711 | + if(d.type=="getListEnd"){ | ||
| 712 | + this.setData({ | ||
| 713 | + listMoreCount:d.total | ||
| 714 | + }); | ||
| 715 | + }else if(d.type=='caixiShow'){ | ||
| 716 | + this.caixiShow(); | ||
| 717 | + }else if(d.type=='tagsChange'){ | ||
| 718 | + this.tagsChange(d.e); | ||
| 719 | + } | ||
| 720 | + }, | ||
| 721 | + listShow(){ | ||
| 722 | + this.selectComponent('#list').show(); | ||
| 723 | + }, | ||
| 705 | }) | 724 | }) |
| @@ -17,8 +17,12 @@ | @@ -17,8 +17,12 @@ | ||
| 17 | style="width: 100%; height: {{map.height}}px;"></map> | 17 | style="width: 100%; height: {{map.height}}px;"></map> |
| 18 | <formids url="/pages/reserve/search" style="position: fixed;"> | 18 | <formids url="/pages/reserve/search" style="position: fixed;"> |
| 19 | <cover-view | 19 | <cover-view |
| 20 | - class="flex-vc" | 20 | + class="flex-ll" |
| 21 | style="position:fixed;top:{{statusBarHeight}}px;left:0;height: {{titleBarHeight}}px; line-height: {{titleBarHeight}}px;"> | 21 | style="position:fixed;top:{{statusBarHeight}}px;left:0;height: {{titleBarHeight}}px; line-height: {{titleBarHeight}}px;"> |
| 22 | + <cover-view class="searchList flex-ll" catchtap="listShow"> | ||
| 23 | + <cover-image class="icon" src="http://qn.colorcun.com/reserve/images/hasList.png"></cover-image> | ||
| 24 | + <cover-view class="title">列表</cover-view> | ||
| 25 | + </cover-view> | ||
| 22 | <cover-view class="searchAddr flex-ll"> | 26 | <cover-view class="searchAddr flex-ll"> |
| 23 | <cover-image class="icon" src="http://qn.colorcun.com/custom/lite-online/image/search26.png"></cover-image> | 27 | <cover-image class="icon" src="http://qn.colorcun.com/custom/lite-online/image/search26.png"></cover-image> |
| 24 | <cover-view class="title">{{hasSuggestion?suggestion.title:'搜索地点或商圈'}}</cover-view> | 28 | <cover-view class="title">{{hasSuggestion?suggestion.title:'搜索地点或商圈'}}</cover-view> |
| @@ -27,6 +31,10 @@ | @@ -27,6 +31,10 @@ | ||
| 27 | </formids> | 31 | </formids> |
| 28 | </view> | 32 | </view> |
| 29 | <view class="transverse-view"> | 33 | <view class="transverse-view"> |
| 34 | + <view class="flex-vc transverse-view-top" bindtap="listShow"> | ||
| 35 | + <view class="line"></view> | ||
| 36 | + <view class="text">{{markers.length>0?'查看其它':'已扩大范围为你找到'}}{{listMoreCount}}家餐厅</view> | ||
| 37 | + </view> | ||
| 30 | <view class="transverse-search flex-ll"> | 38 | <view class="transverse-search flex-ll"> |
| 31 | <view | 39 | <view |
| 32 | bindtap="caixiShow" | 40 | bindtap="caixiShow" |
| @@ -59,13 +67,24 @@ | @@ -59,13 +67,24 @@ | ||
| 59 | </view> | 67 | </view> |
| 60 | </swiper-item> | 68 | </swiper-item> |
| 61 | </block> | 69 | </block> |
| 70 | + <swiper-item bindtap="gotoDetail2"> | ||
| 71 | + <view class="seller seller-last" id="seller-last"> | ||
| 72 | + <view class="empty"> | ||
| 73 | + <view class="info"> | ||
| 74 | + <view class="info-msg Semibold">缩放地图发现更多餐厅</view> | ||
| 75 | + <view class="info-txt">往任意方向拖动地图,可搜索不同范围</view> | ||
| 76 | + </view> | ||
| 77 | + <view class="icon"></view> | ||
| 78 | + </view> | ||
| 79 | + </view> | ||
| 80 | + </swiper-item> | ||
| 62 | </swiper> | 81 | </swiper> |
| 63 | <view class="empty-txt flex-vc"> | 82 | <view class="empty-txt flex-vc"> |
| 64 | <view class="seller" wx:if="{{hasGetSellersEnd}}"> | 83 | <view class="seller" wx:if="{{hasGetSellersEnd}}"> |
| 65 | - <view class="empty"> | 84 | + <view class="empty" bindtap="listShow"> |
| 66 | <view class="info"> | 85 | <view class="info"> |
| 67 | - <view class="info-msg Semibold">拖动地图发现更多商户</view> | ||
| 68 | - <view class="info-txt">往任意方向拖动地图,可搜索不同范围</view> | 86 | + <view class="info-msg Semibold">已扩大范围为你找到餐厅,去查看</view> |
| 87 | + <view class="info-txt">当前范围没有找到符合条件的餐厅</view> | ||
| 69 | </view> | 88 | </view> |
| 70 | <view class="icon"></view> | 89 | <view class="icon"></view> |
| 71 | </view> | 90 | </view> |
| @@ -82,7 +101,8 @@ | @@ -82,7 +101,8 @@ | ||
| 82 | <cover-view class="tab-patch"></cover-view> | 101 | <cover-view class="tab-patch"></cover-view> |
| 83 | <ds wx:if="{{hasSetActivity}}" map="{{map}}" id="ds"></ds> | 102 | <ds wx:if="{{hasSetActivity}}" map="{{map}}" id="ds"></ds> |
| 84 | <a2l bindshow="a2lshow" bindhide="a2lshow"></a2l> | 103 | <a2l bindshow="a2lshow" bindhide="a2lshow"></a2l> |
| 104 | +<list id="list" bindevent="listEvent" | ||
| 105 | + multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" tags="{{tags}}"></list> | ||
| 85 | <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" | 106 | <caixi multiArray="{{multiArray}}" multiIndex="{{multiIndex}}" |
| 86 | - bindactive="caixiActive" id="caixi" | ||
| 87 | -></caixi> | ||
| 88 | -<list id="list" markers="{{markers}}"></list> | 107 | + bindactive="caixiActive" id="caixi" |
| 108 | +></caixi> |
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | } | 16 | } |
| 17 | .moveToLocation{ | 17 | .moveToLocation{ |
| 18 | position: fixed; | 18 | position: fixed; |
| 19 | - bottom: 454rpx; | 19 | + bottom: 504rpx; |
| 20 | left: 20rpx; | 20 | left: 20rpx; |
| 21 | width: 62rpx; | 21 | width: 62rpx; |
| 22 | height: 62rpx; | 22 | height: 62rpx; |
| @@ -28,20 +28,12 @@ | @@ -28,20 +28,12 @@ | ||
| 28 | 28 | ||
| 29 | .transverse-view{ | 29 | .transverse-view{ |
| 30 | position: relative; | 30 | position: relative; |
| 31 | - height: 404rpx; | 31 | + height: 464rpx; |
| 32 | width: 100%; | 32 | width: 100%; |
| 33 | background-color: #fefefe; | 33 | background-color: #fefefe; |
| 34 | overflow: hidden; | 34 | overflow: hidden; |
| 35 | } | 35 | } |
| 36 | -.transverse-view-top{ | ||
| 37 | - border-radius: 20rpx 20rpx 0rpx 0rpx; | ||
| 38 | - background-color: #fefefe; | ||
| 39 | - position: absolute; | ||
| 40 | - top:-20rpx; | ||
| 41 | - left: 0; | ||
| 42 | - width: 100%; | ||
| 43 | - height: 0rpx; | ||
| 44 | -} | 36 | + |
| 45 | .transverse-search{ | 37 | .transverse-search{ |
| 46 | background-color: #fefefe; | 38 | background-color: #fefefe; |
| 47 | height: 60rpx; | 39 | height: 60rpx; |
| @@ -73,6 +65,9 @@ | @@ -73,6 +65,9 @@ | ||
| 73 | position: relative; | 65 | position: relative; |
| 74 | margin: 20rpx auto 0; | 66 | margin: 20rpx auto 0; |
| 75 | } | 67 | } |
| 68 | +.transverse-list .seller-last .empty{ | ||
| 69 | + width: 100%; | ||
| 70 | +} | ||
| 76 | .seller .empty .info{ | 71 | .seller .empty .info{ |
| 77 | height: 124rpx; | 72 | height: 124rpx; |
| 78 | font-size: 28rpx; | 73 | font-size: 28rpx; |
| @@ -91,6 +86,15 @@ | @@ -91,6 +86,15 @@ | ||
| 91 | height: 40rpx; | 86 | height: 40rpx; |
| 92 | } | 87 | } |
| 93 | .seller .empty .icon{ | 88 | .seller .empty .icon{ |
| 89 | + background-image: url("http://qn.colorcun.com/reserve/images/hasClick.png"); | ||
| 90 | + background-size: 100% 100%; | ||
| 91 | + width: 54rpx; | ||
| 92 | + height: 56rpx; | ||
| 93 | + position: absolute; | ||
| 94 | + top:82rpx; | ||
| 95 | + right:40rpx; | ||
| 96 | +} | ||
| 97 | +.seller-last .empty .icon{ | ||
| 94 | background-image: url("http://qn.colorcun.com/reserve/images/%E7%A7%BB%E5%8A%A8%E5%9C%B0%E5%9B%BE.png"); | 98 | background-image: url("http://qn.colorcun.com/reserve/images/%E7%A7%BB%E5%8A%A8%E5%9C%B0%E5%9B%BE.png"); |
| 95 | background-size: 100% 100%; | 99 | background-size: 100% 100%; |
| 96 | width: 116rpx; | 100 | width: 116rpx; |
| @@ -120,8 +124,8 @@ | @@ -120,8 +124,8 @@ | ||
| 120 | } | 124 | } |
| 121 | 125 | ||
| 122 | .searchAddr { | 126 | .searchAddr { |
| 123 | - margin-left: 38rpx; | ||
| 124 | - width: 450rpx; | 127 | + margin-left: 30rpx; |
| 128 | + width: 380rpx; | ||
| 125 | height: 60rpx; | 129 | height: 60rpx; |
| 126 | background-color: #fefefe; | 130 | background-color: #fefefe; |
| 127 | border-radius: 30rpx; | 131 | border-radius: 30rpx; |
| @@ -142,6 +146,29 @@ | @@ -142,6 +146,29 @@ | ||
| 142 | width: 100%; | 146 | width: 100%; |
| 143 | text-align: left; | 147 | text-align: left; |
| 144 | } | 148 | } |
| 149 | +.searchList{ | ||
| 150 | + margin-left: 26rpx; | ||
| 151 | + width: 100rpx; | ||
| 152 | + height: 60rpx; | ||
| 153 | + background-color: #fefefe; | ||
| 154 | + border-radius: 30rpx; | ||
| 155 | + line-height: 60rpx; | ||
| 156 | + color:#C28C56; | ||
| 157 | + font-size: 20rpx; | ||
| 158 | +} | ||
| 159 | +.searchList .icon{ | ||
| 160 | + min-width: 24rpx; | ||
| 161 | + width: 24rpx; | ||
| 162 | + height: 18rpx; | ||
| 163 | + margin: 0 8rpx 0 14rpx; | ||
| 164 | +} | ||
| 165 | +.searchList .title{ | ||
| 166 | + line-height: 60rpx; | ||
| 167 | + height: 60rpx; | ||
| 168 | + overflow: hidden; | ||
| 169 | + width: 100%; | ||
| 170 | + text-align: left; | ||
| 171 | +} | ||
| 145 | .empty-txt{ | 172 | .empty-txt{ |
| 146 | height: 300rpx; | 173 | height: 300rpx; |
| 147 | line-height: 300rpx; | 174 | line-height: 300rpx; |
| @@ -163,4 +190,21 @@ | @@ -163,4 +190,21 @@ | ||
| 163 | background:linear-gradient(to bottom ,#F4DAB9,#E9BE94); | 190 | background:linear-gradient(to bottom ,#F4DAB9,#E9BE94); |
| 164 | color:#8B5318; | 191 | color:#8B5318; |
| 165 | font-weight: 900; | 192 | font-weight: 900; |
| 193 | +} | ||
| 194 | + | ||
| 195 | +.transverse-view-top{ | ||
| 196 | + height: 60rpx; | ||
| 197 | +} | ||
| 198 | +.transverse-view-top .line{ | ||
| 199 | + height: 6rpx; | ||
| 200 | + width: 70rpx; | ||
| 201 | + margin-top: 14rpx; | ||
| 202 | + background-color: #E0E0E0; | ||
| 203 | +} | ||
| 204 | +.transverse-view-top .text{ | ||
| 205 | + height: 34rpx; | ||
| 206 | + line-height: 34rpx; | ||
| 207 | + font-size: 24rpx; | ||
| 208 | + color: #999999; | ||
| 209 | + margin-top: 4rpx; | ||
| 166 | } | 210 | } |
| @@ -56,9 +56,12 @@ export default { | @@ -56,9 +56,12 @@ export default { | ||
| 56 | silence: false, | 56 | silence: false, |
| 57 | }, | 57 | }, |
| 58 | 58 | ||
| 59 | - //商家列表 | 59 | + //地图页-商家 |
| 60 | 'App.Customer.SellerList': null, | 60 | 'App.Customer.SellerList': null, |
| 61 | 61 | ||
| 62 | + //地图页-商家-列表 | ||
| 63 | + 'App.Customer.SellerLists':null, | ||
| 64 | + | ||
| 62 | //桌位列表 | 65 | //桌位列表 |
| 63 | 'App.Tables.GetTableListsBySellerId': { | 66 | 'App.Tables.GetTableListsBySellerId': { |
| 64 | cachetime: 60, | 67 | cachetime: 60, |
-
Please register or login to post a comment