推荐商家

@@ -2,7 +2,14 @@
 <nav hasHome>订座详情</nav>
 <nav hasHome>订座详情</nav>
 <view class="page">
 <view class="page">
     <view class="flex-vc success">
     <view class="flex-vc success">
-        <block wx:if="{{detail.hasCancel}}">
+        <block wx:if="{{detail.hasRunning}}">
+            <view class="icon">
+                <icon type="success" size="47" color="#C8B16D"/>
+            </view>
+            <view class="title Medium">订座成功</view>
+            <view class="info">分享订座信息给朋友，及时获知朋友们的反馈</view>
+        </block>
+        <block wx:elif="{{detail.hasCancel}}">
             <view class="icon">
             <view class="icon">
                 <icon type="info" size="47" color="#C9C9C9"/>
                 <icon type="info" size="47" color="#C9C9C9"/>
             </view>
             </view>
@@ -29,16 +36,8 @@
                 <view class="title Medium" style="font-size: 36rpx;">抱歉！</view>
                 <view class="title Medium" style="font-size: 36rpx;">抱歉！</view>
                 <view class="info Medium" style="font-size: 36rpx;color: #353535;">您相中的餐厅包间已经订满</view>
                 <view class="info Medium" style="font-size: 36rpx;color: #353535;">您相中的餐厅包间已经订满</view>
             </block>
             </block>
-            <block wx:else="">
-                <view class="icon">
-                    <icon type="success" size="47" color="#C8B16D"/>
-                </view>
-                <view class="title Medium">订座成功</view>
-                <view class="info">分享订座信息给朋友，及时获知朋友们的反馈</view>
-            </block>
         </block>
         </block>
     </view>
     </view>
-
     <block wx:if="{{detail.hasRunning}}">
     <block wx:if="{{detail.hasRunning}}">
         <view class="flex-lr share-view" wx:if="{{detail.type==1}}">
         <view class="flex-lr share-view" wx:if="{{detail.type==1}}">
             <formids url="/pages/customer/detail_owner_invitation?id={{detail.id}}&hasInvitation=1&hasSellerShare=1&tplid=1"
             <formids url="/pages/customer/detail_owner_invitation?id={{detail.id}}&hasInvitation=1&hasSellerShare=1&tplid=1"

@@ -10,6 +10,7 @@ const status=[
 ];
 ];
 export default {
 export default {
   reserve(detail){
   reserve(detail){
+    /*
     let ns = new Date() / 1000
     let ns = new Date() / 1000
     //取消
     //取消
     detail.hasCancel=detail.status==4;
     detail.hasCancel=detail.status==4;
@@ -21,10 +22,23 @@ export default {
     }else{//C端
     }else{//C端
       detail.hasRunning = !detail.hasOvered && !detail.hasCancel && detail.status==5
       detail.hasRunning = !detail.hasOvered && !detail.hasCancel && detail.status==5
     }
     }
+    */
+    detail.hasRunning=this.hasRunningFlag(detail)
+    if(!detail.hasRunning){
+      detail.hasCancel=detail.status==4;
+      detail.hasOvered=detail.status!=0 && detail.status!=6;
+    }
     detail.getStatusStr='';
     detail.getStatusStr='';
     if(detail.status>=0){
     if(detail.status>=0){
       detail.getStatusStr=status[detail.status];
       detail.getStatusStr=status[detail.status];
     }
     }
     return detail;
     return detail;
   },
   },
+  hasRunningFlag(detail){//判断订单正在运行
+    let ns = new Date() / 1000
+    let flag=true;
+    if(detail.status==0 || detail.status==6 || detail.status==4) return false//未进行状态
+    if(ns > detail.edate) return false//超时
+    return flag
+  }
 }
 }