blue ui other

@@ -46,7 +46,8 @@
     "pages/pinglun/create",
     "pages/pinglun/success",
     "pages/pinglun/mylist",
-    "pages/pinglun/video"
+    "pages/pinglun/video",
+    "pages/reserve/reserve"
   ],
   "subpackages": [
     {

@@ -55,18 +55,10 @@ Component({
       this.hide();
       let index=util.attr(e,'index')
       if(index=='reserve'){//跳转到预订页
-        let pages=getCurrentPages();
-        let p=pages[pages.length-1];
-        if(p.route=='pages/reserve/detail'){
-          p.setData({
-            activeTab:'reserve'
-          })
-        }else{
-          let url=util.http_build_query({id:this.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
-          wx.navigateTo({
-            url:url,
-          })
-        }
+        let url=util.http_build_query({id:this.seller.id,activeTab:'reserve'},'/pages/reserve/reserve')
+        wx.navigateTo({
+          url:url,
+        })
         return;
       }else{
         let value=util.attr(e,'value')

@@ -43,7 +43,7 @@ Component({
     },
     reserve(e){
       if(this.data.seller.is_online_reserve==1){
-        let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
+        let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/reserve')
         let cid=util.attr(e,'cid')
         if(cid){
           url=util.http_build_query({

@@ -54,18 +54,10 @@ Component({
       this.hide();
       let index=util.attr(e,'index')
       if(index=='reserve'){//跳转到预订页
-        let pages=getCurrentPages();
-        let p=pages[pages.length-1];
-        if(p.route=='pages/reserve/detail'){
-          p.setData({
-            activeTab:'reserve'
-          })
-        }else{
-          let url=util.http_build_query({id:this.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
-          wx.navigateTo({
-            url:url,
-          })
-        }
+        let url=util.http_build_query({id:this.seller.id,activeTab:'reserve'},'/pages/reserve/reserve')
+        wx.navigateTo({
+          url:url,
+        })
         return;
       }else{
         let value=util.attr(e,'value')

@@ -115,7 +115,7 @@ Component({
       if (type == 'oncall') {
         console.log('has_online_reserve',this.data.seller.is_online_reserve,this.data.seller.is_tele)
         if(this.data.seller.is_online_reserve==1){
-          let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
+          let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/reserve')
           if(this.data.seller.findSellerParamObj){
             let findSellerParamObj=this.data.seller.findSellerParamObj
             findSellerParamObj={

@@ -87,7 +87,7 @@ Page({
     let sid=util.attr(e,'sid')
     if(sid>0) {
       wx.navigateTo({
-        url: '/pages/reserve/detail?id=' + sid + '&activeTab=reserve'
+        url: '/pages/reserve/reserve?id=' + sid + '&activeTab=reserve'
       })
     }else{
       //lat=39.62420161&lng=118.1174469&multiIndex=0&centre_pos=39.62420161,118.1174469&hasSuggestion=

@@ -105,7 +105,7 @@
             </block>
         </block>
     </view>
-    <navigator url="/pages/reserve/detail?id={{detail.sid}}&activeTab=reserve"
+    <navigator url="/pages/reserve/reserve?id={{detail.sid}}&activeTab=reserve"
                wx:if="{{detail.hasCancel}}"
                hover-class="navigator-hover">
         <view class="flex-lr share-view subscribe" style="margin-top: 60rpx;">

@@ -236,9 +236,11 @@ Page({
   },
   reserveEvent(e){
     if(this.data.hasOnlineReserve && util.attr(e,'act')!='phone'){
-      return this.setData({
-        activeTab:'reserve'
+      let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/reserve')
+      wx.navigateTo({
+        url:url,
       })
+      return
     }
     this.selectComponent('#as').show(this.data.seller);
   },

+// pages/reserve/detail.js
+import util from '../../utils/util';
+import App from '../../utils/api';
+const {regeneratorRuntime} = global
+const zdmask='-zdmask?v=1.2'
+import PubSub from '../../utils/PubSub'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    seller:null,
+    IsCollectionSeller:false,
+    current:0,
+    currentView:1,
+    hasOnlineReserve:false,
+    activeTab:'detail',
+    hasFullHouse:false,//满房
+    hasDishesImage:false,//是否有菜品图
+    hasPTactivity:false,//平台活动
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    if(wx.getStorageSync('remark')){
+      wx.removeStorageSync('remark')
+    }
+    console.log('onLoad', options)
+    console.log('初次进入详情页---小米8测试',this.data.reserveDate ? this.data.reserveDate : '没有日期','openid:',getApp().openid)
+    this.options=options
+    this.downloadImages()
+    if(options.activeTab && options.activeTab!='detail'){
+      this.setData({
+        activeTab:options.activeTab||'detail',
+      })
+    }
+    this.setData({
+      reserveDate: options.date ? options.date : util.unixtoTime(new Date() / 1000, 'YYYY-MM-DD'),
+    })
+    App.Customer.IsCollectionSeller({
+      sid:options.id,
+      openid:getApp().openid
+    }).then(res=>{
+      this.setData({
+        IsCollectionSeller:res.data,
+      })
+    })
+    this.SetRelaOpenid();
+    App.Customer.BindClicks({sid:options.id})
+    App.Task.GetTaskInfo({pos:'home'}).then(res=>{
+      if(res.data.activity){
+        this.setData({
+          hasPTactivity:true,
+        })
+      }
+    });
+    App.Customer.GetCountCommentLabel({sid:options.id}).then(res=>{
+      this.setData({
+        commentLabel:res.data,
+      })
+    })
+  },
+  GetSellerDetail(){
+    let options=this.options
+    App.Customer.GetSellerDetail({
+      sid:options.id,
+      lat:this.location.latitude,
+      lng:this.location.longitude,
+    }).then(res=>{
+      if(res.ret==200){
+        let seller=res.data
+        let seller_tel=[]
+        if(seller.seller_tel){
+          seller_tel=seller.seller_tel.split(',')
+        }else{
+          seller_tel=[seller.phone];
+        }
+        seller.seller_tel=seller_tel
+        if(seller.distance || seller.distance!==''){
+          seller.distance=parseInt(seller.distance);
+          if(seller.distance>1000){
+            seller.distanceStr=(seller.distance/1000).toFixed(2)+'公里'
+          }else{
+            seller.distanceStr=seller.distance+'米';
+          }
+        }
+        if(seller.envi_image.length<1){
+          seller.envi_image=['http://nosqn.colorcun.com/custom/lite-online/image/def-banner.png']
+        }else{
+          seller.envi_image.some((url,i)=>{
+            seller.envi_image[i]=url.replace('//qn.colorcun','//nosqn.colorcun')
+          })
+        }
+        if(seller.label_c.length>0) {
+          let label_cstr=[];
+          seller.label_c.forEach(l=>{
+            label_cstr.push(l.name)
+          })
+          seller.label_cstr=label_cstr.join(' | ')
+        }
+        if(seller.room_image.length>0){
+          seller.room_image.some((url,i)=>{
+            seller.room_image[i]=url.replace('//qn.colorcun','//nosqn.colorcun')
+          })
+        }
+        let hasDishesImage=false;
+        if(seller.dishes.length>0){
+          seller.dishes.some((dishes)=>{
+            if(dishes.image){
+              hasDishesImage=true
+              dishes.image=dishes.image.replace('//qn.colorcun','//nosqn.colorcun')
+            }
+          })
+        }
+        if(seller.card_info){
+          let xff=[]
+          seller.card_info.forEach(card=>{
+            seller['receive_condition_'+card.receive_condition]=true
+            if(card.receive_condition==2){
+              xff.push(`满${card.order_price}元返${card.price}元`)
+            }
+          })
+          if(xff.length>0){
+            seller.receive_condition_str=xff.join('/')
+          }
+        }
+        seller.activityStr=[];
+        if(seller.activity.length>0){
+          seller.activity.forEach(a=>{
+            seller.activityStr.push(a.title)
+          })
+        }
+        seller.activityStr=seller.activityStr.join('；')
+        //seller.isopen_md=0;
+        //seller.card_info=[]
+        let obj={
+          seller:seller,
+          hasDishesImage:hasDishesImage,
+          hasOnlineReserve:seller.is_online_reserve==1,
+        }
+        if(this.options.classID){
+          obj.seletroomlist=[{
+            id:this.options.classID,
+            name:this.options.className,
+          }]
+          delete this.options.classID
+          delete this.options.className
+        }
+        this.setData(obj)
+      }
+    }).catch(e=>{
+      util.toast('网络出错，请尝试重新进入',none)
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.selectComponent('#getpos').getPos();
+    if (this.data.reserveDate && this.data.seletroomlist){//后退进入等情况刷新时段
+      this.setData({
+        reserveDate:this.data.reserveDate
+      })
+    }
+    //已经完成预订的情况---清除日期、时段、选中包间
+    if(wx.getStorageSync('order')){
+      this.setData({
+        seletroomlist:[],
+      })
+      wx.removeStorageSync('order')
+    }
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+  shareImageTmp:'',
+  downloadImages(){
+    wx.downloadFile({
+      url:'https://xt04.colorcun.com/sellerShare/Share_'+this.options.id+'.png?'+Math.random(),
+      success:res=>{
+        this.shareImageTmp=res.tempFilePath
+      },
+    })
+  },
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    let path=util.http_build_query({id:this.data.seller.id,fromid:getApp().openid},'/pages/reserve/detail')
+    //let imageUrl='http://sellershare.colorcun.com/Share_'+this.options.id+'.png?imageView2/2/w/180/interlace/0'
+    let shareParams={
+      title:'请客订包间，就上周到安排',
+      path:path,
+    }
+    if(this.shareImageTmp){
+      shareParams.imageUrl=this.shareImageTmp
+    }
+    console.log('shareParams==>',shareParams)
+    return shareParams
+  },
+  reserveEvent(e){
+    if(this.data.hasOnlineReserve && util.attr(e,'act')!='phone'){
+      return this.setData({
+        activeTab:'reserve'
+      })
+    }
+    this.selectComponent('#as').show(this.data.seller);
+  },
+  reservePhone(e){
+    if(e.detail.value){
+      let phone=e.detail.value.replace(/[^\d]/,'')
+      wx.makePhoneCall({
+        phoneNumber:phone
+      })
+    }
+
+  },
+  follow(){
+    let param={
+      sid:this.options.id,
+      openid:getApp().openid,
+    }
+    if(this.data.IsCollectionSeller){//已收藏
+      param.cancel=1
+    }
+    let hasFollow=!this.data.IsCollectionSeller
+    this.setData({
+      IsCollectionSeller:hasFollow
+    })
+    App.Customer.SetCollectionRel(param);
+    PubSub.emit(
+      'follow',
+      {
+        sid:this.options.id,
+        hasFollow:hasFollow,
+      }
+    )
+  },
+  lookLocation:function(){
+    //console.log(this.data.seller.lat,this.data.seller.long,this.data.detail.map_address)
+    wx.openLocation({
+      latitude:Number(this.data.seller.lat),
+      longitude:Number(this.data.seller.long),
+      scale:17,
+      address:this.data.seller.map_address,
+      success:function (res) {
+        console.log(res)
+      }
+    })
+  },
+  onpos(e){
+    console.log(e);
+    this.location=e.detail
+    this.GetSellerDetail();
+  },
+  reviweBanner(){
+    let urls=[];
+    this.data.seller.envi_image.forEach(url=>{
+      if(url){
+        urls.push(url+zdmask)
+      }
+    })
+    wx.previewImage({
+      current:this.data.seller.envi_image[this.data.current]+zdmask,
+      urls:urls
+    })
+  },
+  reviweRoomImage(e){
+    let urls=[];
+    this.data.seller.room_image.forEach(url=>{
+      if(url){
+        urls.push(url+zdmask)
+      }
+    })
+    wx.previewImage({
+      current:util.attr(e,'current')+zdmask,
+      urls:urls
+    })
+  },
+  reviweDishesImage(e){
+    let urls=[];
+    this.data.seller.dishes.forEach(d=>{
+      if(d.image){
+        urls.push(d.image+zdmask)
+      }
+    })
+    wx.previewImage({
+      current:util.attr(e,'current')+zdmask,
+      urls:urls
+    })
+  },
+  showDiscount(){
+    this.selectComponent('#discount').show()
+  },
+  discountHide(){
+    this.setData({
+      hasDisplayDiscount:false
+    })
+  },
+  discountShow(){
+    this.setData({
+      hasDisplayDiscount:true
+    })
+  },
+  shareUserinfo(){
+    //util.toast('授权成功，请继续分享','none');
+    this.selectComponent('#share').show()
+  },
+  bindtransition(e){
+    this.setData({
+      currentView:e.detail.current+1
+    })
+  },
+  async SetRelaOpenid(){
+    if(!this.options.fromid) return;
+    let openid=await getApp().getOpenid()
+    App.Reserve.SetRelaOpenid({
+      openid:openid,
+      fromid:this.options.fromid,
+      sid:this.options.id,
+      sub:this.options.hasSellerShare?2:3,//关系类型：1/2/3 邀请关系/商户端分享关系/C端分享关系
+    })
+  },
+  switchTabs(e){
+    this.setData({
+      activeTab:util.attr(e,'act'),
+    })
+  },
+  reserve:{},
+  selectpeople(e){//人数改变
+    console.log(e);
+    this.reserve.pnum=e.detail.people;
+    if(e.detail.action=='click'){
+
+    }
+  },
+  //时段改变
+  selectsection(e){
+    console.log(e);
+    setTimeout(()=>{
+      this.setData({
+        reserveSection:e.detail.section!='' ? e.detail.section : null,
+        seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,
+      })
+    },0)
+
+    this.reserve.section=e.detail.section;
+    this.reserve.time=e.detail.time;
+  },
+  //包间类型改变
+  selectroom(e){
+    console.log(e)
+    this.setData({
+      seletroomlist:e.detail.selectroom
+    })
+  },
+  complete(){
+    if(!this.data.reserveSection){
+      return util.toast('请选择可预订的时段','none');
+    }
+    if(!this.data.seletroomlist || (this.data.seletroomlist && this.data.seletroomlist.length==0)){
+      return util.toast('请选择包间类型','none');
+    }
+    this.reserve.sid=this.options.id
+    this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00');
+    this.reserve.room_demand=JSON.stringify(this.data.seletroomlist)
+    if(this.options.pnum){
+      this.reserve.pnum = this.options.pnum;
+    }
+    wx.navigateTo({
+      url:util.http_build_query(this.reserve,'./submit')
+    })
+  },
+  selecttime(e){//时间改变
+    console.log(e);
+    if(!e.detail.time){//满房
+      this.setData({
+        hasFullHouse:true,
+      })
+      return;
+    }
+    this.reserve.time=e.detail.time;
+    if(e.detail.action=='click'){
+      this.reserve.sid=this.options.id
+      this.reserve.ddate=util.timetouUnix(this.reserve.date+' '+this.reserve.time+':00')
+      //date=2019-07-25&pnum=6&time=20%3A00&sid=154&ddate=1564056000
+      wx.navigateTo({
+        url:util.http_build_query(this.reserve,'./submit')
+      })
+    }
+  },
+  selectdate(e){//日期改变
+    if(e.detail.action==401){//无可用桌位
+      return;
+    }
+    console.log('selectdate',e);
+    if(e.detail.overdate==1){//今天之前
+      return this.setData({
+        hasFullHouse:true,
+        fullHouseMsg:'请选择今天之后的日期',
+      })
+    }
+    this.reserve.date=e.detail.date;
+    this.setData({
+      reserveDate:e.detail.date,
+      seletroomlist:e.detail.action=='click' ? [] : this.data.seletroomlist,
+      hasFullHouse:false,
+      reserveSection:e.detail.action=='click' ? null : this.data.reserveSection,
+      fullHouseMsg:'今日所有包间已订满',
+    })
+  }
+})
\ No newline at end of file

+{
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText":"周到安排",
+  "usingComponents": {
+    "formids":"/components/formids/formids",
+    "userinfo":"/components/userinfo/userinfo",
+    "userinfo-share":"/components/userinfo/share",
+    "stat":"/components/stat/stat",
+    "as-phone":"/components/actionSheet/phone",
+    "nav":"/components/nav/nav",
+    "getpos":"/components/userinfo/getpos",
+    "discount":"/components/reserve/seller/discount",
+    "share":"/components/reserve/share/share",
+    "people":"/components/reserve/people/people",
+    "dur":"/components/reserve/dur/dur",
+    "calendar":"/components/reserve/week-calendar/week-calendar",
+    "activity-tips":"/components/activity/tips",
+    "section":"/components/reserve/section/section",
+    "select-room":"/components/reserve/select-room/select-room",
+    "service":"/components/tips/service",
+    "taocan":"/components/2.0/taocan/lists",
+    "plcard":"/components/2.0/pinglun/card"
+  }
+}
\ No newline at end of file

+<!--pages/reserve/detail.wxml-->
+<include src="detail.skeleton.wxml" wx:if="{{!seller}}"/>
+<layout wx:else="" style="{{hasDisplayDiscount?'position: fixed;width:100vw;height:100vk;':''}}">
+    <nav hasHome>{{seller.sellername}}</nav>
+    <!-- 包间预定 -->
+    <view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">
+        <view class="tabs-item flex-vc" bindtap="switchTabs" data-act="detail">
+            <view class="tabs-item-text {{activeTab=='detail'?'active':''}}">餐厅详情</view>
+        </view>
+        <view class="tabs-item  flex-vc" bindtap="switchTabs" data-act="reserve">
+            <view class="tabs-item-text {{activeTab=='reserve'?'active':''}}">包间预订</view>
+        </view>
+    </view>
+    <view hidden="{{activeTab!='detail'}}">
+        <view class="seller-banner" style="{{hasOnlineReserve?'margin-top: 80rpx;':''}}">
+            <swiper
+                    indicator-dots="{{false}}" autoplay="{{false}}" circular="{{false}}" vertical="{{false}}"
+                    interval="2000" duration="500"
+                    previous-margin="{{0}}px" next-margin="{{0}}px"
+                    current="{{current}}" bindchange="bindtransition" bindtap="reviweBanner">
+                <block wx:for="{{seller.envi_image}}" wx:key="sellers.key">
+                    <swiper-item>
+                        <image class="image" mode="aspectFill"
+                               src="{{item}}?imageView2/2/w/860/interlace/0/q/100" ></image>
+                    </swiper-item>
+                </block>
+            </swiper>
+            <view class="slogan" wx:if="{{seller.slogan}}">
+                <view class="slogan-view flex-ll">
+                    <view class="dot"></view>
+                    <view>{{seller.slogan}}</view>
+                </view>
+            </view>
+            <view class="swiper-num" wx:if="{{seller.envi_image.length>0}}">{{currentView}} / {{seller.envi_image.length}}</view>
+        </view>
+        <view class="pages">
+            <view class="seller">
+                <view class="base">
+                    <view class="name Semibold flex-lr">
+                        <view class="name-info">{{seller.sellername}}
+                            <view class="broad" wx:if="{{seller.brand}}">
+                                <view class="broad-1"></view>
+                                <view class="broad-2">{{seller.brand.name}}</view>
+                                <view class="broad-3"></view>
+                            </view>
+                        </view>
+                        <view class="average" wx:if="{{seller.average>0}}">¥{{seller.average}}/人</view>
+                    </view>
+                    <view class="ping flex-ll">
+                        <view class="item" wx:if="{{seller.cate.length>0}}">{{seller.cate[0]}}</view>
+                        <view class="item" wx:if="{{seller.is_belt_wine!=0}}">{{seller.is_belt_wine==1?'不可带酒水':'可自带酒水'}}</view>
+                        <view class="item" wx:if="{{seller.is_parking==1}}">停车场</view>
+                        <view class="item" wx:if="{{seller.room_num>0}}">{{seller.room_num}}个包间</view>
+                    </view>
+                    <view class="label_c" wx:if="{{seller.label_cstr}}">
+                        <text class="label_text" >{{seller.label_cstr}}</text>
+                    </view>
+                </view>
+                <view>
+                    <view class="addr flex-lr" wx:if="{{hasOnlineReserve}}">
+                        <view class="addr-view" bindtap="lookLocation">
+                            <view class="addr-text flex-ll">
+                                <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
+                                <view class="text">{{seller.real_address||seller.map_address}}</view>
+                            </view>
+                            <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
+                        </view>
+                        <view class="more more-phone" bindtap="reserveEvent" data-act="phone"></view>
+                    </view>
+                    <view class="addr flex-lr" bindtap="lookLocation" wx:else="" >
+                        <view class="addr-view">
+                            <view class="addr-text flex-ll">
+                                <image src="http://nosqn.colorcun.com/custom/lite-online/image/%E5%AE%9A%E4%BD%8D.png"></image>
+                                <view class="text">{{seller.real_address||seller.map_address}}</view>
+                            </view>
+                            <view class="addr-long">{{seller.distanceStr?'距您'+seller.distanceStr:''}}</view>
+                        </view>
+                        <view class="more more-addr"></view>
+                    </view>
+                </view>
+            </view>
+            <view wx:if="{{seller}}">
+                <view class="black20line"></view>
+                <view wx:if="{{(seller.isopen_md==1 && hasPTactivity) || seller.card_info.length>0}}" bindtap="showDiscount">
+                    <view class="activity-view-easy flex-lr">
+                        <view class="activity-left flex-ll">
+                            <view class="activity-view-tit">优惠</view>
+                            <view class="activity-view-blk" wx:if="{{seller.receive_condition_1}}">进店赠红包</view>
+                            <view class="activity-view-blk" wx:if="{{seller.receive_condition_2}}">消费赠红包</view>
+                            <view class="activity-view-blk" wx:if="{{seller.isopen_md==1 && hasPTactivity}}">平台红包</view>
+                        </view>
+                        <view class="flex-rr activity-right">
+                            <view class="more"></view>
+                        </view>
+                    </view>
+                    <view class="activityStr" wx:if="{{seller.activityStr}}">
+                        {{seller.activityStr}}
+                    </view>
+                    <view class="black20line"></view>
+                </view>
+                <block wx:elif="{{seller.activityStr}}">
+                    <view class="activity-view-easy flex-lr" bindtap="showDiscount">
+                        <view class="activity-left flex-ll">
+                            <view class="activity-view-tit">优惠</view>
+                            <view class="activity-view-activityStr">{{seller.activityStr}}</view>
+                        </view>
+                        <view class="flex-rr activity-right">
+                            <view class="more"></view>
+                        </view>
+                    </view>
+                    <view class="black20line"></view>
+                </block>
+                <block wx:if="{{seller.isopen_md!=1 && hasPTactivity}}">
+                    <view class="seller" >
+                        <view class="activity-view-easy flex-lr" >
+                            <view class="activity-left flex-ll">
+                                <view class="icon"></view>
+                                <view class="discount" >本店不可使用平台红包</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="black20line"></view>
+                </block>
+                <view class="block" wx:if="{{seller.room_image.length>0}}">
+                    <view class="header flex-ll">
+                        <view class="line"></view>
+                        <view class="name">包间环境</view>
+                    </view>
+                    <scroll-view
+                            scroll-x
+                            class="baos"
+                            scroll-into-view="{{toView}}"
+                            scroll-top="{{scrollTop}}"
+                    >
+
+                        <block wx:for="{{seller.room_image}}" wx:key="sellers.key">
+                            <view class="image">
+                                <image mode="aspectFill" bindtap="reviweRoomImage" data-current="{{item}}"
+                                       src="{{item}}?imageView2/2/w/640/interlace/0/q/100"></image>
+                            </view>
+                        </block>
+
+                    </scroll-view>
+                </view>
+                <view class="black20line"></view>
+                <view style="width: 110%;margin-left: -5%;">
+                    <taocan sid="{{seller.id}}" ></taocan>
+                </view>
+
+                <view class="black20line"></view>
+                <view class="block" wx:if="{{seller.dishes.length>0}}">
+                    <view class="header flex-lr">
+                        <view class="flex-ll">
+                            <view class="line"></view>
+                            <view class="name">推荐菜品</view>
+                        </view>
+                    </view>
+                    <scroll-view wx:if="{{hasDishesImage}}"
+                                 scroll-x
+                                 class="cais"
+                                 scroll-into-view="{{toView}}"
+                                 scroll-top="{{scrollTop}}"
+                    >
+                        <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
+                            <view class="cais-views" wx:if="{{item.image}}">
+                                <view class="image-view" >
+                                    <view class="image">
+                                        <image mode="aspectFill" bindtap="reviweDishesImage" data-current="{{item.image}}"
+                                               src="{{item.image}}?imageView2/2/w/640/interlace/0/q/100"></image>
+                                    </view>
+                                    <view class="text Semibold">{{item.name}}</view>
+                                </view>
+                            </view>
+                        </block>
+                    </scroll-view>
+                    <view class="cais-text">
+                        <block wx:for="{{seller.dishes}}" wx:key="sellers.key">
+                            <view wx:if="{{!item.image}}">{{item.name}}</view>
+                        </block>
+                    </view>
+                </view>
+                <block wx:if="{{seller.seller_config_info.is_display_dish==1}}">
+                    <view class="black20line"></view>
+                    <navigator url="/pack-cookbook/pages/index?rid=18599&oid=273&identity=1&seeAll={{seller.sellername}}&sid={{seller.id}}" hover-class="navigator-hover">
+                        <view class="view padding-tb-lg">
+                            <view class="view flex justify-between align-center">
+                                <view class="view txt-40-h text-bold">查看菜单</view>
+                                <view class="view flex justify-end align-center">
+                                    <view style="font-size: 28rpx;margin-right: 20rpx;">所有菜品</view>
+                                    <view class="more"></view>
+                                </view>
+                            </view>
+                        </view>
+                    </navigator>
+                </block>
+                <block wx:if="{{seller.comment_info}}">
+                    <view class="black20line"></view>
+                    <navigator url="/pages/pinglun/mylist?act=seller&sid={{seller.id}}" hover-class="navigator-hover">
+                        <view class="view padding-tb-lg">
+                            <view class="view flex justify-between align-center">
+                                <view class="view txt-40-h text-bold">用户评价</view>
+                                <view class="view flex justify-end align-center">
+                                    <view style="font-size: 28rpx;margin-right: 20rpx;">所有评价</view>
+                                    <view class="more"></view>
+                                </view>
+                            </view>
+                        </view>
+                    </navigator>
+                    <view class="view padding-bottom-xl">
+                        <view class="view flex flex-wrap" wx:if="{{commentLabel.length>0}}">
+                            <block wx:for="{{commentLabel}}" wx:key="commentLabel">
+                                <view class="view commentLabel padding-lr-sm margin-bottom-sm margin-right-sm">{{item.name}}</view>
+                            </block>
+                        </view>
+                        <view class="margin-top-lg">
+                            <plcard post="{{seller.comment_info}}"></plcard>
+                        </view>
+                    </view>
+                </block>
+            </view>
+        </view>
+        <view class="footer flex-lr">
+            <view class="left flex-cc">
+                <formids class="follow flex-tb" url="/pages/customer/index">
+                    <image class="follow-img-index" src="http://nosqn.colorcun.com/custom/lite-online/image/%E9%A6%96%E9%A1%B5.png"></image>
+                    <view class="text">首页</view>
+                </formids>
+                <userinfo class="follow flex-tb" binduserinfo="follow">
+                    <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>
+                    <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>
+                    <view class="text">收藏</view>
+                </userinfo>
+                <service class="follow">
+                    <formids class="flex-tb">
+                        <image class="follow-img-service" src="http://nosqn.colorcun.com/shead1.png"></image>
+                        <view class="text">客服</view>
+                    </formids>
+                </service>
+                <userinfo class="follow flex-tb" binduserinfo="shareUserinfo">
+                    <image class="follow-img-share" src="http://nosqn.colorcun.com/mapmenu/seshare.png"></image>
+                    <view class="text">分享</view>
+                </userinfo>
+            </view>
+            <view class="reserve reserve-click flex-vc">
+                <formids class="flex-vc" bindclick="reserveEvent" id="reserve-button">
+                    <view class="text Semibold">订包间</view>
+                </formids>
+            </view>
+
+        </view>
+        <!--
+        <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips>
+        -->
+
+    </view>
+    <view hidden="{{activeTab!='reserve'}}" wx:if="{{seller.id}}">
+        <view class="olreserve bg_white">
+            <calendar seller="{{seller}}" bindselectdate="selectdate" date="{{reserveDate}}"></calendar>
+            <view class="reserve-time Semibold">预订时段</view>
+            <section seller="{{seller}}" date="{{reserveDate}}" bind:selectsection="selectsection" section="{{reserveSection}}"></section>
+            <block wx:if="{{reserveSection}}">
+                <select-room seller="{{seller}}" date="{{reserveDate}}" section="{{reserveSection}}" seletroomlist="{{seletroomlist}}" bindchangeroom="selectroom"></select-room>
+            </block>
+        </view>
+        <view class="reserve-button-cover flex-cc">
+            <view class="white-font font32r reserve-button flex-cc" catchtap="complete">选好了</view>
+        </view>
+    </view>
+</layout>
+<getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
+<discount id="discount" seller="{{seller}}" wx:if="{{seller}}"
+          hasPTactivity="{{hasPTactivity}}"
+          cla="{{activeTab=='reserve'?'seller-reserve':''}}"
+          bindevent="reserveEvent"
+          bindhide="discountHide"
+          bindshow="discountShow"></discount>
+<share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
+<as-phone id="as"></as-phone>
\ No newline at end of file

+/* pages/reserve/detail.wxss */
+@import "./detail.skeleton.wxss";
+@import "../../colorui/main.wxss";
+.pages{
+    width: 100%;
+    margin: 0 auto;
+    font-size: 30rpx;
+    color:#353535;
+    padding-bottom: 100rpx;
+    background-color: #fefefe;
+    box-sizing: border-box;
+    padding: 0 5% 100rpx;
+}
+.seller-banner{
+    width: 100%;
+    height: 500rpx;
+    position: relative;
+}
+.seller-banner swiper,.seller-banner swiper-item{
+    height: 100%;
+}
+.seller-banner .image{
+    width: 100%;
+    height: 100%;
+}
+.black20line{
+    width: 110%;
+    margin-left: -5%;
+    height: 20rpx;
+    background-color: #F5F5F5;
+}
+
+.seller .base{
+    padding: 40rpx 0 18rpx;
+}
+.base .name{
+    font-size: 36rpx;
+    line-height: 50rpx;
+    margin-bottom: 20rpx;
+}
+.base .ping,.base .peitao{
+    height: 40rpx;
+    line-height: 40rpx;
+    color:#999999;
+    font-size: 28rpx;
+}
+.base .ping .item{
+    height: 24rpx;
+    line-height: 24rpx;
+    padding-left: 14rpx;
+    border-left: 2rpx solid #999999;
+    margin-left: 20rpx;
+}
+.base .ping .item:first-child{
+    border-width: 0;
+    margin-left: 0;
+    padding-left: 0;
+}
+.base .ping .fen .text{
+    margin-left: 10rpx;
+}
+.base .peitao{
+    margin-top: 10rpx;
+    width: 100%;
+}
+.peitao .icon{
+    margin-right: 20rpx;
+    background-size: 28rpx 26rpx;
+    background-repeat: no-repeat;
+    text-indent: 38rpx;
+    line-height: 26rpx;
+}
+.peitao .icon.bao{
+    background-image: url("http://nosqn.colorcun.com/custom/lite-online/image/%E5%8C%85%E9%97%B4.png");
+}
+.peitao .icon.ka{
+    background-image: url("http://nosqn.colorcun.com/custom/lite-online/image/%E5%8D%A1%E5%BA%A72.png");
+}
+.peitao .icon.car{
+    background-image: url("http://nosqn.colorcun.com/custom/lite-online/image/%E5%81%9C%E8%BD%A6%E5%9C%BA2.png");
+}
+
+.peitao .icon.meal_fee{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/3x/%E6%97%A0%E9%A4%90%E4%BD%8D%E8%B4%B9.png");
+    background-size: 24rpx 24rpx;
+}
+.peitao .icon.unsubscribe{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/3x/%E9%9A%8F%E6%97%B6%E9%80%80.png");
+    background-size: 24rpx 24rpx;
+}
+.peitao .icon.minimum{
+    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");
+    background-size: 24rpx 24rpx;
+}
+.peitao .icon.belt{
+    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");
+    background-size: 24rpx 24rpx;
+}
+
+
+
+.seller .addr{
+    border-top: 2rpx solid #f5f5f5;
+    height: 160rpx;
+    line-height: 160rpx;
+}
+
+.addr-text{
+    line-height: 42rpx;
+    /*margin-top: 34rpx;*/
+}
+.addr-text .text{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow:ellipsis;
+}
+.addr-text image{
+    width: 24rpx;
+    height: 28rpx;
+    margin-right: 20rpx;
+    min-width: 24rpx;
+}
+.addr-long{
+    font-size: 24rpx;
+    color:#999999;
+    margin-left: 44rpx;
+    height: 34rpx;
+    line-height: 34rpx;
+    margin-top: 2rpx;
+    /*margin-bottom: 40rpx;*/
+}
+
+.block{
+    padding: 60rpx 0 50rpx;
+    border-bottom: 2rpx solid #F5F5F5;
+}
+.block:last-child{
+    border-width: 0;
+}
+.block .header{
+    height: 44rpx;
+    line-height: 44rpx;
+    margin-bottom: 40rpx;
+}
+.block .line{
+    height: 44rpx;
+    width: 4rpx;
+    background: linear-gradient(to bottom, #838383, #4C4C4C);
+    margin-right: 4rpx;
+}
+.block .name{
+    height: 44rpx;
+    width: 124rpx;
+    background: linear-gradient(to bottom, #838383, #4C4C4C);
+    font-size: 24rpx;
+    color: #FFFFFF;
+    text-align: center;
+}
+.footer{
+    height: 116rpx;
+    line-height: 116rpx;
+    box-shadow: 0 0 8rpx 0 #E0E0E0;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #FFFFFF;
+}
+.footer .left{
+    width: 100%;
+    height: 100%;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+}
+.footer .left formids{
+    height: 70rpx;
+    line-height: 34rpx;
+}
+.follow-img-index{
+    width:36rpx;
+    height:34rpx;
+}
+.follow-img-follow{
+    width:36rpx;
+    height:34rpx;
+}
+.follow-img-service{
+    width:34rpx;
+    height:34rpx;
+}
+.follow-img-share{
+    width:34rpx;
+    height:34rpx;
+}
+.footer .left .text{
+    line-height: 28rpx;
+    height: 28rpx;
+    font-size: 20rpx;
+    margin-top: 8rpx;
+}
+.footer .follow{
+    width: 25%;
+}
+.footer .reserve{
+    width: 290rpx;
+    min-width: 290rpx;
+    height: 100%;
+}
+.footer .reserve .text{
+    width: 270rpx;
+    height: 84rpx;
+    background: linear-gradient(90deg, #3BBFF5 0%, #57A0FF 100%);
+    border-radius: 42rpx;
+
+    font-size: 36rpx;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #FFFFFF;
+    line-height: 84rpx;
+    margin-top: 16rpx;
+}
+
+.baos{
+    height: 330rpx;
+    width: 110%;
+    white-space: nowrap;
+    margin-left: -5%;
+}
+.baos .image{
+    width: 500rpx;
+    display: inline-block;
+    margin-right: 20rpx;
+}
+.baos .image:first-child{
+    margin-left: 5%;
+}
+.baos .image:last-child{
+    margin-right: 5%;
+}
+.baos .image image{
+    border-radius: 10rpx;
+    width: 500rpx;
+    height: 320rpx;
+    box-shadow:0px 4rpx 4rpx 0px rgba(198,198,198,1);
+}
+.cais{
+    width: 110%;
+    white-space: nowrap;
+    height: 460rpx;
+    margin-left: -5%;
+}
+.cais-views{
+    display: inline-block;
+    margin-right: 20rpx;
+}
+.cais-views:first-child{
+    margin-left: 5%;
+}
+.cais-views:last-child{
+    margin-right: 5%;
+}
+.cais .image-view{
+    border-radius: 10rpx;
+    border: 2rpx solid #F5F5F5;
+    box-shadow:0px 4px 4px 0px rgba(198,198,198,1);
+}
+.cais .image{
+    width: 500rpx;
+    border-radius: 10rpx 10rpx 0 0;
+    overflow: hidden;
+    height: 320rpx;
+}
+.cais .image image{
+    width: 100%;
+    height: 100%;
+}
+.cais .text{
+    font-size: 30rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    padding-left: 20rpx;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.cais-text{
+    font-size: 28rpx;
+}
+.cais-text view{
+    height: 50rpx;
+    line-height: 50rpx;
+    padding: 0 14rpx;
+    border: 2rpx solid #CC995A;
+    margin-right: 20rpx;
+    margin-bottom: 20rpx;
+    display: inline-block;
+    border-radius: 6rpx;
+}
+.activity-view{
+    background-color: #FEF1EA;
+    width:110%;
+    margin: 0 -5%;
+    font-size: 24rpx;
+}
+.activity{
+    width:90%;
+    margin: 0 auto;
+    padding: 28rpx 0;
+}
+.activity-left{
+    width: calc(100% - 60rpx);
+}
+.activity-right{
+    min-width: 60rpx;
+    color: #C0A369;
+}
+.activity-first{
+    width: 100%;
+    line-height: 42rpx;
+    overflow: hidden;
+    text-align: left;
+    height: 42rpx;
+}
+.activity-first image{
+    width: 30rpx;
+    height: 28rpx;
+    margin-right: 20rpx;
+    min-width: 30rpx;
+    margin-left: 8rpx;
+    margin-top: 8rpx;
+}
+.activity-text{
+    margin-left: 60rpx;
+    line-height: 34rpx;
+    height: 34rpx;
+    margin-top: 10rpx;
+    text-align: left;
+    color: #C28C56;
+}
+.more{
+    /*background-image: url("http://nosqn.colorcun.com/reserve/images/m713.png");*/
+    margin-left: 20rpx;
+    height: 26rpx;
+    width: 14rpx;
+}
+.discount{
+    margin-right: 20rpx;
+    white-space:nowrap;
+}
+.discount:last-child{
+    margin-right: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.discount .discount-left{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%B7%A6%E8%BE%B9.png");
+    width: 12rpx;
+    height: 40rpx;
+    background-size: 100% 100%;
+}
+.discount .discount-text{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/%E4%B8%AD%E9%97%B4.jpg");
+    height: 40rpx;
+    min-width: 60rpx;
+    background-size: 100% 100%;
+    line-height: 40rpx;
+    color:#F8E6C4;
+    padding: 0 10rpx;
+}
+.discount .discount-right{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/%E5%8F%B3%E8%BE%B9.png");
+    width: 12rpx;
+    height: 40rpx;
+    background-size: 100% 100%;
+}
+.slogan{
+    position:absolute;
+    right:0rpx;
+    bottom: 0rpx;
+    background-color: rgba(0,0,0,0.39);
+    color: #FFFFFF;
+    font-size: 26rpx;
+    width: 100%;
+}
+.slogan-view{
+    height: 80rpx;
+    line-height: 80rpx;
+    width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.slogan .dot{
+    width: 8rpx;
+    height: 8rpx;
+    background-color: #fff;
+    border-radius: 50%;
+    margin: 0 20rpx;
+}
+.swiper-num{
+    position:absolute;
+    right:20rpx;
+    bottom: 20rpx;
+    background-color: rgba(0,0,0,0.60);
+    color: #FFFFFF;
+    font-size: 24rpx;
+    height: 40rpx;
+    line-height: 40rpx;
+    padding: 0 15rpx;
+    border-radius: 20rpx;
+}
+
+.addr-view{
+    max-width: calc(100%-20rpx);
+    overflow: hidden;
+    text-overflow:ellipsis;
+}
+.more-addr{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/m2.png");
+}
+.average{
+    color: #C0A369;
+    min-width: 135rpx;
+    margin-left: 40rpx;
+    text-align: right;
+    white-space: nowrap;
+}
+.name-info-text{
+    margin-right: 20rpx;
+    float: left;
+}
+.broad{
+    display: inline-block;
+    height: 28rpx;
+}
+.broad-1{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/p0.png");
+    width: 14rpx;
+    height: 34rpx;
+    background-size: 100% 100%;
+    float: left;
+}
+.broad-2{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/p2.png");
+    height: 34rpx;
+    background-size: 100% 100%;
+    font-size: 20rpx;
+    color: #FFFFFF;
+    line-height: 34rpx;
+    float: left;
+}
+.broad-3{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/p3.png");
+    width: 14rpx;
+    height: 34rpx;
+    background-size: 100% 100%;
+    float: left;
+}
+
+.label_c{
+    font-size: 24rpx;
+    color: #C0A369;
+    margin-top: 20rpx;
+}
+.label_text{
+    height: 40rpx;
+    line-height: 40rpx;
+    background-color: #FFF5EB;
+    padding: 4rpx 8rpx;
+}
+
+.activity-view-easy{
+    height: 120rpx;
+    line-height: 120rpx;
+}
+.activity-view-easy .activity-left{
+    height: 120rpx;
+    line-height: 120rpx;
+}
+.activity-view-easy .icon{
+    background-image: url("http://nosqn.colorcun.com/reserve/images/ad2.png");
+    width: 30rpx;
+    height: 32rpx;
+    background-size: 100% 100%;
+}
+.activity-view-easy .discount{
+    border-right: 2rpx #C0A369 solid;
+    height: 30rpx;
+    line-height: 30rpx;
+    font-size: 30rpx;
+    padding-right: 20rpx;
+    padding-left: 20rpx;
+    margin-right: 0;
+    font-weight:500;
+}
+.activity-view-easy .discount:last-child{
+    border-right-width: 0;
+}
+.activity-view-easy-old .activity-right{
+    min-width: 100rpx;
+}
+/* 包间预定 */
+.room-booking {
+    width:100%;
+}
+.dur{
+    width:100%;
+    padding-top:42rpx;
+}
+.dur-title{
+    width:100%;
+    padding:0 30rpx 40rpx;
+    box-sizing: border-box;
+}
+
+.tabs{
+    height: 80rpx;
+    position: fixed;
+    line-height: 80rpx;
+    width: 100%;
+    background-color: #ffffff;
+    z-index: 9;
+}
+.tabs-item{
+    width: 50%;
+}
+.tabs-item-text{
+    height: 76rpx;
+    border-bottom: 4rpx solid #ffffff;
+    font-size: 30rpx;
+    color: #353535;
+}
+.tabs-item-text.active{
+    border-color: #C0A369;
+    color: #C0A369;
+    font-weight: bold;
+}
+.olreserve{
+    margin-top: 80rpx;
+    padding-bottom: 200rpx;
+}
+.reserve-time{
+    padding: 40rpx 0 30rpx 30rpx;
+    font-size: 32rpx;
+}
+.hasFullHouse{
+    height: 100rpx;
+    font-size: 30rpx;
+    color: #FFFFFF;
+    background-color: #999999;
+    line-height: 100rpx;
+    width: calc(100% - 60rpx);
+    margin: 0 auto;
+}
+.more-phone{
+    width: 158rpx;
+    min-width: 158rpx;
+    border-left: 2rpx solid #E0E0E0;
+    height: 70rpx;
+    background-size: 40rpx 36rpx;
+    background-position: center center;
+    background-image: url("http://nosqn.colorcun.com/reserve/images/sphone.png");
+}
+.reserve-button{
+    width:680rpx;
+    height:80rpx;
+    margin:0 auto;
+    background: #242320;
+}
+.reserve-button-cover{
+    width:100%;
+    height:130rpx;
+    position: fixed;
+    left:0;
+    right:0;
+    bottom:0;
+    background: #fff;
+}
+.activity-view-tit{
+    height:42rpx;
+    font-size:30rpx;
+    font-family:PingFangSC-Medium,PingFang SC;
+    font-weight:500;
+    color:rgba(53,53,53,1);
+    line-height:42rpx;
+    margin-right: 42rpx;
+    min-width: 60rpx;
+}
+.activity-view-activityStr{
+    white-space:nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    font-size: 26rpx;
+}
+.activity-view-blk{
+    height:34rpx;
+    border-top:2rpx solid rgba(240,88,36,1);
+    border-bottom:2rpx solid rgba(240,88,36,1);
+    box-sizing: border-box;
+    font-size:24rpx;
+    font-family:PingFangSC-Medium,PingFang SC;
+    font-weight:500;
+    color:rgba(240,88,36,1);
+    line-height:30rpx;
+    margin-right: 22rpx;
+    padding: 0 12rpx;
+    position: relative;
+    border-radius: 6rpx;
+}
+.activity-view-blk:before,.activity-view-blk:after{
+    background-size: 100% 100%;
+    width: 12rpx;
+    height: 34rpx;
+    background-image: url("http://nosqn.colorcun.com/sellerbaobao/left-1.png");
+    content: "";
+    position: absolute;
+    left:0;
+    top:-2rpx;
+}
+.activity-view-blk:after{
+    background-image: url("http://nosqn.colorcun.com/sellerbaobao/right-1.png");
+    right:0;
+    left:auto;
+}
+.activityStr{
+    width: calc(100% - 140rpx);
+    padding-left: 100rpx;
+
+    height: 36rpx;
+    font-size: 26rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #353535;
+    line-height: 36rpx;
+    margin-top: -30rpx;
+    margin-bottom: 40rpx;
+
+    white-space:nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+.commentLabel{
+    height: 52rpx;
+    background: #F1F1F1;
+    border-radius: 26rpx;
+
+    font-size: 26rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    line-height: 52rpx;
+    text-align: center;
+}
\ No newline at end of file

@@ -248,7 +248,7 @@ Page({
         url:util.http_build_query({
           id:item.id,
           activeTab:'reserve',
-        },'./detail')
+        },'./reserve')
       })
     }
   },

@@ -14,7 +14,7 @@
             <view wx:if="{{order_info.status==2}}" class="text-bold txt-30-h text-blue">请将此码出示给店员</view>
         </view>
     </subject>
-    <navigator url="/pages/reserve/detail?id={{order_info.sid}}&activeTab=reserve">
+    <navigator url="/pages/reserve/reserve?id={{order_info.sid}}&activeTab=reserve">
         <view class="view card flex margin-tb-sm padding-lg justify-between">
             <view class="view text-bold txt-32-h">您还可以预订包间</view>
             <view class="view bg-blue-blue round text-bold" style="padding: 8rpx 20rpx;">订包间</view>