xt / xcx-book · Commits

Go to a project

Commit 4b1bde20ea0a6649eb847d711a887957a8b68749

Authored by vking
1 parent f5ac842b
build: skipped

master-activity

Inline Side-by-side
Showing 12 changed files with 325 additions and 202 deletions
@@ -7,6 +7,7 @@ Component({ @@ -7,6 +7,7 @@ Component({
7 */ 7 */
8 properties: { 8 properties: {
9 hasInHome:Boolean, 9 hasInHome:Boolean,
  10 + floclass:String,
10 }, 11 },
11 12
12 /** 13 /**
@@ -38,12 +39,18 @@ Component({ @@ -38,12 +39,18 @@ Component({
38 activity.task=res.data.task 39 activity.task=res.data.task
39 let displayType=0//浮层 40 let displayType=0//浮层
40 if(activity.status==1 && activity.starttime<time && time<activity.endtime){ 41 if(activity.status==1 && activity.starttime<time && time<activity.endtime){
41 - if(activity.balance>1000 && activity.task.status!=2){  
42 - displayType=1//弹框  
43 - App.Task.SetTaskInfo({//领取任务  
44 - aid:activity.id,  
45 - tid:activity.task.id,  
46 - }) 42 + if(activity.balance>1000){
  43 + if(activity.task.status!=2){
  44 + displayType=1//弹框
  45 + App.Task.SetTaskInfo({//领取任务
  46 + aid:activity.id,
  47 + tid:activity.task.id,
  48 + })
  49 + }
  50 + }else{
  51 + if(!this.data.hasInHome){//非首页浮层也不显示
  52 + activity=null
  53 + }
47 } 54 }
48 this.setData({ 55 this.setData({
49 displayType:displayType, 56 displayType:displayType,
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </view> 26 </view>
27 <navigator wx:else="" hover-class="navigator-hover" 27 <navigator wx:else="" hover-class="navigator-hover"
28 url="/pack-activity/pages/index?id={{activity.id}}" > 28 url="/pack-activity/pages/index?id={{activity.id}}" >
29 - <view class="mask-tips"></view> 29 + <view class="mask-tips {{floclass}}"></view>
30 </navigator> 30 </navigator>
31 </block> 31 </block>
32 32
  1 +// components/activity/tips.js
  2 +import util from '../../utils/util';
  3 +import App from '../../utils/api';
  4 +Component({
  5 + /**
  6 + * 组件的属性列表
  7 + */
  8 + properties: {
  9 + pos:String,
  10 + str:String,
  11 + cla:String,
  12 + },
  13 +
  14 + /**
  15 + * 组件的初始数据
  16 + */
  17 + data: {
  18 + activity:null,
  19 + },
  20 + lifetimes: {
  21 + // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
  22 + attached: function () { },
  23 + moved: function () { },
  24 + detached: function () { },
  25 + },
  26 + /**
  27 + * 组件的方法列表
  28 + */
  29 + methods: {
  30 + hasActivity(e){//有通知就可以参加活动
  31 + console.log('hasActivity.enter',e)
  32 + this.getActivity()
  33 + },
  34 + getActivity(){
  35 + //hasInHome 金额少于1000 只显示小图
  36 + App.Task.GetTaskInfo({pos:this.data.pos}).then(res=>{
  37 + let time=new Date()/1000
  38 + let activity=res.data.activity
  39 + activity.task=res.data.task
  40 + if(activity.status==1 && activity.starttime<time && time<activity.endtime){
  41 + if(activity.balance>1000 && activity.task.status!=2){
  42 + //通知页面显示tips
  43 + this.setData({
  44 + activity:activity,
  45 + msg:this.data.str.replace("￥price","￥"+activity.task.price)
  46 + })
  47 + }
  48 + }
  49 + })
  50 + },
  51 + }
  52 +})
  53 +
  1 +{
  2 + "component": true,
  3 + "usingComponents": {
  4 + "has":"./hasActivity"
  5 + }
  6 +}
  1 +<!--components/activity/tips.wxml-->
  2 +<has bindevent="hasActivity"></has>
  3 +<view class="tips {{cla}}" wx:if="{{activity}}">
  4 + <view class="msg">
  5 + {{msg}}
  6 + <view class="jiao"></view>
  7 + </view>
  8 +</view>
  1 +/* components/activity/tips.wxss */
  2 +.tips{
  3 + position: fixed;
  4 + z-index: 9999;
  5 + background:rgba(84,83,84,0.8);
  6 + font-size:24rpx;
  7 + font-weight:500;
  8 + color:rgba(255,255,255,1);
  9 +}
  10 +.tips.reserve-detail{
  11 + bottom:122rpx;
  12 + right:30rpx;
  13 +}
  14 +.tips .msg{
  15 + height: 70rpx;
  16 + line-height: 70rpx;
  17 + padding: 0 24rpx;
  18 + position: relative;
  19 +}
  20 +.jiao{
  21 + width: 26rpx;
  22 + height: 18rpx;
  23 + background-image: url("http://qn.colorcun.com/activity/images/jiao.png");
  24 + background-size: 100% 100%;
  25 + position: absolute;
  26 + bottom: -14rpx;
  27 + left:30rpx;
  28 +}
  29 +.tips.reserve-detail .jiao{
  30 + right:80rpx;
  31 + left:auto;
  32 +}
  33 +.tips.reserve-detail .msg{
  34 + color: #FEDE68;
  35 +}
  36 +.tips.reserve-detail .msg:before{
  37 + content: "现在预订即可获得";
  38 + color:rgba(255,255,255,1);
  39 +}
  40 +.tips.reserve-detail .msg:after{
  41 + content: "红包";
  42 + color:rgba(255,255,255,1);
  43 +}
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 "nav":"/components/nav/nav", 8 "nav":"/components/nav/nav",
9 "card":"/components/seller-card/seller-card", 9 "card":"/components/seller-card/seller-card",
10 "formids":"/components/formids/formids", 10 "formids":"/components/formids/formids",
11 - "userinfo-share": "/components/userinfo/share" 11 + "userinfo-share": "/components/userinfo/share",
  12 + "activity-enter":"/components/activity/enter"
12 } 13 }
13 } 14 }
@@ -46,4 +46,5 @@ @@ -46,4 +46,5 @@
46 </view> 46 </view>
47 </block> 47 </block>
48 </view> 48 </view>
49 -<manager manager="{{detail}}" id="manager"></manager>  
  49 +<manager manager="{{detail}}" id="manager"></manager>
  50 +<activity-enter floclass="detail_customer"></activity-enter>
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 12 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
13 "getpos":"/components/userinfo/getpos", 13 "getpos":"/components/userinfo/getpos",
14 "as":"/components/actionSheet/index", 14 "as":"/components/actionSheet/index",
15 - "subscribe": "/components/userinfo/subscribe" 15 + "subscribe": "/components/userinfo/subscribe",
  16 + "activity-enter":"/components/activity/enter"
