推荐商家

@@ -26,7 +26,8 @@
                 <view class="icon">
                 <view class="icon">
                     <icon type="warn" size="47" color="#999999"/>
                     <icon type="warn" size="47" color="#999999"/>
                 </view>
                 </view>
-                <view class="title Medium">{{detail.cancel.desc||'包间已订满'}}</view>
+                <view class="title Medium" style="font-size: 36rpx;">抱歉！</view>
+                <view class="info Medium" style="font-size: 36rpx;color: #353535;">您相中的餐厅包间已经订满</view>
             </block>
             </block>
             <block wx:else="">
             <block wx:else="">
                 <view class="icon">
                 <view class="icon">

@@ -17,7 +17,7 @@ Page({
   },
   },
   tabType:1,
   tabType:1,
   offset:0,
   offset:0,
-  limit:3,
+  limit:10,
   hasMore:true,
   hasMore:true,
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
@@ -123,6 +123,7 @@ Page({
   },
   },
   switchType(e){
   switchType(e){
     this.hasRecommend=true
     this.hasRecommend=true
+    this.offset=0
     this.tabType=util.attr(e,'type')
     this.tabType=util.attr(e,'type')
     this.setData({
     this.setData({
       tabType:this.tabType,
       tabType:this.tabType,

@@ -14,7 +14,7 @@ export default {
     //取消
     //取消
     detail.hasCancel=detail.status==4;
     detail.hasCancel=detail.status==4;
     //结束
     //结束
-    detail.hasOvered= ns > detail.edate || (detail.status >= 2 && detail.status <= 3)
+    detail.hasOvered= (ns > detail.edate || (detail.status >= 2 && detail.status <= 3)) && detail.status!=6
     //正常运行已接单
     //正常运行已接单
     if(detail.type==0){//B端
     if(detail.type==0){//B端
       detail.hasRunning = !detail.hasOvered && !detail.hasCancel
       detail.hasRunning = !detail.hasOvered && !detail.hasCancel