Commit 81a19dba3dc196e6f0cb109a82e84b11692483b3

Authored by wangfan
2 parents e7c78216 8c44f040

Merge remote-tracking branch 'origin/master' into online-reserve

@@ -95,17 +95,12 @@ Page({ @@ -95,17 +95,12 @@ Page({
95 // detail.cusman_phone='15877556369'; 95 // detail.cusman_phone='15877556369';
96 // detail.cusman_account='wx:vking'; 96 // detail.cusman_account='wx:vking';
97 // } 97 // }
98 - detail.hasCanSuccess=false;  
99 - if(detail.customers && detail.customers.length>0){  
100 - let openid=getApp().openid;  
101 - detail.customers.forEach(item=>{  
102 - if(openid==item.openid){  
103 - detail.hasCanSuccess=true;  
104 - detail.remindtime=item.remind_date;  
105 - return true;  
106 - }  
107 - })  
108 - } 98 + let ns=new Date()/1000
  99 + detail.hasCancel=detail.status==4
  100 + detail.hasOvered=false
  101 + if(!detail.hasCancel){
  102 + detail.hasOvered=ns>detail.ddate || detail.status>=2
  103 + }
109 return detail; 104 return detail;
110 }, 105 },
111 showManager(){ 106 showManager(){
@@ -14,20 +14,36 @@ @@ -14,20 +14,36 @@
14 <view class="content">{{detail.rdateStr}}</view> 14 <view class="content">{{detail.rdateStr}}</view>
15 </view> 15 </view>
16 </view> 16 </view>
17 - <view class="opt-button" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}">  
18 - <view class="opt flex-cc">  
19 - <userinfo class="button-none flex-vc" binduserinfo="toast" wx:if="{{detail.seller.is_open_wine==1}}">  
20 - <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-2.png"></image>  
21 - </userinfo>  
22 - <formids class="button-none flex-vc" bindclick="cookbook" wx:if="{{detail.seller.is_open_order==1}}">  
23 - <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-3.png"></image>  
24 - </formids> 17 + <block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
  18 + <view class="opt-button" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}">
  19 + <view class="opt flex-cc">
  20 + <userinfo class="button-none flex-vc" binduserinfo="toast" wx:if="{{detail.seller.is_open_wine==1}}">
  21 + <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-2.png"></image>
  22 + </userinfo>
  23 + <formids class="button-none flex-vc" bindclick="cookbook" wx:if="{{detail.seller.is_open_order==1}}">
  24 + <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-3.png"></image>
  25 + </formids>
  26 + </view>
25 </view> 27 </view>
26 - </view> 28 + </block>
27 </view> 29 </view>
28 <view class="opt-view flex-vc"> 30 <view class="opt-view flex-vc">
29 - <view class="opt-view-tip">发邀请函给朋友,获知朋友反馈</view>  
30 - <userinfo-share class="button-none flex-vc" binduserinfo="setUserInfoSuccess">  
31 - <view class="buts-share"></view>  
32 - </userinfo-share> 31 + <block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
  32 + <view class="opt-view-tip">发邀请函给朋友,获知朋友反馈</view>
  33 + <userinfo-share class="button-none flex-vc" binduserinfo="setUserInfoSuccess">
  34 + <view class="buts-share"></view>
  35 + </userinfo-share>
  36 + </block>
  37 + <block wx:elif="{{detail.hasCancel}}">
  38 + <view class="icon">
  39 + <icon type="info" size="47" color="#C9C9C9"/>
  40 + </view>
  41 + <view class="opt-view-tip Medium">订座已取消</view>
  42 + </block>
  43 + <block wx:else="">
  44 + <view class="icon">
  45 + <icon type="success" size="47" color="#C8B16D"/>
  46 + </view>
  47 + <view class="opt-view-tip Medium">订座已完成</view>
  48 + </block>
33 </view> 49 </view>
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 "id": 6, 74 "id": 6,
75 "name": "pages/customer/index", 75 "name": "pages/customer/index",
76 "pathName": "pages/customer/index", 76 "pathName": "pages/customer/index",
77 - "query": "id=1762&fromid=1111&hasInvitation=0", 77 + "query": "id=1762&fromid=1111&hasInvitation=1",
78 "scene": "1044", 78 "scene": "1044",
79 "shareInfo": { 79 "shareInfo": {
80 "groupName": "测试模拟群1", 80 "groupName": "测试模拟群1",