16 } 17 }
17 } 18 }
@@ -174,4 +174,5 @@ @@ -174,4 +174,5 @@
174 </view> 174 </view>
175 <manager manager="{{detail}}" id="manager"></manager> 175 <manager manager="{{detail}}" id="manager"></manager>
176 <as id="as" items="{{detail.seller.seller_tel}}" bindclick="callSellerPhone">拨打电话</as> 176 <as id="as" items="{{detail.seller.seller_tel}}" bindclick="callSellerPhone">拨打电话</as>
177 -<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>  
  177 +<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
  178 +<activity-enter floclass="detail_owner"></activity-enter>
@@ -15,7 +15,8 @@ @@ -15,7 +15,8 @@
15 "people":"/components/reserve/people/people", 15 "people":"/components/reserve/people/people",
16 "dur":"/components/reserve/dur/dur", 16 "dur":"/components/reserve/dur/dur",
17 "calendar":"/components/reserve/week-calendar/week-calendar", 17 "calendar":"/components/reserve/week-calendar/week-calendar",
18 - "section":"/components/reserve/section/section",  
19 - "select-room":"/components/reserve/select-room/select-room" 18 + "activity-tips":"/components/activity/tips",
  19 + "section":"/components/reserve/section/section",
  20 + "select-room":"/components/reserve/select-room/select-room"
