状态调整

@@ -82,7 +82,12 @@ Component({
             }
             }
             if(this.data.hasShowStatus){
             if(this.data.hasShowStatus){
                 let ns=new Date()/1000
                 let ns=new Date()/1000
-                obj.showStatusStr=ns>this.data.detail.ddate?'已结束':'已预定';
+              obj.showStatusStr='已预定'
+              if(this.data.detail.status==4){
+                obj.showStatusStr='已取消'
+              }else if(this.data.detail.status>=2 || ns>this.data.detail.ddate){
+                obj.showStatusStr='已完成'
+              }
             }
             }
             this.setData(obj)
             this.setData(obj)
         }
         }

@@ -137,7 +137,11 @@ Page({
             return $1+'**'+$3;
             return $1+'**'+$3;
           })
           })
         }
         }
+      if(res.data.status==4 && res.data.cancel){
+        res.data.cancel.cdateStr=util.unixtoTime(res.data.cancel.cdate,"YYYY.MM.DD HH:II")
+      }
         this.detailData=res.data;
         this.detailData=res.data;
+
         this.setData({
         this.setData({
             tables:res.data.tables,
             tables:res.data.tables,
             bookInfo:res.data,
             bookInfo:res.data,

@@ -55,16 +55,24 @@
         <view class="gray-deep-font font30r">记录人</view>
         <view class="gray-deep-font font30r">记录人</view>
         <view class="black-font font34r">{{bookInfo.note_name}}</view>
         <view class="black-font font34r">{{bookInfo.note_name}}</view>
     </view>
     </view>
-    <view class="flex-lr order-detail" wx:if="{{bookInfo.status==4 && bookInfo.cancel}}">
+</view>
+<view class="order-info" wx:if="{{bookInfo.status==4 && bookInfo.cancel}}">
+    <view class="flex-lr order-detail">
         <view class="gray-deep-font font30r">取消原因</view>
         <view class="gray-deep-font font30r">取消原因</view>
-        <view class="black-font font34r" style="width: 80%;">
-            <view class="flex-rr">{{bookInfo.cancel.desc}}</view>
-            <view class="flex-rr" wx:if="{{bookInfo.cancel.uname}}">{{bookInfo.cancel.uname}}</view>
+        <view class="flex-lr black-font font34r">
+            {{bookInfo.cancel.desc}}
         </view>
         </view>
     </view>
     </view>
+    <view class="flex-lr order-detail">
+        <view class="gray-deep-font font30r">取消时间</view>
+        <view class="black-font font34r">{{bookInfo.cancel.cdateStr}}</view>
+    </view>
+    <view class="flex-lr order-detail">
+        <view class="gray-deep-font font30r">操作人</view>
+        <view class="black-font font34r">{{bookInfo.cancel.uname}}</view>
+    </view>
 </view>
 </view>
 
 
-
 <view style="height: 250rpx;"></view>
 <view style="height: 250rpx;"></view>
 
 
 <!--通知预订人-->
 <!--通知预订人-->

@@ -73,7 +73,11 @@ Page({
       //     detail.cusman_account='wx:vking';
       //     detail.cusman_account='wx:vking';
       // }
       // }
       let ns=new Date()/1000
       let ns=new Date()/1000
-      detail.hasOvered=ns>detail.ddate
+    detail.hasCancel=detail.status==4
+    detail.hasOvered=false
+    if(!detail.hasCancel){
+      detail.hasOvered=ns>detail.ddate || detail.status>=2
+    }
       return detail;
       return detail;
   },
   },
     showManager(){
     showManager(){

@@ -2,8 +2,17 @@
 <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.hasOvered}}">
-            <view class="title Medium">已结束</view>
+        <block wx:if="{{detail.hasCancel}}">
+            <view class="icon">
+                <icon type="info" size="47" color="#C9C9C9"/>
+            </view>
+            <view class="title Medium">订座已取消</view>
+        </block>
+        <block wx:elif="{{detail.hasOvered}}">
+            <view class="icon">
+                <icon type="success" size="47" color="#C8B16D"/>
+            </view>
+            <view class="title Medium">订座已完成</view>
         </block>
         </block>
         <block wx:else="">
         <block wx:else="">
             <view class="icon">
             <view class="icon">
@@ -13,17 +22,7 @@
             <view class="info">分享订座信息给朋友，及时获知朋友们的反馈</view>
             <view class="info">分享订座信息给朋友，及时获知朋友们的反馈</view>
         </block>
         </block>
     </view>
     </view>
-    <view class="flex-lr share-view" wx:if="{{!detail.hasOvered}}">
-        <!--
-        <userinfo-share
-                        binduserinfo="userinfo"
-                        bindshare="share"
-                        share="{{detail}}"
-                        share-act=""
-                        class="share-but-view">
-            <view class="share-but Regular">邀请朋友</view>
-        </userinfo-share>
-        -->
+    <view class="flex-lr share-view" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
         <userinfo-share
         <userinfo-share
                         binduserinfo="userinfo"
                         binduserinfo="userinfo"
                         bindshare="share"
                         bindshare="share"

@@ -51,7 +51,7 @@
                             <card hasListShare
                             <card hasListShare
                                   seller="{{detail.seller}}" detail="{{detail}}">
                                   seller="{{detail.seller}}" detail="{{detail}}">
                                 <view slot="listshare">
                                 <view slot="listshare">
-                                    <userinfo
+                                    <userinfo wx:if="{{detail.status}}"
                                             id="userinfo-share-{{detail.id}}"
                                             id="userinfo-share-{{detail.id}}"
                                             data-id="{{detail.id}}"
                                             data-id="{{detail.id}}"
                                             binduserinfo="accept">
                                             binduserinfo="accept">