xt / xcx-book · Commits

Go to a project

Commit a13600653cd7bc93860006f991757c877ee36382

Authored by vking
1 parent e12e77f0
build: skipped

blue ui other

Inline Side-by-side
Showing 8 changed files with 309 additions and 1089 deletions
@@ -18,7 +18,7 @@ page { @@ -18,7 +18,7 @@ page {
18 --yellow: #FFC9AA; 18 --yellow: #FFC9AA;
19 --olive: #8dc63f; 19 --olive: #8dc63f;
20 --green: #39b54a; 20 --green: #39b54a;
21 - --cyan: #1cbbb4; 21 + --cyan: #42D4FF;
22 --blue: #42A5FF; 22 --blue: #42A5FF;
23 --purple: #6739b6; 23 --purple: #6739b6;
24 --mauve: #9c26b0; 24 --mauve: #9c26b0;
@@ -3899,6 +3899,9 @@ scroll-view.cu-steps .cu-item { @@ -3899,6 +3899,9 @@ scroll-view.cu-steps .cu-item {
3899 .text-xxl { 3899 .text-xxl {
3900 font-size: 40rpx; 3900 font-size: 40rpx;
3901 } 3901 }
  3902 +.text-44 {
  3903 + font-size: 44rpx;
  3904 +}
3902 3905
3903 .text-sl { 3906 .text-sl {
3904 font-size: 80rpx; 3907 font-size: 80rpx;
@@ -4029,7 +4032,9 @@ scroll-view.cu-steps .cu-item { @@ -4029,7 +4032,9 @@ scroll-view.cu-steps .cu-item {
4029 .lines-gray { 4032 .lines-gray {
4030 color: var(--gray); 4033 color: var(--gray);
4031 } 4034 }
4032 - 4035 +.text-666666{
  4036 + color: #666666;
  4037 +}
4033 .text-black, 4038 .text-black,
4034 .line-black, 4039 .line-black,
4035 .lines-black { 4040 .lines-black {
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </view> 8 </view>
9 <view wx:else="" class="flex flex-direction justify-center align-center"> 9 <view wx:else="" class="flex flex-direction justify-center align-center">
10 <image src="http://nosqn.colorcun.com/loading.gif" style="width: 40rpx;height: 40rpx;"></image> 10 <image src="http://nosqn.colorcun.com/loading.gif" style="width: 40rpx;height: 40rpx;"></image>
11 - <view class="margin-top bg-white txt-24-h">加载中，请稍后…</view> 11 + <view class="margin-top txt-24-h">加载中，请稍后…</view>
12 </view> 12 </view>
13 </view> 13 </view>
14 <block wx:else=""> 14 <block wx:else="">
@@ -10,36 +10,16 @@ Page({ @@ -10,36 +10,16 @@ Page({
10 * 页面的初始数据 10 * 页面的初始数据
11 */ 11 */
12 data: { 12 data: {
13 - seller:null,  
14 - IsCollectionSeller:false,  
15 - current:0, 13 + loading:0,
16 currentView:1, 14 currentView:1,
17 - hasOnlineReserve:false,  
18 - activeTab:'detail',  
19 - hasFullHouse:false,//满房  
20 - hasDishesImage:false,//是否有菜品图  
21 - hasPTactivity:false,//平台活动  
22 }, 15 },
23 16
24 /** 17 /**
25 * 生命周期函数--监听页面加载 18 * 生命周期函数--监听页面加载
26 */ 19 */
27 onLoad: function (options) { 20 onLoad: function (options) {
28 - if(wx.getStorageSync('remark')){  
29 - wx.removeStorageSync('remark')  
30 - }  
31 - console.log('onLoad', options)  
32 - console.log('初次进入详情页---小米8测试',this.data.reserveDate ? this.data.reserveDate : '没有日期','openid:',getApp().openid)  
33 this.options=options 21 this.options=options
34 this.downloadImages() 22 this.downloadImages()
35 - if(options.activeTab && options.activeTab!='detail'){  
36 - this.setData({  
37 - activeTab:options.activeTab||'detail',  
38 - })  
39 - }  
40 - this.setData({  
41 - reserveDate: options.date ? options.date : util.unixtoTime(new Date() / 1000, 'YYYY-MM-DD'),  
42 - })  
43 App.Customer.IsCollectionSeller({ 23 App.Customer.IsCollectionSeller({
44 sid:options.id, 24 sid:options.id,
45 openid:getApp().openid 25 openid:getApp().openid
@@ -62,6 +42,10 @@ Page({ @@ -62,6 +42,10 @@ Page({
62 commentLabel:res.data, 42 commentLabel:res.data,
63 }) 43 })
64 }) 44 })
  45 + wx.setNavigationBarColor({
  46 + frontColor:'#000000',
  47 + backgroundColor:'#ffffff',
  48 + })
65 }, 49 },
66 GetSellerDetail(){ 50 GetSellerDetail(){
67 let options=this.options 51 let options=this.options
@@ -107,11 +91,14 @@ Page({ @@ -107,11 +91,14 @@ Page({
107 }) 91 })
108 } 92 }
109 let hasDishesImage=false; 93 let hasDishesImage=false;
  94 + let hasDishesText=false;
110 if(seller.dishes.length>0){ 95 if(seller.dishes.length>0){
111 seller.dishes.some((dishes)=>{ 96 seller.dishes.some((dishes)=>{
112 if(dishes.image){ 97 if(dishes.image){
113 hasDishesImage=true 98 hasDishesImage=true
114 dishes.image=dishes.image.replace('//qn.colorcun','//nosqn.colorcun') 99 dishes.image=dishes.image.replace('//qn.colorcun','//nosqn.colorcun')
  100 + }else{
  101 + hasDishesText:true
115 } 102 }
116 }) 103 })
117 } 104 }
@@ -139,7 +126,9 @@ Page({ @@ -139,7 +126,9 @@ Page({
139 let obj={ 126 let obj={
140 seller:seller, 127 seller:seller,
141 hasDishesImage:hasDishesImage, 128 hasDishesImage:hasDishesImage,
  129 + hasDishesText:hasDishesText,
142 hasOnlineReserve:seller.is_online_reserve==1, 130 hasOnlineReserve:seller.is_online_reserve==1,
  131 + loading:1,
143 } 132 }
144 if(this.options.classID){ 133 if(this.options.classID){
145 obj.seletroomlist=[{ 134 obj.seletroomlist=[{
@@ -167,19 +156,6 @@ Page({ @@ -167,19 +156,6 @@ Page({
167 */ 156 */
168 onShow: function () { 157 onShow: function () {
169 this.selectComponent('#getpos').getPos(); 158 this.selectComponent('#getpos').getPos();
170 - if (this.data.reserveDate && this.data.seletroomlist){//后退进入等情况刷新时段  
171 - this.setData({  
172 - reserveDate:this.data.reserveDate  
173 - })  
174 - }  
175 - //已经完成预订的情况---清除日期、时段、选中包间  
176 - if(wx.getStorageSync('order')){  
177 - this.setData({  
178 - seletroomlist:[],  
179 - })  
180 - wx.removeStorageSync('order')  
181 - }  
182 -  
183 }, 159 },
184 160
185 /** 161 /**
@@ -234,56 +210,14 @@ Page({ @@ -234,56 +210,14 @@ Page({
234 console.log('shareParams==>',shareParams) 210 console.log('shareParams==>',shareParams)
235 return shareParams 211 return shareParams
236 }, 212 },
237 - reserveEvent(e){  
238 - if(this.data.hasOnlineReserve && util.attr(e,'act')!='phone'){  
239 - let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/reserve')  
240 - wx.navigateTo({  
241 - url:url,  
242 - })  
243 - return  
244 - }  
245 - this.selectComponent('#as').show(this.data.seller);  
246 - },  
247 - reservePhone(e){  
248 - if(e.detail.value){  
249 - let phone=e.detail.value.replace(/[^\d]/,'')  
250 - wx.makePhoneCall({  
251 - phoneNumber:phone  
252 - })  
253 - }  
254 -  
255 - },  
256 - follow(){  
257 - let param={ 213 + async SetRelaOpenid(){
  214 + if(!this.options.fromid) return;
  215 + let openid=await getApp().getOpenid()
  216 + App.Reserve.SetRelaOpenid({
  217 + openid:openid,
  218 + fromid:this.options.fromid,
258 sid:this.options.id, 219 sid:this.options.id,
259 - openid:getApp().openid,  
260 - }  
261 - if(this.data.IsCollectionSeller){//已收藏  
262 - param.cancel=1  
263 - }  
264 - let hasFollow=!this.data.IsCollectionSeller  
265 - this.setData({  
266 - IsCollectionSeller:hasFollow  
267 - })  
268 - App.Customer.SetCollectionRel(param);  
269 - PubSub.emit(  
270 - 'follow',  
271 - {  
272 - sid:this.options.id,  
273 - hasFollow:hasFollow,  
274 - }  
275 - )  
276 - },  
277 - lookLocation:function(){  
278 - //console.log(this.data.seller.lat,this.data.seller.long,this.data.detail.map_address)  
279 - wx.openLocation({  
280 - latitude:Number(this.data.seller.lat),  
281 - longitude:Number(this.data.seller.long),  
282 - scale:17,  
283 - address:this.data.seller.map_address,  
284 - success:function (res) {  
285 - console.log(res)  
286 - } 220 + sub:this.options.hasSellerShare?2:3,//关系类型：1/2/3 邀请关系/商户端分享关系/C端分享关系
287 }) 221 })
288 }, 222 },
289 onpos(e){ 223 onpos(e){
@@ -291,6 +225,11 @@ Page({ @@ -291,6 +225,11 @@ Page({
291 this.location=e.detail 225 this.location=e.detail
292 this.GetSellerDetail(); 226 this.GetSellerDetail();
293 }, 227 },
  228 + bindtransition(e){
  229 + this.setData({
  230 + currentView:e.detail.current+1
  231 + })
  232 + },
294 reviweBanner(){ 233 reviweBanner(){
295 let urls=[]; 234 let urls=[];
296 this.data.seller.envi_image.forEach(url=>{ 235 this.data.seller.envi_image.forEach(url=>{
@@ -303,148 +242,4 @@ Page({ @@ -303,148 +242,4 @@ Page({
303 urls:urls 242 urls:urls
304 }) 243 })
305 }, 244 },
306 - reviweRoomImage(e){  
307 - let urls=[];  
308 - this.data.seller.room_image.forEach(url=>{  
309 - if(url){  
310 - urls.push(url+zdmask)  
311 - }  
312 - })  
313 - wx.previewImage({  
314 - current:util.attr(e,'current')+zdmask,  
315 - urls:urls  
316 - })  
317 - },  
318 - reviweDishesImage(e){  
319 - let urls=[];  
320 - this.data.seller.dishes.forEach(d=>{  
321 - if(d.image){  
322 - urls.push(d.image+zdmask)  
323 - }  
324 - })  
325 - wx.previewImage({  
326 - current:util.attr(e,'current')+zdmask,  
327 - urls:urls  
328 - })  
329 - },  
330 - showDiscount(){  
331 - this.selectComponent('#discount').show()  
332 - },  
333 - discountHide(){  
334 - this.setData({  
335 - hasDisplayDiscount:false  
336 - })  
337 - },  
338 - discountShow(){  
339 - this.setData({  
340 - hasDisplayDiscount:true  
341 - })  
342 - },  
343 - shareUserinfo(){  
344 - //util.toast('授权成功，请继续分享','none');  
345 - this.selectComponent('#share').show()  
346 - },  
347 - bindtransition(e){  
348 - this.setData({  
349 - currentView:e.detail.current+1  
350 - })  
351 - },  
352 - async SetRelaOpenid(){  
353 - if(!this.options.fromid) return;  
354 - let openid=await getApp().getOpenid()  
355 - App.Reserve.SetRelaOpenid({  
356 - openid:openid,  
357 - fromid:this.options.fromid,  
358 - sid:this.options.id,  
359 - sub:this.options.hasSellerShare?2:3,//关系类型：1/2/3 邀请关系/商户端分享关系/C端分享关系  
360 - })  
361 - },  
362 - switchTabs(e){  
363 - this.setData({  
364 - activeTab:util.attr(e,'act'),  
365 - })  
366 - },  
367 - reserve:{},  
368 - selectpeople(e){//人数改变  
369 - console.log(e);  
370 - this.reserve.pnum=e.detail.people;  
371 - if(e.detail.action=='click'){  
372 -  
373 - }  
374 - },  
375 - //时段改变  
376 - selectsection(e){  
377 - console.log(e);  
378 - setTimeout(()=>{  
379 - this.setData({  
380 - reserveSection:e.detail.section!='' ? e.detail.section : null,  
381 - seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,  
382 - })  
383 - },0)  
384 -  
385 - this.reserve.section=e.detail.section;  
386 - this.reserve.time=e.detail.time;  
387 - },  
388 - //包间类型改变  
389 - selectroom(e){  
390 - console.log(e)  
391 - this.setData({  
392 - seletroomlist:e.detail.selectroom  
393 - })  
394 - },  
395 - complete(){  
396 - if(!this.data.reserveSection){  
397 - return util.toast('请选择可预订的时段','none');  
398 - }  
399 - if(!this.data.seletroomlist || (this.data.seletroomlist && this.data.seletroomlist.length==0)){  
400 - return util.toast('请选择包间类型','none');  
401 - }  
402 - this.reserve.sid=this.options.id  
403 - this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');  
404 - this.reserve.room_demand=JSON.stringify(this.data.seletroomlist)  
405 - if(this.options.pnum){  
406 - this.reserve.pnum = this.options.pnum;  
407 - }  
408 - wx.navigateTo({  
409 - url:util.http_build_query(this.reserve,'./submit')  
410 - })  
411 - },  
412 - selecttime(e){//时间改变  
413 - console.log(e);  
414 - if(!e.detail.time){//满房  
415 - this.setData({  
416 - hasFullHouse:true,  
417 - })  
418 - return;  
419 - }  
420 - this.reserve.time=e.detail.time;  
421 - if(e.detail.action=='click'){  
422 - this.reserve.sid=this.options.id  
423 - this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00')  
424 - //date=2019-07-25&pnum=6&time=20%3A00&sid=154&ddate=1564056000  
425 - wx.navigateTo({  
426 - url:util.http_build_query(this.reserve,'./submit')  
427 - })  
428 - }  
429 - },  
430 - selectdate(e){//日期改变  
431 - if(e.detail.action==401){//无可用桌位  
432 - return;  
433 - }  
434 - console.log('selectdate',e);  
435 - if(e.detail.overdate==1){//今天之前  
436 - return this.setData({  
437 - hasFullHouse:true,  
438 - fullHouseMsg:'请选择今天之后的日期',  
439 - })  
440 - }  
441 - this.reserve.date=e.detail.date;  
442 - this.setData({  
443 - reserveDate:e.detail.date,  
444 - seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,  
445 - hasFullHouse:false,  
446 - reserveSection:e.detail.action=='click' ? null : this.data.reserveSection,  
447 - fullHouseMsg:'今日所有包间已订满',  
448 - })  
449 - }  
450 }) 245 })
1 { 1 {
2 "navigationBarBackgroundColor": "#ffffff", 2 "navigationBarBackgroundColor": "#ffffff",
3 - "navigationBarTextStyle": "black", 3 + "navigationBarTextStyle": "white",
4 "navigationBarTitleText":"周到安排", 4 "navigationBarTitleText":"周到安排",
5 "usingComponents": { 5 "usingComponents": {
6 "formids":"/components/formids/formids", 6 "formids":"/components/formids/formids",
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 "stat":"/components/stat/stat", 9 "stat":"/components/stat/stat",
10 "as-phone":"/components/actionSheet/phone", 10 "as-phone":"/components/actionSheet/phone",
11 "nav":"/components/nav/nav", 11 "nav":"/components/nav/nav",
12 - "getpos":"/components/userinfo/getpos",  
13 "discount":"/components/reserve/seller/discount", 12 "discount":"/components/reserve/seller/discount",
14 "share":"/components/reserve/share/share", 13 "share":"/components/reserve/share/share",
15 "people":"/components/reserve/people/people", 14 "people":"/components/reserve/people/people",
@@ -19,7 +18,9 @@ @@ -19,7 +18,9 @@
19 "section":"/components/reserve/section/section", 18 "section":"/components/reserve/section/section",
20 "select-room":"/components/reserve/select-room/select-room", 19 "select-room":"/components/reserve/select-room/select-room",
21 "service":"/components/tips/service", 20 "service":"/components/tips/service",
  21 +
22 "taocan":"/components/2.0/taocan/lists", 22 "taocan":"/components/2.0/taocan/lists",
23 - "plcard":"/components/2.0/pinglun/card" 23 + "plcard":"/components/2.0/pinglun/card",
  24 + "getpos":"/components/2.0/userinfo/getpos"
24 } 25 }
25 } 26 }
1 <!--pages/reserve/detail.wxml--> 1 <!--pages/reserve/detail.wxml-->
2 -<include src="detail.skeleton.wxml" wx:if="{{!seller}}"/>  
3 -<layout wx:else="" style="{{hasDisplayDiscount?'position: fixed;width:100vw;height:100vk;':''}}">  
4 - <nav hasHome>{{seller.sellername}}</nav>  
5 - <!-- 包间预定 -->  
6 - <view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">  
7 - <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="detail">  
8 - <view class="tabs-item-text {{activeTab=='detail'?'active':''}}">餐厅详情</view>  
9 - </view>  
10 - <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="reserve">  
11 - <view class="tabs-item-text {{activeTab=='reserve'?'active':''}}">包间预订</view> 2 +<wxs src="../../utils/util.wxs" module="util" />
  3 +<page loading="{{loading}}">
  4 + <nav hasHome wx:if="{{hasNav}}">{{seller.sellername}}</nav>
  5 + <view class="swiper-view">
  6 + <swiper class="swiper-image"
  7 + indicator-dots="{{false}}" autoplay="{{false}}"
  8 + circular="{{false}}" vertical="{{false}}"
  9 + interval="2000" duration="500"
  10 + previous-margin="{{0}}px" next-margin="{{0}}px"
  11 + current="{{current}}" bindchange="bindtransition" bindtap="reviweBanner">
  12 + <block wx:for="{{seller.envi_image}}" wx:key="envi_image">
  13 + <swiper-item>
  14 + <image class="swiper-image" mode="aspectFill"
  15 + src="{{item}}?imageView2/2/w/860/interlace/0/q/100" ></image>
  16 + </swiper-item>
  17 + </block>
  18 + </swiper>
  19 + <view class="swiper-num view padding-lr-sm" wx:if="{{seller.envi_image.length>1}}">
  20 + {{currentView}}/{{seller.envi_image.length}}
12 </view> 21 </view>
13 </view> 22 </view>
14 - <view hidden="{{activeTab!='detail'}}">  
15 - <view class="seller-banner" style="{{hasOnlineReserve?'margin-top: 80rpx;':''}}">  
16 - <swiper  
17 - indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"  
18 - interval="2000" duration="500"  
19 - previous-margin="{{0}}px" next-margin="{{0}}px"  
20 - current="{{current}}" bindchange="bindtransition" bindtap="reviweBanner">  
21 - <block wx:for="{{seller.envi_image}}" wx:key="sellers.key">  
22 - <swiper-item>  
23 - <image class="image" mode="aspectFill"  
24 - src="{{item}}?imageView2/2/w/860/interlace/0/q/100" ></image>  
25 - </swiper-item>  
26 - </block>  
27 - </swiper>  
28 - <view class="slogan" wx:if="{{seller.slogan}}">  
29 - <view class="slogan-view flex-ll">  
30 - <view class="dot"></view>  
31 - <view>{{seller.slogan}}</view> 23 + <view class="view margin-lr-sm radius bg-white padding text-black" style="margin-top: -50rpx; position: relative;z-index: 1;">
  24 + <view class="view flex justify-start margin-bottom-sm">
  25 + <view class="view flex-treble">
  26 + <view class="text-bold text-44">
  27 + {{seller.sellername}}
  28 + <view class="broad" wx:if="{{seller.brand}}">
  29 + <view class="broad-1"></view>
  30 + <view class="broad-2">{{seller.brand.name}}</view>
  31 + <view class="broad-3"></view>
  32 + </view>
32 </view> 33 </view>
  34 + <view class="view bg-white" style="margin-top: 6rpx;" wx:if="{{seller.cate.length>0}}">{{util.replace(seller.cate,',','/')}}</view>
  35 + </view>
  36 + <view class="view solid-left padding-left flex justify-center align-center text-orange margin-left-sm"
  37 + wx:if="{{seller.average>0}}"
  38 + style="height: 90rpx;line-height: 90rpx; margin-top: 8rpx;">
  39 + <view class="txt-32-h">¥</view>
  40 + <view class="txt-44-h text-bold">{{seller.average}}</view>
  41 + <view class="txt-32-h">/人</view>
33 </view> 42 </view>
34 - <view class="swiper-num" wx:if="{{seller.envi_image.length>0}}">{{currentView}} / {{seller.envi_image.length}}</view>  
35 </view> 43 </view>
36 - <view class="pages">  
37 - <view class="seller">  
38 - <view class="base">  
39 - <view class="name Semibold flex-lr">  
40 - <view class="name-info">{{seller.sellername}}  
41 - <view class="broad" wx:if="{{seller.brand}}">  
42 - <view class="broad-1"></view>  
43 - <view class="broad-2">{{seller.brand.name}}</view>  
44 - <view class="broad-3"></view>  
45 - </view>  
46 - </view>  
47 - <view class="average" wx:if="{{seller.average>0}}">¥{{seller.average}}/人</view>  
48 - </view>  
49 - <view class="ping flex-ll">  
50 - <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view>  
51 - <view class="item" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>  
52 - <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>  
53 - <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>  
54 - </view>  
55 - <view class="label_c" wx:if="{{seller.label_cstr}}">  
56 - <text class="label_text" >{{seller.label_cstr}}</text>  
57 - </view> 44 + <view class="view flex-wrap flex margin-bottom-sm">
  45 + <view class="view label_c solid text-blue txt-24-h padding-lr-xs margin-right-xs margin-bottom-xs" wx:for="{{seller.label_c}}" wx:key="label_c">{{item.name}}</view>
  46 + <view class="view label_c solid text-cyan txt-24-h padding-lr-xs margin-right-xs margin-bottom-xs" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>
  47 + <view class="view label_c solid text-cyan txt-24-h padding-lr-xs margin-right-xs margin-bottom-xs" wx:if="{{seller.is_parking==1}}">停车场</view>
  48 + <view class="view label_c solid text-cyan txt-24-h padding-lr-xs margin-right-xs margin-bottom-xs" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
  49 + </view>
  50 + <view class="slogan flex align-center text-blue margin-bottom" wx:if="{{seller.slogan}}">
  51 + <view class="slogan-icon view margin-lr-sm"></view>{{seller.slogan}}
  52 + </view>
  53 + <view class="flex justify-start align-start">
  54 + <view class="flex-treble">
  55 + <view class="text-bold text-30">{{seller.real_address||seller.map_address}}</view>
  56 + <view wx:if="{{seller.distanceStr}}" class="flex align-center text-666666 txt-28-h">
  57 + <view class="localtion view margin-right-xs"></view>
  58 + {{seller.distanceStr?'距您'+seller.distanceStr:''}}
58 </view> 59 </view>
59 - <view>  
60 - <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">  
61 - <view class="addr-view" bindtap="lookLocation">  
62 - <view class="addr-text flex-ll">  
63 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
64 - <view class="text">{{seller.real_address||seller.map_address}}</view>  
65 - </view>  
66 - <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>  
67 - </view>  
68 - <view class="more more-phone" bindtap="reserveEvent" data-act="phone"></view>  
69 - </view>  
70 - <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >  
71 - <view class="addr-view">  
72 - <view class="addr-text flex-ll">  
73 - <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
74 - <view class="text">{{seller.real_address||seller.map_address}}</view>  
75 - </view>  
76 - <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>  
77 - </view>  
78 - <view class="more more-addr"></view>  
79 - </view> 60 + </view>
  61 + <view class="view margin-lr-sm flex flex-direction align-start justify-center">
  62 + <view class="map-icon view"></view>
  63 + <view class="txt-24-h text-blue">位置</view>
  64 + </view>
  65 + <view class="view margin-left-sm flex flex-direction align-start justify-center">
  66 + <view class="tel-icon view"></view>
  67 + <view class="txt-24-h text-blue">电话</view>
  68 + </view>
  69 + </view>
  70 + </view>
  71 + <view class="padding-lg bg-white text-black margin-top-sm">
  72 + <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">
  73 + <view class="activity-view-easy flex-lr">
  74 + <view class="activity-left flex-ll">
  75 + <view class="activity-view-tit">优惠</view>
  76 + <view class="activity-view-blk" wx:if="{{seller.receive_condition_1}}">进店赠红包</view>
  77 + <view class="activity-view-blk" wx:if="{{seller.receive_condition_2}}">消费赠红包</view>
  78 + <view class="activity-view-blk" wx:if="{{seller.isopen_md==1 && hasPTactivity}}">平台红包</view>
  79 + </view>
  80 + <view class="flex-rr activity-right">
  81 + <view class="more"></view>
80 </view> 82 </view>
81 </view> 83 </view>
82 - <view wx:if="{{seller}}">  
83 - <view class="black20line"></view>  
84 - <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">  
85 - <view class="activity-view-easy flex-lr">  
86 - <view class="activity-left flex-ll">  
87 - <view class="activity-view-tit">优惠</view>  
88 - <view class="activity-view-blk" wx:if="{{seller.receive_condition_1}}">进店赠红包</view>  
89 - <view class="activity-view-blk" wx:if="{{seller.receive_condition_2}}">消费赠红包</view>  
90 - <view class="activity-view-blk" wx:if="{{seller.isopen_md==1 && hasPTactivity}}">平台红包</view>  
91 - </view>  
92 - <view class="flex-rr activity-right">  
93 - <view class="more"></view>  
94 - </view>  
95 - </view>  
96 - <view class="activityStr" wx:if="{{seller.activityStr}}"> 84 + <view class="activityStr" wx:if="{{seller.activityStr}}">
  85 + {{seller.activityStr}}
  86 + </view>
  87 + </view>
  88 + <block wx:elif="{{seller.activityStr}}">
  89 + <view class="view flex align-center" bindtap="showDiscount">
  90 + <view class="view flex flex-treble text-cut align-center">
  91 + <view class="view margin-right-lg txt-32-h">优惠</view>
  92 + <view class="view flex-treble text-cut">
97 {{seller.activityStr}} 93 {{seller.activityStr}}
98 </view> 94 </view>
99 - <view class="black20line"></view>  
100 </view> 95 </view>
101 - <block wx:elif="{{seller.activityStr}}">  
102 - <view class="activity-view-easy flex-lr" bindtap="showDiscount">  
103 - <view class="activity-left flex-ll">  
104 - <view class="activity-view-tit">优惠</view>  
105 - <view class="activity-view-activityStr">{{seller.activityStr}}</view>  
106 - </view>  
107 - <view class="flex-rr activity-right">  
108 - <view class="more"></view>  
109 - </view>  
110 - </view>  
111 - <view class="black20line"></view>  
112 - </block>  
113 - <block wx:if="{{seller.isopen_md!=1 && hasPTactivity}}">  
114 - <view class="seller" >  
115 - <view class="activity-view-easy flex-lr" >  
116 - <view class="activity-left flex-ll">  
117 - <view class="icon"></view>  
118 - <view class="discount" >本店不可使用平台红包</view>  
119 - </view>  
120 - </view>  
121 - </view>  
122 - <view class="black20line"></view>  
123 - </block>  
124 - <view class="block" wx:if="{{seller.room_image.length>0}}">  
125 - <view class="header flex-ll">  
126 - <view class="line"></view>  
127 - <view class="name">包间环境</view> 96 + <view class="view more margin-left-xs"></view>
  97 + </view>
  98 + </block>
  99 + <block wx:if="{{seller.isopen_md!=1 && hasPTactivity}}">
  100 + <view class="seller" >
  101 + <view class="activity-view-easy flex-lr" >
  102 + <view class="activity-left flex-ll">
  103 + <view class="icon"></view>
  104 + <view class="discount" >本店不可使用平台红包</view>
128 </view> 105 </view>
129 - <scroll-view  
130 - scroll-x  
131 - class="baos"  
132 - scroll-into-view="{{toView}}"  
133 - scroll-top="{{scrollTop}}"  
134 - >  
135 -  
136 - <block wx:for="{{seller.room_image}}" wx:key="sellers.key">  
137 - <view class="image">  
138 - <image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"  
139 - src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>  
140 - </view>  
141 - </block>  
142 -  
143 - </scroll-view>  
144 - </view>  
145 - <view class="black20line"></view>  
146 - <view style="width: 110%;margin-left: -5%;">  
147 - <taocan sid="{{seller.id}}" ></taocan>  
148 </view> 106 </view>
  107 + </view>
  108 + </block>
  109 + </view>
  110 + <view class="view bg-white text-black padding-tb-lg margin-top-sm" wx:if="{{seller.room_image.length>0}}">
  111 + <view class="view padding-left-lg text-bold txt-40-h margin-bottom">参观包间</view>
  112 + <scroll-view class="text-cut margin-bottom-sm" scroll-x="true" bindscroll="scroll" style="width: 100%;">
  113 + <block wx:for="{{seller.room_image}}" wx:key="room_image">
  114 + <image class="room_image" mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
  115 + src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
  116 + </block>
  117 + </scroll-view>
  118 + </view>
149 119
150 - <view class="black20line"></view>  
151 - <view class="block" wx:if="{{seller.dishes.length>0}}">  
152 - <view class="header flex-lr">  
153 - <view class="flex-ll">  
154 - <view class="line"></view>  
155 - <view class="name">推荐菜品</view>  
156 - </view> 120 + <view class="view bg-white text-black padding-tb-lg margin-top-sm" wx:if="{{seller.dishes.length>0}}">
  121 + <view class="view padding-left-lg text-bold txt-40-h margin-bottom">推荐菜品</view>
  122 + <scroll-view class="text-cut margin-bottom-sm"
  123 + wx:if="{{hasDishesImage}}"
  124 + scroll-x="true" bindscroll="scroll" style="width: 100%;">
  125 + <block wx:for="{{seller.dishes}}" wx:key="dishes-image">
  126 + <view class="dishes-image-views" wx:if="{{item.image}}">
  127 + <image class="dishes-image" mode="aspectFill"
  128 + bindtap="reviweDishesImage" data-current="{{item.image}}"
  129 + src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
  130 + <view class="flex txt-28-h align-center" style="margin-top: 16rpx; width: 260rpx;">
  131 + <image style="width: 24rpx;height: 24rpx; margin-right: 10rpx;"
  132 + src="http://nosqn.colorcun.com/detail/x%20%289%29.png"/>
  133 + <text class="text-cut">{{item.name}}{{item.name}}</text>
157 </view> 134 </view>
158 - <scroll-view wx:if="{{hasDishesImage}}"  
159 - scroll-x  
160 - class="cais"  
161 - scroll-into-view="{{toView}}"  
162 - scroll-top="{{scrollTop}}"  
163 - >  
164 - <block wx:for="{{seller.dishes}}" wx:key="sellers.key">  
165 - <view class="cais-views" wx:if="{{item.image}}">  
166 - <view class="image-view" >  
167 - <view class="image">  
168 - <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"  
169 - src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>  
170 - </view>  
171 - <view class="text Semibold">{{item.name}}</view>  
172 - </view>  
173 - </view>  
174 - </block>  
175 - </scroll-view>  
176 - <view class="cais-text">  
177 - <block wx:for="{{seller.dishes}}" wx:key="sellers.key">  
178 - <view wx:if="{{!item.image}}">{{item.name}}</view>  
179 - </block> 135 + </view>
  136 + </block>
  137 + </scroll-view>
  138 + <view class="cais-text flex flex-wrap view margin-lr-lg margin-top-lg padding-tb-lg padding-lr-sm"
  139 + wx:if="{{hasDishesText}}">
  140 + <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
  141 + <view wx:if="{{!item.image}}" class="margin-bottom-sm text-666666 margin-right-lg">{{item.name}}</view>
  142 + </block>
  143 + </view>
  144 + </view>
  145 +
  146 + <block wx:if="{{seller.seller_config_info.is_display_dish==1}}">
  147 + <navigator url="/pack-cookbook/pages/index?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">
  148 + <view class="view padding-lg margin-top-sm bg-white text-black">
  149 + <view class="view flex justify-between align-center">
  150 + <view class="view txt-40-h text-bold">查看菜单</view>
  151 + <view class="view flex justify-end align-center">
  152 + <view style="font-size: 28rpx;margin-right: 20rpx;">所有菜品</view>
  153 + <view class="more"></view>
180 </view> 154 </view>
181 </view> 155 </view>
182 - <block wx:if="{{seller.seller_config_info.is_display_dish==1}}">  
183 - <view class="black20line"></view>  
184 - <navigator url="/pack-cookbook/pages/index?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">  
185 - <view class="view padding-tb-lg">  
186 - <view class="view flex justify-between align-center">  
187 - <view class="view txt-40-h text-bold">查看菜单</view>  
188 - <view class="view flex justify-end align-center">  
189 - <view style="font-size: 28rpx;margin-right: 20rpx;">所有菜品</view>  
190 - <view class="more"></view>  
191 - </view>  
192 - </view>  
193 - </view>  
194 - </navigator>  
195 - </block>  
196 - <block wx:if="{{seller.comment_info}}">  
197 - <view class="black20line"></view>  
198 - <navigator url="/pages/pinglun/mylist?act=seller&sid={{seller.id}}" hover-class="navigator-hover">  
199 - <view class="view padding-tb-lg">  
200 - <view class="view flex justify-between align-center">  
201 - <view class="view txt-40-h text-bold">用户评价</view>  
202 - <view class="view flex justify-end align-center">  
203 - <view style="font-size: 28rpx;margin-right: 20rpx;">所有评价</view>  
204 - <view class="more"></view>  
205 - </view>  
206 - </view>  
207 - </view>  
208 - </navigator>  
209 - <view class="view padding-bottom-xl">  
210 - <view class="view flex flex-wrap" wx:if="{{commentLabel.length>0}}">  
211 - <block wx:for="{{commentLabel}}" wx:key="commentLabel">  
212 - <view class="view commentLabel padding-lr-sm margin-bottom-sm margin-right-sm">{{item.name}}</view>  
213 - </block>  
214 - </view>  
215 - <view class="margin-top-lg">  
216 - <plcard post="{{seller.comment_info}}"></plcard>  
217 - </view> 156 + </view>
  157 + </navigator>
  158 + </block>
  159 + <block wx:if="{{seller.comment_info}}">
  160 + <navigator url="/pages/pinglun/mylist?act=seller&sid={{seller.id}}" hover-class="navigator-hover">
  161 + <view class="view padding-lg margin-top-sm bg-white text-black">
  162 + <view class="view flex justify-between align-center">
  163 + <view class="view txt-40-h text-bold">用户评价</view>
  164 + <view class="view flex justify-end align-center">
  165 + <view style="font-size: 28rpx;margin-right: 20rpx;">所有评价</view>
  166 + <view class="more"></view>
218 </view> 167 </view>
219 - </block> 168 + </view>
220 </view> 169 </view>
221 - </view>  
222 - <view class="footer flex-lr">  
223 - <view class="left flex-cc">  
224 - <formids class="follow flex-tb" url="/pages/customer/index">  
225 - <image class="follow-img-index" src="http://nosqn.colorcun.com/custom/lite-online/image/%E9%A6%96%E9%A1%B5.png"></image>  
226 - <view class="text">首页</view>  
227 - </formids>  
228 - <userinfo class="follow flex-tb" binduserinfo="follow">  
229 - <image class="follow-img-follow" src="http://nosqn.colorcun.com/custom/lite-online/image/%E6%94%B6%E8%97%8F.png" wx:if="{{!IsCollectionSeller}}"></image>  
230 - <image class="follow-img-follow" src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%B7%B2%E6%94%B6%E8%97%8F.png" wx:else=""></image>  
231 - <view class="text">收藏</view>  
232 - </userinfo>  
233 - <service class="follow">  
234 - <formids class="flex-tb">  
235 - <image class="follow-img-service" src="http://nosqn.colorcun.com/shead1.png"></image>  
236 - <view class="text">客服</view>  
237 - </formids>  
238 - </service>  
239 - <userinfo class="follow flex-tb" binduserinfo="shareUserinfo">  
240 - <image class="follow-img-share" src="http://nosqn.colorcun.com/mapmenu/seshare.png"></image>  
241 - <view class="text">分享</view>  
242 - </userinfo> 170 + </navigator>
  171 + <view class="view padding-bottom-xl padding-lr-lg bg-white text-black">
  172 + <view class="view flex flex-wrap" wx:if="{{commentLabel.length>0}}">
  173 + <block wx:for="{{commentLabel}}" wx:key="commentLabel">
  174 + <view class="view commentLabel padding-lr-sm margin-bottom-sm margin-right-sm">{{item.name}}</view>
  175 + </block>
243 </view> 176 </view>
244 - <view class="reserve reserve-click flex-vc">  
245 - <formids class="flex-vc" bindclick="reserveEvent" id="reserve-button">  
246 - <view class="text Semibold">订包间</view>  
247 - </formids> 177 + <view class="margin-top-lg">
  178 + <plcard post="{{seller.comment_info}}"></plcard>
248 </view> 179 </view>
249 -  
250 </view> 180 </view>
251 - <!--  
252 - <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips>  
253 - --> 181 + </block>
254 182
255 - </view>  
256 - <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">  
257 - <view class="olreserve bg_white">  
258 - <calendar seller="{{seller}}" bindselectdate="selectdate" date="{{reserveDate}}"></calendar>  
259 - <view class="reserve-time Semibold">预订时段</view>  
260 - <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>  
261 - <block wx:if="{{reserveSection}}">  
262 - <select-room seller="{{seller}}" date="{{reserveDate}}" section="{{reserveSection}}" seletroomlist="{{seletroomlist}}" bindchangeroom="selectroom"></select-room>  
263 - </block>  
264 - </view>  
265 - <view class="reserve-button-cover flex-cc">  
266 - <view class="white-font font32r reserve-button flex-cc" catchtap="complete">选好了</view> 183 + <view style="height:116rpx;width: 100%;">
  184 + <view class="footer view flex align-center justify-between">
  185 + <view class="view flex align-center justify-around flex-treble">
  186 + <navigator url="/pages/customer/index" open-type="redirect">
  187 + <view class="flex flex-direction align-center justify-center">
  188 + <image style="width:40rpx;height: 40rpx;margin-bottom: 4rpx;" src="http://nosqn.colorcun.com/detail/x%20%2819%29.png"></image>
  189 + <view class="Medium txt-20-h">首页</view>
  190 + </view>
  191 + </navigator>
  192 + <view class="flex flex-direction align-center justify-center">
  193 + <image style="width:40rpx;height: 40rpx;margin-bottom: 4rpx;" src="http://nosqn.colorcun.com/detail/x%20%2822%29.png"></image>
  194 + <view class="Medium txt-20-h">收藏</view>
  195 + </view>
  196 + <view class="flex flex-direction align-center justify-center">
  197 + <image style="width:36rpx;height: 36rpx;margin-bottom: 10rpx;" src="http://nosqn.colorcun.com/detail/x%20%2821%29.png"></image>
  198 + <view class="Medium txt-20-h">客服</view>
  199 + </view>
  200 + <view class="flex flex-direction align-center justify-center">
  201 + <image style="width:40rpx;height: 40rpx;margin-bottom: 4rpx;" src="http://nosqn.colorcun.com/detail/x%20%2820%29.png"></image>
  202 + <view class="Medium txt-20-h">分享</view>
  203 + </view>
  204 + </view>
  205 + <navigator url="/pages/reserve/reserve?id={{seller.id}}&activeTab=reserve">
  206 + <view class="view bg-blue-blue margin-right-lg reserve-button txt-36-h text-bold flex justify-center align-center">订包间</view>
  207 + </navigator>
267 </view> 208 </view>
268 </view> 209 </view>
269 -</layout>  
270 -<getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>  
271 -<discount id="discount" seller="{{seller}}" wx:if="{{seller}}"  
272 - hasPTactivity="{{hasPTactivity}}"  
273 - cla="{{activeTab=='reserve'?'seller-reserve':''}}"  
274 - bindevent="reserveEvent"  
275 - bindhide="discountHide"  
276 - bindshow="discountShow"></discount>  
277 -<share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>  
278 -<as-phone id="as"></as-phone>  
  210 +</page>
  211 +<getpos id="getpos" bindpos="onpos"></getpos>
1 /* pages/reserve/detail.wxss */ 1 /* pages/reserve/detail.wxss */
2 -@import "./detail.skeleton.wxss";  
3 @import "../../colorui/main.wxss"; 2 @import "../../colorui/main.wxss";
4 -.pages{  
5 - width: 100%;  
6 - margin: 0 auto;  
7 - font-size: 30rpx;  
8 - color:#353535;  
9 - padding-bottom: 100rpx;  
10 - background-color: #fefefe;  
11 - box-sizing: border-box;  
12 - padding: 0 5% 100rpx; 3 +page{
  4 + background-color: #EEF0F2;
13 } 5 }
14 -.seller-banner{  
15 - width: 100%;  
16 - height: 500rpx; 6 +.swiper-view{
17 position: relative; 7 position: relative;
18 } 8 }
19 -.seller-banner swiper,.seller-banner swiper-item{  
20 - height: 100%;  
21 -}  
22 -.seller-banner .image{  
23 - width: 100%;  
24 - height: 100%;  
25 -}  
26 -.black20line{  
27 - width: 110%;  
28 - margin-left: -5%;  
29 - height: 20rpx;  
30 - background-color: #F5F5F5;  
31 -}  
32 -  
33 -.seller .base{  
34 - padding: 40rpx 0 18rpx;  
35 -}  
36 -.base .name{  
37 - font-size: 36rpx;  
38 - line-height: 50rpx;  
39 - margin-bottom: 20rpx;  
40 -}  
41 -.base .ping,.base .peitao{  
42 - height: 40rpx;  
43 - line-height: 40rpx;  
44 - color:#999999;  
45 - font-size: 28rpx;  
46 -}  
47 -.base .ping .item{  
48 - height: 24rpx;  
49 - line-height: 24rpx;  
50 - padding-left: 14rpx;  
51 - border-left: 2rpx solid #999999;  
52 - margin-left: 20rpx;  
53 -}  
54 -.base .ping .item:first-child{  
55 - border-width: 0;  
56 - margin-left: 0;  
57 - padding-left: 0;  
58 -}  
59 -.base .ping .fen .text{  
60 - margin-left: 10rpx;  
61 -}  
62 -.base .peitao{  
63 - margin-top: 10rpx;  
64 - width: 100%;  
65 -}  
66 -.peitao .icon{  
67 - margin-right: 20rpx;  
68 - background-size: 28rpx 26rpx;  
69 - background-repeat: no-repeat;  
70 - text-indent: 38rpx;  
71 - line-height: 26rpx;  
72 -}  
73 -.peitao .icon.bao{  
74 - background-image: url("http://nosqn.colorcun.com/custom/lite-online/image/%E5%8C%85%E9%97%B4.png");  
75 -}  
76 -.peitao .icon.ka{  
77 - background-image: url("http://nosqn.colorcun.com/custom/lite-online/image/%E5%8D%A1%E5%BA%A72.png");  
78 -}  
79 -.peitao .icon.car{  
80 - background-image: url("http://nosqn.colorcun.com/custom/lite-online/image/%E5%81%9C%E8%BD%A6%E5%9C%BA2.png");  
81 -}  
82 -  
83 -.peitao .icon.meal_fee{  
84 - background-image: url("http://nosqn.colorcun.com/reserve/images/3x/%E6%97%A0%E9%A4%90%E4%BD%8D%E8%B4%B9.png");  
85 - background-size: 24rpx 24rpx;  
86 -}  
87 -.peitao .icon.unsubscribe{  
88 - background-image: url("http://nosqn.colorcun.com/reserve/images/3x/%E9%9A%8F%E6%97%B6%E9%80%80.png");  
89 - background-size: 24rpx 24rpx;  
90 -}  
91 -.peitao .icon.minimum{  
92 - background-image: url("http://nosqn.colorcun.com/reserve/images/3x/%E6%97%A0%E6%9C%80%E4%BD%8E%E6%B6%88%E8%B4%B9.png");  
93 - background-size: 24rpx 24rpx;  
94 -}  
95 -.peitao .icon.belt{  
96 - background-image: url("http://nosqn.colorcun.com/reserve/images/3x/%E5%8F%AF%E8%87%AA%E5%B8%A6%E9%85%92%E6%B0%B4.png");  
97 - background-size: 24rpx 24rpx;  
98 -}  
99 -  
100 -  
101 -  
102 -.seller .addr{  
103 - border-top: 2rpx solid #f5f5f5;  
104 - height: 160rpx;  
105 - line-height: 160rpx;  
106 -}  
107 -  
108 -.addr-text{  
109 - line-height: 42rpx;  
110 - /*margin-top: 34rpx;*/  
111 -}  
112 -.addr-text .text{  
113 - white-space: nowrap;  
114 - overflow: hidden;  
115 - text-overflow:ellipsis;  
116 -}  
117 -.addr-text image{  
118 - width: 24rpx;  
119 - height: 28rpx;  
120 - margin-right: 20rpx;  
121 - min-width: 24rpx;  
122 -}  
123 -.addr-long{  
124 - font-size: 24rpx;  
125 - color:#999999;  
126 - margin-left: 44rpx;  
127 - height: 34rpx;  
128 - line-height: 34rpx;  
129 - margin-top: 2rpx;  
130 - /*margin-bottom: 40rpx;*/  
131 -}  
132 -  
133 -.block{  
134 - padding: 60rpx 0 50rpx;  
135 - border-bottom: 2rpx solid #F5F5F5;  
136 -}  
137 -.block:last-child{  
138 - border-width: 0;  
139 -}  
140 -.block .header{  
141 - height: 44rpx;  
142 - line-height: 44rpx;  
143 - margin-bottom: 40rpx;  
144 -}  
145 -.block .line{  
146 - height: 44rpx;  
147 - width: 4rpx;  
148 - background: linear-gradient(to bottom, #838383, #4C4C4C);  
149 - margin-right: 4rpx;  
150 -}  
151 -.block .name{  
152 - height: 44rpx;  
153 - width: 124rpx;  
154 - background: linear-gradient(to bottom, #838383, #4C4C4C);  
155 - font-size: 24rpx;  
156 - color: #FFFFFF;  
157 - text-align: center;  
158 -}  
159 -.footer{  
160 - height: 116rpx;  
161 - line-height: 116rpx;  
162 - box-shadow: 0 0 8rpx 0 #E0E0E0;  
163 - position: fixed;  
164 - bottom: 0;  
165 - left: 0;  
166 - right: 0;  
167 - background-color: #FFFFFF;  
168 -}  
169 -.footer .left{ 9 +.swiper-image{
170 width: 100%; 10 width: 100%;
171 - height: 100%;  
172 - padding: 0 20rpx;  
173 - box-sizing: border-box; 11 + height: 540rpx;
174 } 12 }
175 -.footer .left formids{  
176 - height: 70rpx;  
177 - line-height: 34rpx;  
178 -}  
179 -.follow-img-index{  
180 - width:36rpx;  
181 - height:34rpx;  
182 -}  
183 -.follow-img-follow{  
184 - width:36rpx;  
185 - height:34rpx;  
186 -}  
187 -.follow-img-service{  
188 - width:34rpx;  
189 - height:34rpx;  
190 -}  
191 -.follow-img-share{  
192 - width:34rpx;  
193 - height:34rpx;  
194 -}  
195 -.footer .left .text{  
196 - line-height: 28rpx;  
197 - height: 28rpx;  
198 - font-size: 20rpx;  
199 - margin-top: 8rpx;  
200 -}  
201 -.footer .follow{  
202 - width: 25%;  
203 -}  
204 -.footer .reserve{  
205 - width: 290rpx;  
206 - min-width: 290rpx;  
207 - height: 100%;  
208 -}  
209 -.footer .reserve .text{  
210 - width: 270rpx;  
211 - height: 84rpx;  
212 - background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);  
213 - border-radius: 42rpx; 13 +.swiper-num{
  14 + position: absolute;
  15 + right:30rpx;
  16 + bottom: 60rpx;
214 17
215 - font-size: 36rpx;  
216 - font-family: PingFangSC-Semibold, PingFang SC;  
217 - font-weight: 600;  
218 - color: #FFFFFF;  
219 - line-height: 84rpx;  
220 - margin-top: 16rpx;  
221 -} 18 + height: 48rpx;
  19 + background: rgba(0,0,0,0.6);
  20 + border-radius: 24rpx;
222 21
223 -.baos{  
224 - height: 330rpx;  
225 - width: 110%;  
226 - white-space: nowrap;  
227 - margin-left: -5%;  
228 -}  
229 -.baos .image{  
230 - width: 500rpx;  
231 - display: inline-block;  
232 - margin-right: 20rpx;  
233 -}  
234 -.baos .image:first-child{  
235 - margin-left: 5%;  
236 -}  
237 -.baos .image:last-child{  
238 - margin-right: 5%;  
239 -}  
240 -.baos .image image{  
241 - border-radius: 10rpx;  
242 - width: 500rpx;  
243 - height: 320rpx;  
244 - box-shadow:0px 4rpx 4rpx 0px rgba(198,198,198,1);  
245 -}  
246 -.cais{  
247 - width: 110%;  
248 - white-space: nowrap;  
249 - height: 460rpx;  
250 - margin-left: -5%;  
251 -}  
252 -.cais-views{  
253 - display: inline-block;  
254 - margin-right: 20rpx;  
255 -}  
256 -.cais-views:first-child{  
257 - margin-left: 5%;  
258 -}  
259 -.cais-views:last-child{  
260 - margin-right: 5%;  
261 -}  
262 -.cais .image-view{  
263 - border-radius: 10rpx;  
264 - border: 2rpx solid #F5F5F5;  
265 - box-shadow:0px 4px 4px 0px rgba(198,198,198,1);  
266 -}  
267 -.cais .image{  
268 - width: 500rpx;  
269 - border-radius: 10rpx 10rpx 0 0;  
270 - overflow: hidden;  
271 - height: 320rpx;  
272 -}  
273 -.cais .image image{  
274 - width: 100%;  
275 - height: 100%;  
276 -}  
277 -.cais .text{  
278 - font-size: 30rpx;  
279 - height: 80rpx;  
280 - line-height: 80rpx;  
281 - padding-left: 20rpx;  
282 - white-space: nowrap;  
283 - overflow: hidden;  
284 -}  
285 -.cais-text{  
286 - font-size: 28rpx;  
287 -}  
288 -.cais-text view{  
289 - height: 50rpx;  
290 - line-height: 50rpx;  
291 - padding: 0 14rpx;  
292 - border: 2rpx solid #CC995A;  
293 - margin-right: 20rpx;  
294 - margin-bottom: 20rpx;  
295 - display: inline-block;  
296 - border-radius: 6rpx;  
297 -}  
298 -.activity-view{  
299 - background-color: #FEF1EA;  
300 - width:110%;  
301 - margin: 0 -5%;  
302 - font-size: 24rpx;  
303 -}  
304 -.activity{  
305 - width:90%;  
306 - margin: 0 auto;  
307 - padding: 28rpx 0;  
308 -}  
309 -.activity-left{  
310 - width: calc(100% - 60rpx);  
311 -}  
312 -.activity-right{  
313 - min-width: 60rpx;  
314 - color: #C0A369;  
315 -}  
316 -.activity-first{  
317 - width: 100%;  
318 - line-height: 42rpx;  
319 - overflow: hidden;  
320 - text-align: left;  
321 - height: 42rpx;  
322 -}  
323 -.activity-first image{  
324 - width: 30rpx;  
325 - height: 28rpx;  
326 - margin-right: 20rpx;  
327 - min-width: 30rpx;  
328 - margin-left: 8rpx;  
329 - margin-top: 8rpx;  
330 -}  
331 -.activity-text{  
332 - margin-left: 60rpx;  
333 - line-height: 34rpx;  
334 - height: 34rpx;  
335 - margin-top: 10rpx;  
336 - text-align: left;  
337 - color: #C28C56;  
338 -}  
339 -.more{  
340 - /*background-image: url("http://nosqn.colorcun.com/reserve/images/m713.png");*/  
341 - margin-left: 20rpx;  
342 - height: 26rpx;  
343 - width: 14rpx;  
344 -}  
345 -.discount{  
346 - margin-right: 20rpx;  
347 - white-space:nowrap;  
348 -}  
349 -.discount:last-child{  
350 - margin-right: 0;  
351 - overflow: hidden;  
352 - text-overflow: ellipsis;  
353 -}  
354 -.discount .discount-left{  
355 - background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%B7%A6%E8%BE%B9.png");  
356 - width: 12rpx;  
357 - height: 40rpx;  
358 - background-size: 100% 100%;  
359 -}  
360 -.discount .discount-text{  
361 - background-image: url("http://nosqn.colorcun.com/reserve/images/%E4%B8%AD%E9%97%B4.jpg");  
362 - height: 40rpx;  
363 - min-width: 60rpx;  
364 - background-size: 100% 100%;  
365 - line-height: 40rpx;  
366 - color:#F8E6C4;  
367 - padding: 0 10rpx;  
368 -}  
369 -.discount .discount-right{  
370 - background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%8F%B3%E8%BE%B9.png");  
371 - width: 12rpx;  
372 - height: 40rpx;  
373 - background-size: 100% 100%;  
374 -}  
375 -.slogan{  
376 - position:absolute;  
377 - right:0rpx;  
378 - bottom: 0rpx;  
379 - background-color: rgba(0,0,0,0.39);  
380 - color: #FFFFFF;  
381 font-size: 26rpx; 22 font-size: 26rpx;
382 - width: 100%;  
383 -}  
384 -.slogan-view{  
385 - height: 80rpx;  
386 - line-height: 80rpx;  
387 - width: 100%;  
388 - white-space: nowrap;  
389 - overflow: hidden;  
390 -}  
391 -.slogan .dot{  
392 - width: 8rpx;  
393 - height: 8rpx;  
394 - background-color: #fff;  
395 - border-radius: 50%;  
396 - margin: 0 20rpx;  
397 -}  
398 -.swiper-num{  
399 - position:absolute;  
400 - right:20rpx;  
401 - bottom: 20rpx;  
402 - background-color: rgba(0,0,0,0.60); 23 + font-family: PingFangSC-Regular, PingFang SC;
  24 + font-weight: 400;
403 color: #FFFFFF; 25 color: #FFFFFF;
404 - font-size: 24rpx;  
405 - height: 40rpx;  
406 - line-height: 40rpx;  
407 - padding: 0 15rpx;  
408 - border-radius: 20rpx;  
409 -} 26 + line-height: 48rpx;
410 27
411 -.addr-view{  
412 - max-width: calc(100%-20rpx);  
413 - overflow: hidden;  
414 - text-overflow:ellipsis;  
415 -}  
416 -.more-addr{  
417 - background-image: url("http://nosqn.colorcun.com/reserve/images/m2.png");  
418 -}  
419 -.average{  
420 - color: #C0A369;  
421 - min-width: 135rpx;  
422 - margin-left: 40rpx;  
423 - text-align: right;  
424 - white-space: nowrap;  
425 -}  
426 -.name-info-text{  
427 - margin-right: 20rpx;  
428 - float: left;  
429 } 28 }
430 .broad{ 29 .broad{
431 display: inline-block; 30 display: inline-block;
432 - height: 28rpx; 31 + height: 32rpx;
  32 + margin-left: 16rpx;
  33 +
433 } 34 }
434 .broad-1{ 35 .broad-1{
435 - background-image: url("http://nosqn.colorcun.com/reserve/images/p0.png");  
436 - width: 14rpx;  
437 - height: 34rpx; 36 + background-image: url("http://nosqn.colorcun.com/detail/x%20%282%29.png");
  37 + width: 6rpx;
  38 + height: 38rpx;
438 background-size: 100% 100%; 39 background-size: 100% 100%;
439 float: left; 40 float: left;
440 } 41 }
441 .broad-2{ 42 .broad-2{
442 - background-image: url("http://nosqn.colorcun.com/reserve/images/p2.png");  
443 - height: 34rpx; 43 + background-image: url("http://nosqn.colorcun.com/detail/x%20%283%29.png");
  44 + height: 38rpx;
444 background-size: 100% 100%; 45 background-size: 100% 100%;
445 - font-size: 20rpx; 46 + font-size: 24rpx;
446 color: #FFFFFF; 47 color: #FFFFFF;
447 line-height: 34rpx; 48 line-height: 34rpx;
  49 + font-weight: bold;
448 float: left; 50 float: left;
449 } 51 }
450 .broad-3{ 52 .broad-3{
451 - background-image: url("http://nosqn.colorcun.com/reserve/images/p3.png");  
452 - width: 14rpx;  
453 - height: 34rpx; 53 + background-image: url("http://nosqn.colorcun.com/detail/x%20%284%29.png");
  54 + width: 18rpx;
  55 + height: 38rpx;
454 background-size: 100% 100%; 56 background-size: 100% 100%;
455 float: left; 57 float: left;
456 } 58 }
457 -  
458 .label_c{ 59 .label_c{
459 - font-size: 24rpx;  
460 - color: #C0A369;  
461 - margin-top: 20rpx;  
462 -}  
463 -.label_text{  
464 - height: 40rpx;  
465 - line-height: 40rpx;  
466 - background-color: #FFF5EB;  
467 - padding: 4rpx 8rpx;  
468 -}  
469 -  
470 -.activity-view-easy{  
471 - height: 120rpx;  
472 - line-height: 120rpx; 60 + border-radius: 4rpx;
  61 + border: 2rpx solid #AAD6FF;
  62 + height: 38rpx;
  63 + line-height: 38rpx;
473 } 64 }
474 -.activity-view-easy .activity-left{  
475 - height: 120rpx;  
476 - line-height: 120rpx;  
477 -}  
478 -.activity-view-easy .icon{  
479 - background-image: url("http://nosqn.colorcun.com/reserve/images/ad2.png");  
480 - width: 30rpx;  
481 - height: 32rpx;  
482 - background-size: 100% 100%; 65 +.label_c.text-cyan{
  66 + border: 2rpx solid #AAEBFF;
483 } 67 }
484 -.activity-view-easy .discount{  
485 - border-right: 2rpx #C0A369 solid;  
486 - height: 30rpx;  
487 - line-height: 30rpx;  
488 - font-size: 30rpx;  
489 - padding-right: 20rpx;  
490 - padding-left: 20rpx;  
491 - margin-right: 0;  
492 - font-weight:500;  
493 -}  
494 -.activity-view-easy .discount:last-child{  
495 - border-right-width: 0; 68 +.slogan{
  69 + width: 100%;
  70 + height: 64rpx;
  71 + background: #F4FAFF;
  72 + border-radius: 10rpx;
496 } 73 }
497 -.activity-view-easy-old .activity-right{  
498 - min-width: 100rpx; 74 +.slogan-icon{
  75 + background-image: url("http://nosqn.colorcun.com/detail/x%20%285%29.png");
  76 + width: 28rpx;
  77 + height: 28rpx;
499 } 78 }
500 -/* 包间预定 */  
501 -.room-booking {  
502 - width:100%; 79 +.localtion{
  80 + width: 18rpx;
  81 + height: 22rpx;
  82 + background-image: url("http://nosqn.colorcun.com/detail/x%20%286%29.png");
503 } 83 }
504 -.dur{  
505 - width:100%;  
506 - padding-top:42rpx; 84 +.map-icon{
  85 + width: 44rpx;
  86 + height: 40rpx;
  87 + background-image: url("http://nosqn.colorcun.com/detail/x%20%287%29.png");
  88 + margin-bottom: 6rpx;
507 } 89 }
508 -.dur-title{  
509 - width:100%;  
510 - padding:0 30rpx 40rpx;  
511 - box-sizing: border-box; 90 +.tel-icon{
  91 + width: 40rpx;
  92 + height: 40rpx;
  93 + background-image: url("http://nosqn.colorcun.com/detail/x%20%288%29.png");
  94 + margin-bottom: 6rpx;
512 } 95 }
  96 +.footer{
  97 + width: 100%;
  98 + height: 116rpx;
  99 + background: #FFFFFF;
  100 + box-shadow: 0px 0px 8rpx 0px #EEF0F2;
513 101
514 -.tabs{  
515 - height: 80rpx;  
516 position: fixed; 102 position: fixed;
517 - line-height: 80rpx;  
518 - width: 100%;  
519 - background-color: #ffffff;  
520 - z-index: 9;  
521 -}  
522 -.tabs-item{  
523 - width: 50%;  
524 -}  
525 -.tabs-item-text{  
526 - height: 76rpx;  
527 - border-bottom: 4rpx solid #ffffff;  
528 - font-size: 30rpx;  
529 - color: #353535;  
530 -}  
531 -.tabs-item-text.active{  
532 - border-color: #C0A369;  
533 - color: #C0A369;  
534 - font-weight: bold;  
535 -}  
536 -.olreserve{  
537 - margin-top: 80rpx;  
538 - padding-bottom: 200rpx;  
539 -}  
540 -.reserve-time{  
541 - padding: 40rpx 0 30rpx 30rpx;  
542 - font-size: 32rpx;  
543 -}  
544 -.hasFullHouse{  
545 - height: 100rpx;  
546 - font-size: 30rpx;  
547 - color: #FFFFFF;  
548 - background-color: #999999;  
549 - line-height: 100rpx;  
550 - width: calc(100% - 60rpx);  
551 - margin: 0 auto;  
552 -}  
553 -.more-phone{  
554 - width: 158rpx;  
555 - min-width: 158rpx;  
556 - border-left: 2rpx solid #E0E0E0;  
557 - height: 70rpx;  
558 - background-size: 40rpx 36rpx;  
559 - background-position: center center;  
560 - background-image: url("http://nosqn.colorcun.com/reserve/images/sphone.png"); 103 + bottom: 0;
561 } 104 }
562 .reserve-button{ 105 .reserve-button{
563 - width:680rpx;  
564 - height:80rpx;  
565 - margin:0 auto;  
566 - background: #242320;  
567 -}  
568 -.reserve-button-cover{  
569 - width:100%;  
570 - height:130rpx;  
571 - position: fixed;  
572 - left:0;  
573 - right:0;  
574 - bottom:0;  
575 - background: #fff;  
576 -}  
577 -.activity-view-tit{  
578 - height:42rpx;  
579 - font-size:30rpx;  
580 - font-family:PingFangSC-Medium,PingFang SC;  
581 - font-weight:500;  
582 - color:rgba(53,53,53,1);  
583 - line-height:42rpx;  
584 - margin-right: 42rpx;  
585 - min-width: 60rpx; 106 + width: 270rpx;
  107 + height: 84rpx;
  108 + border-radius: 42rpx;
586 } 109 }
587 -.activity-view-activityStr{  
588 - white-space:nowrap;  
589 - text-overflow: ellipsis;  
590 - overflow: hidden;  
591 - font-size: 26rpx; 110 +.room_image{
  111 + display: inline-block;
  112 + margin-left: 40rpx;
  113 + width: 500rpx;
  114 + height: 320rpx;
  115 + background: #FFFFFF;
  116 + border-radius: 10rpx;
592 } 117 }
593 -.activity-view-blk{  
594 - height:34rpx;  
595 - border-top:2rpx solid rgba(240,88,36,1);  
596 - border-bottom:2rpx solid rgba(240,88,36,1);  
597 - box-sizing: border-box;  
598 - font-size:24rpx;  
599 - font-family:PingFangSC-Medium,PingFang SC;  
600 - font-weight:500;  
601 - color:rgba(240,88,36,1);  
602 - line-height:30rpx;  
603 - margin-right: 22rpx;  
604 - padding: 0 12rpx;  
605 - position: relative;  
606 - border-radius: 6rpx; 118 +.dishes-image-views{
  119 + display: inline-block;
  120 + margin-left: 40rpx;
607 } 121 }
608 -.activity-view-blk:before,.activity-view-blk:after{  
609 - background-size: 100% 100%;  
610 - width: 12rpx;  
611 - height: 34rpx;  
612 - background-image: url("http://nosqn.colorcun.com/sellerbaobao/left-1.png");  
613 - content: "";  
614 - position: absolute;  
615 - left:0;  
616 - top:-2rpx; 122 +.room_image:last-child,.dishes-image-views:last-child{
  123 + margin-right: 40rpx;
617 } 124 }
618 -.activity-view-blk:after{  
619 - background-image: url("http://nosqn.colorcun.com/sellerbaobao/right-1.png");  
620 - right:0;  
621 - left:auto; 125 +.dishes-image{
  126 + width: 260rpx;
  127 + height: 190rpx;
  128 + background: #F6B3B3;
  129 + border-radius: 10rpx;
622 } 130 }
623 -.activityStr{  
624 - width: calc(100% - 140rpx);  
625 - padding-left: 100rpx;  
626 -  
627 - height: 36rpx;  
628 - font-size: 26rpx;  
629 - font-family: PingFangSC-Regular, PingFang SC;  
630 - font-weight: 400;  
631 - color: #353535;  
632 - line-height: 36rpx;  
633 - margin-top: -30rpx;  
634 - margin-bottom: 40rpx;  
635 -  
636 - white-space:nowrap;  
637 - text-overflow: ellipsis;  
638 - overflow: hidden; 131 +.cais-text{
  132 + background: #F8F8F8;
  133 + border-radius: 10rpx;
639 } 134 }
640 -.commentLabel{  
641 - height: 52rpx;  
642 - background: #F1F1F1;  
643 - border-radius: 26rpx;  
644 -  
645 - font-size: 26rpx;  
646 - font-family: PingFangSC-Regular, PingFang SC;  
647 - font-weight: 400;  
648 - color: #666666;  
649 - line-height: 52rpx;  
650 - text-align: center;  
651 -}  
@@ -601,7 +601,7 @@ @@ -601,7 +601,7 @@
601 { 601 {
602 "name": "pages/reserve/detail", 602 "name": "pages/reserve/detail",
603 "pathName": "pages/reserve/detail", 603 "pathName": "pages/reserve/detail",
604 - "query": "id=1&_activeTab=reserve&_date=2020-02-16&_pnum=6", 604 + "query": "id=1001&_activeTab=reserve&_date=2020-02-16&_pnum=6",
605 "scene": null 605 "scene": null
606 }, 606 },
607 { 607 {
@@ -101,5 +101,8 @@ module.exports = { @@ -101,5 +101,8 @@ module.exports = {
101 }, 101 },
102 activityName:function(typeId){ 102 activityName:function(typeId){
103 return ['','满减','满赠','折扣','代金券'][parseInt(typeId)]||'会员价'; 103 return ['','满减','满赠','折扣','代金券'][parseInt(typeId)]||'会员价';
  104 + },
  105 + replace:function(str,find,rep=''){
  106 + return str.toString().replace(find,rep);
104 } 107 }
105 }; 108 };