20 } 21 }
21 } 22 }
1 <!--pages/reserve/detail.wxml--> 1 <!--pages/reserve/detail.wxml-->
2 <layout> 2 <layout>
3 -<nav hasHome>{{seller.sellername}}</nav>  
4 -<!-- 包间预定 -->  
5 -<view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">  
6 - <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="detail">  
7 - <view class="tabs-item-text {{activeTab=='detail'?'active':''}}">餐厅详情</view>  
8 - </view>  
9 - <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="reserve">  
10 - <view class="tabs-item-text {{activeTab=='reserve'?'active':''}}">包间预订</view> 3 + <nav hasHome>{{seller.sellername}}</nav>
  4 + <!-- 包间预定 -->
  5 + <view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">
  6 + <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="detail">
  7 + <view class="tabs-item-text {{activeTab=='detail'?'active':''}}">餐厅详情</view>
  8 + </view>
  9 + <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="reserve">
  10 + <view class="tabs-item-text {{activeTab=='reserve'?'active':''}}">包间预订</view>
  11 + </view>
11 </view> 12 </view>
12 -</view>  
13 -<view hidden="{{activeTab!='detail'}}">  
14 - <view class="seller-banner" style="{{pagesHeight!='auto'?'position: fixed;':''}}{{hasOnlineReserve?'margin-top: 80rpx;':''}}">  
15 - <swiper  
16 - indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"  
17 - interval="2000" duration="500"  
18 - previous-margin="{{0}}px" next-margin="{{0}}px"  
19 - current="{{current}}" bindchange="bindtransition" bindtap="reviweBanner">  
20 - <block wx:for="{{seller.envi_image}}" wx:key="sellers.key">  
21 - <swiper-item>  
22 - <image class="image" mode="aspectFill"  
23 - src="{{item}}?imageView2/2/w/860/interlace/0/q/100" ></image>  
24 - </swiper-item>  
25 - </block>  
26 - </swiper>  
27 - <view class="slogan" wx:if="{{seller.slogan}}">  
28 - <view class="slogan-view flex-ll">  
29 - <view class="dot"></view>  
30 - <view>{{seller.slogan}}</view> 13 + <view hidden="{{activeTab!='detail'}}">
  14 + <view class="seller-banner" style="{{pagesHeight!='auto'?'position: fixed;':''}}{{hasOnlineReserve?'margin-top: 80rpx;':''}}">
  15 + <swiper
  16 + indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
  17 + interval="2000" duration="500"
  18 + previous-margin="{{0}}px" next-margin="{{0}}px"
  19 + current="{{current}}" bindchange="bindtransition" bindtap="reviweBanner">
  20 + <block wx:for="{{seller.envi_image}}" wx:key="sellers.key">
  21 + <swiper-item>
  22 + <image class="image" mode="aspectFill"
  23 + src="{{item}}?imageView2/2/w/860/interlace/0/q/100" ></image>
  24 + </swiper-item>
  25 + </block>
  26 + </swiper>
  27 + <view class="slogan" wx:if="{{seller.slogan}}">
  28 + <view class="slogan-view flex-ll">
  29 + <view class="dot"></view>
  30 + <view>{{seller.slogan}}</view>
  31 + </view>
31 </view> 32 </view>
  33 + <view class="swiper-num" wx:if="{{seller.envi_image.length>0}}">{{currentView}} / {{seller.envi_image.length}}</view>
32 </view> 34 </view>
33 - <view class="swiper-num" wx:if="{{seller.envi_image.length>0}}">{{currentView}} / {{seller.envi_image.length}}</view>  
34 - </view>  
35 - <view class="pages" style="height: {{pagesHeight}};overflow:{{pagesHeight=='auto'?'visible':'hidden'}}">  
36 - <view class="seller">  
37 - <view class="base">  
38 - <view class="name Semibold flex-lr">  
39 - <view class="name-info">{{seller.sellername}}  
40 - <view class="broad" wx:if="{{seller.brand}}">  
41 - <view class="broad-1"></view>  
42 - <view class="broad-2">{{seller.brand.name}}</view>  
43 - <view class="broad-3"></view> 35 + <view class="pages" style="height: {{pagesHeight}};overflow:{{pagesHeight=='auto'?'visible':'hidden'}}">
  36 + <view class="seller">
  37 + <view class="base">
  38 + <view class="name Semibold flex-lr">
  39 + <view class="name-info">{{seller.sellername}}
  40 + <view class="broad" wx:if="{{seller.brand}}">
  41 + <view class="broad-1"></view>
  42 + <view class="broad-2">{{seller.brand.name}}</view>
  43 + <view class="broad-3"></view>
  44 + </view>
44 </view> 45 </view>
  46 + <view class="average" wx:if="{{seller.average>0}}">¥{{seller.average}}/人</view>
  47 + </view>
  48 + <view class="ping flex-ll">
  49 + <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view>
  50 + <view class="item" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>
  51 + <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>
  52 + <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
  53 + </view>
  54 + <view class="label_c" wx:if="{{seller.label_cstr}}">
  55 + <text class="label_text" >{{seller.label_cstr}}</text>
45 </view> 56 </view>
46 - <view class="average" wx:if="{{seller.average>0}}">¥{{seller.average}}/人</view>  
47 - </view>  
48 - <view class="ping flex-ll">  
49 - <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view>  
50 - <view class="item" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>  
51 - <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>  
52 - <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>  
53 - </view>  
54 - <view class="label_c" wx:if="{{seller.label_cstr}}">  
55 - <text class="label_text" >{{seller.label_cstr}}</text>  
56 </view> 57 </view>
57 - </view>  
58 - <view style="display:{{pagesHeight=='auto'?'block':'none'}}">  
59 - <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">  
60 - <view class="addr-view" bindtap="lookLocation">  
61 - <view class="addr-text flex-ll">  
62 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
63 - <view class="text">{{seller.real_address||seller.map_address}}</view> 58 + <view style="display:{{pagesHeight=='auto'?'block':'none'}}">
  59 + <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">
  60 + <view class="addr-view" bindtap="lookLocation">
  61 + <view class="addr-text flex-ll">
  62 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
  63 + <view class="text">{{seller.real_address||seller.map_address}}</view>
  64 + </view>
  65 + <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
64 </view> 66 </view>
65 - <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view> 67 + <view class="more more-phone" bindtap="reserveEvent" data-act="phone"></view>
66 </view> 68 </view>
67 - <view class="more more-phone" bindtap="reserveEvent" data-act="phone"></view>  
68 - </view>  
69 - <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >  
70 - <view class="addr-view">  
71 - <view class="addr-text flex-ll">  
72 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>  
73 - <view class="text">{{seller.real_address||seller.map_address}}</view> 69 + <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >
  70 + <view class="addr-view">
  71 + <view class="addr-text flex-ll">
  72 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
  73 + <view class="text">{{seller.real_address||seller.map_address}}</view>
  74 + </view>
  75 + <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
74 </view> 76 </view>
75 - <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view> 77 + <view class="more more-addr"></view>
76 </view> 78 </view>
77 - <view class="more more-addr"></view>  
78 </view> 79 </view>
79 </view> 80 </view>
80 - </view>  
81 - <view style="display:{{pagesHeight=='auto'?'block':'none'}}">  
82 - <view class="black20line"></view>  
83 - <view class="seller" wx:if="{{seller.activity.length>0}}">  
84 - <formids bindclick="showDiscount">  
85 - <view class="activity-view-easy flex-lr" >  
86 - <view class="activity-left flex-ll">  
87 - <view class="icon"></view>  
88 - <block wx:for="{{seller.activity}}"  
89 - wx:key="seller.activity.key"  
90 - wx:if="{{index<2}}">  
91 - <view class="discount" >{{item.title}}</view>  
92 - </block>  
93 - </view>  
94 - <view class="flex-rr activity-right">  
95 - <view class="more-text">更多</view>  
96 - <view class="more"></view> 81 + <view style="display:{{pagesHeight=='auto'?'block':'none'}}">
  82 + <view class="black20line"></view>
  83 + <view class="seller" wx:if="{{seller.activity.length>0}}">
  84 + <formids bindclick="showDiscount">
  85 + <view class="activity-view-easy flex-lr" >
  86 + <view class="activity-left flex-ll">
  87 + <view class="icon"></view>
  88 + <block wx:for="{{seller.activity}}"
  89 + wx:key="seller.activity.key"
  90 + wx:if="{{index<2}}">
  91 + <view class="discount" >{{item.title}}</view>
  92 + </block>
  93 + </view>
  94 + <view class="flex-rr activity-right">
  95 + <view class="more-text">更多</view>
  96 + <view class="more"></view>
  97 + </view>
97 </view> 98 </view>
98 - </view>  
99 - </formids>  
100 - <!--  
101 - <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">  
102 - <view class="activity-view" >  
103 - <view class="activity" >  
104 - <view class="flex-lr">  
105 - <view class="activity-left">  
106 - <view class="activity-first flex-ll" style="align-items: flex-start">  
107 - <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>  
108 - <view class="flex-cc discount" wx:for="{{seller.activity}}"  
109 - wx:key="seller.activity.key"  
110 - wx:if="{{index<2}}">  
111 - <view class="discount-left"></view>  
112 - <view class="discount-text">{{item.title}}</view>  
113 - <view class="discount-right"></view> 99 + </formids>
  100 + <!--
  101 + <formids wx:if="{{seller.activity.length>0}}" bindclick="showDiscount">
  102 + <view class="activity-view" >
  103 + <view class="activity" >
  104 + <view class="flex-lr">
  105 + <view class="activity-left">
  106 + <view class="activity-first flex-ll" style="align-items: flex-start">
  107 + <image src="http://qn.colorcun.com/custom/lite-online/image%E5%96%87%E5%8F%AD.png"></image>
  108 + <view class="flex-cc discount" wx:for="{{seller.activity}}"
  109 + wx:key="seller.activity.key"
  110 + wx:if="{{index<2}}">
  111 + <view class="discount-left"></view>
  112 + <view class="discount-text">{{item.title}}</view>
  113 + <view class="discount-right"></view>
  114 + </view>
114 </view> 115 </view>
115 </view> 116 </view>
  117 + <view class="activity-right flex-rr Semibold">
  118 + <view></view>
  119 + <view class="more"></view>
  120 + </view>
116 </view> 121 </view>
117 - <view class="activity-right flex-rr Semibold">  
118 - <view></view>  
119 - <view class="more"></view> 122 + <view class="activity-text">
  123 + 该优惠仅适用于一键订平台预订客户
120 </view> 124 </view>
121 </view> 125 </view>
122 - <view class="activity-text">  
123 - 该优惠仅适用于一键订平台预订客户  
124 - </view>  
125 </view> 126 </view>
126 - </view>  
127 - </formids>  
128 - -->  
129 - </view>  
130 - <view class="black20line" wx:if="{{seller.activity.length>0}}"></view>  
131 - <view class="block" wx:if="{{seller.room_image.length>0}}">  
132 - <view class="header flex-ll">  
133 - <view class="line"></view>  
134 - <view class="name">包间环境</view> 127 + </formids>
  128 + -->
135 </view> 129 </view>
136 - <scroll-view  
137 - scroll-x  
138 - class="baos"  
139 - scroll-into-view="{{toView}}"  
140 - scroll-top="{{scrollTop}}"  
141 - > 130 + <view class="black20line" wx:if="{{seller.activity.length>0}}"></view>
  131 + <view class="block" wx:if="{{seller.room_image.length>0}}">
  132 + <view class="header flex-ll">
  133 + <view class="line"></view>
  134 + <view class="name">包间环境</view>
  135 + </view>
  136 + <scroll-view
  137 + scroll-x
  138 + class="baos"
  139 + scroll-into-view="{{toView}}"
  140 + scroll-top="{{scrollTop}}"
  141 + >
142 142
143 - <block wx:for="{{seller.room_image}}" wx:key="sellers.key">  
144 - <view class="image">  
145 - <image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"  
146 - src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>  
147 - </view>  
148 - </block> 143 + <block wx:for="{{seller.room_image}}" wx:key="sellers.key">
  144 + <view class="image">
  145 + <image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
  146 + src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
  147 + </view>
  148 + </block>
149 149
150 - </scroll-view>  
151 - </view>  
152 - <view class="block" wx:if="{{seller.dishes.length>0}}">  
153 - <view class="header flex-ll">  
154 - <view class="line"></view>  
155 - <view class="name">推荐菜品</view> 150 + </scroll-view>
156 </view> 151 </view>
157 - <scroll-view  
158 - scroll-x  
159 - class="cais"  
160 - scroll-into-view="{{toView}}"  
161 - scroll-top="{{scrollTop}}"  
162 - >  
163 - <block wx:for="{{seller.dishes}}" wx:key="sellers.key">  
164 - <view class="cais-views" wx:if="{{item.image}}">  
165 - <view class="image-view" >  
166 - <view class="image">  
167 - <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"  
168 - src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image> 152 + <view class="block" wx:if="{{seller.dishes.length>0}}">
  153 + <view class="header flex-ll">
  154 + <view class="line"></view>
  155 + <view class="name">推荐菜品</view>
  156 + </view>
  157 + <scroll-view
  158 + scroll-x
  159 + class="cais"
  160 + scroll-into-view="{{toView}}"
  161 + scroll-top="{{scrollTop}}"
  162 + >
  163 + <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
  164 + <view class="cais-views" wx:if="{{item.image}}">
  165 + <view class="image-view" >
  166 + <view class="image">
  167 + <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"
  168 + src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
  169 + </view>
  170 + <view class="text Semibold">{{item.name}}</view>
169 </view> 171 </view>
170 - <view class="text Semibold">{{item.name}}</view>  
171 </view> 172 </view>
  173 + </block>
  174 + </scroll-view>
  175 + <view class="cais-text">
  176 + <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
  177 + <view wx:if="{{!item.image}}">{{item.name}}</view>
  178 + </block>
172 </view> 179 </view>
173 - </block>  
174 - </scroll-view>  
175 - <view class="cais-text">  
176 - <block wx:for="{{seller.dishes}}" wx:key="sellers.key">  
177 - <view wx:if="{{!item.image}}">{{item.name}}</view>  
178 - </block>  
179 </view> 180 </view>
180 </view> 181 </view>
181 </view> 182 </view>
182 - </view>  
183 - <view class="footer flex-lr">  
184 - <view class="left flex-cc">  
185 - <formids class="flex-tb" url="/pages/customer/index">  
186 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E9%A6%96%E9%A1%B5.png"></image>  
187 - <view class="text">首页</view>  
188 - </formids>  
189 - <userinfo class="follow flex-tb" binduserinfo="follow">  
190 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E6%94%B6%E8%97%8F.png" wx:if="{{!IsCollectionSeller}}"></image>  
191 - <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%B7%B2%E6%94%B6%E8%97%8F.png" wx:else=""></image>  
192 - <view class="text">收藏</view>  
193 - </userinfo> 183 + <view class="footer flex-lr">
  184 + <view class="left flex-cc">
  185 + <formids class="flex-tb" url="/pages/customer/index">
  186 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E9%A6%96%E9%A1%B5.png"></image>
  187 + <view class="text">首页</view>
  188 + </formids>
  189 + <userinfo class="follow flex-tb" binduserinfo="follow">
  190 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E6%94%B6%E8%97%8F.png" wx:if="{{!IsCollectionSeller}}"></image>
  191 + <image src="http://qn.colorcun.com/custom/lite-online/image/%E5%B7%B2%E6%94%B6%E8%97%8F.png" wx:else=""></image>
  192 + <view class="text">收藏</view>
  193 + </userinfo>
  194 + </view>
  195 + <view class="reserve share flex-vc">
  196 + <userinfo class="flex-vc" style="width: 100%" binduserinfo="shareUserinfo">
  197 + <view class="text">分享</view>
  198 + </userinfo>
  199 + </view>
  200 + <view class="reserve reserve-click flex-vc">
  201 + <formids class="flex-vc" bindclick="reserveEvent" id="reserve-button">
  202 + <view class="text">{{hasOnlineReserve?'订包间':'联系餐厅'}}</view>
  203 + </formids>
  204 + </view>
  205 +
194 </view> 206 </view>
195 - <view class="reserve share flex-vc">  
196 - <userinfo class="flex-vc" style="width: 100%" binduserinfo="shareUserinfo">  
197 - <view class="text">分享</view>  
198 - </userinfo> 207 + <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone" hasTip="{{false}}"></as>
  208 + <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
  209 + <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>
  210 + <share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
  211 + <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips>
  212 + </view>
  213 + <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">
  214 + <view class="olreserve bg_white">
  215 + <calendar seller="{{seller}}" bindselectdate="selectdate" date="{{reserveDate}}"></calendar>
  216 + <view class="reserve-time Semibold">预订时段</view>
  217 + <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>
  218 + <block wx:if="{{reserveSection}}">
  219 + <select-room seller="{{seller}}" date="{{reserveDate}}" section="{{reserveSection}}" seletroomlist="{{seletroomlist}}" bindchangeroom="selectroom"></select-room>
  220 + </block>
199 </view> 221 </view>
200 - <view class="reserve reserve-click flex-vc">  
201 - <formids class="flex-vc" bindclick="reserveEvent" id="reserve-button">  
202 - <view class="text">{{hasOnlineReserve?'订包间':'联系餐厅'}}</view>  
203 - </formids> 222 + <view class="reserve-button-cover flex-cc">
  223 + <view class="white-font font32r reserve-button flex-cc" catchtap="complete">选好了</view>
204 </view> 224 </view>
205 -  
206 - </view>  
207 - <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone" hasTip="{{false}}"></as>  
208 - <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>  
209 - <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>  
210 - <share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>  
211 -</view>  
212 -<view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">  
213 - <view class="olreserve bg_white">  
214 - <calendar seller="{{seller}}" bindselectdate="selectdate" date="{{reserveDate}}"></calendar>  
215 - <view class="reserve-time Semibold">预订时段</view>  
216 - <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>  
217 - <block wx:if="{{reserveSection}}">  
218 - <select-room seller="{{seller}}" date="{{reserveDate}}" section="{{reserveSection}}" seletroomlist="{{seletroomlist}}" bindchangeroom="selectroom"></select-room>  
219 - </block>  
220 </view> 225 </view>
221 - <view class="reserve-button-cover flex-cc">  
222 - <view class="white-font font32r reserve-button flex-cc" catchtap="complete">选好了</view>  
223 - </view>  
224 -</view>  
225 </layout> 226 </layout>