Commit fe2076b46594653cdf668c8800291eec3782a352

Authored by vking
1 parent cd61c749

cancel reserve,fix 包间需求

@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 <import src="../tpl/invitation"></import> 2 <import src="../tpl/invitation"></import>
3 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav> 3 <nav backgroundColor="rgba(0,0,0,0)" hasHome style="position: fixed;z-index: 1;" class="navhome"></nav>
4 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}"> 4 <view class="pages bg-{{options.tplid}} flex-vc" style="height:{{height}}px;" wx:if="{{options.tplid}}">
5 - <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation}}"></template> 5 + <template is="tpl-{{options.tplid}}" data="{{seller,options,hasOwner,animation,detail}}"></template>
6 <view class="opt-view flex-vc"> 6 <view class="opt-view flex-vc">
7 - <block wx:if="{{!detail.hasCanSuccess}}"> 7 + <block wx:if="{{!detail.hasCanSuccess && detail.status!=4}}">
8 <userinfo class="button-none flex-vc" binduserinfo="confirmed" catchtap="catchtap"> 8 <userinfo class="button-none flex-vc" binduserinfo="confirmed" catchtap="catchtap">
9 <view class="buts-share animation customer"></view> 9 <view class="buts-share animation customer"></view>
10 </userinfo> 10 </userinfo>
@@ -31,43 +31,7 @@ @@ -31,43 +31,7 @@
31 </userinfo-share> 31 </userinfo-share>
32 </view> 32 </view>
33 </view> 33 </view>
34 -<!--  
35 -<view class="pages">  
36 - <view class="flex-vc" style="position: relative;">  
37 - <view class="invit-logo">  
38 - <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-logo.png"></image>  
39 - </view>  
40 - <view class="seller flex-vc">  
41 - <view class="title">餐厅</view>  
42 - <view class="content name">{{detail.seller.sellername}}</view>  
43 - <view class="title">包间</view>  
44 - <view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view>  
45 - <view class="title">时间</view>  
46 - <view class="content">{{detail.rdateStr}}</view>  
47 - <view class="title">地址</view>  
48 - <view class="content flex-cc" bindtap="lookLocation" style="align-items: flex-start;width:80%;">  
49 - <image src="http://qn.colorcun.com/manager-invitation/wx/address.png" class="invit-addr"></image>  
50 - <view class="addr">{{detail.seller.real_address||detail.seller.map_address}}</view>  
51 - </view>  
52 - </view>  
53 - </view>  
54 - <view class="opt-button">  
55 - <view class="opt flex-cc">  
56 - <formids class="button-none flex-vc" bindclick="lookLocation">  
57 - <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_invitation-1.png"></image>  
58 - </formids>  
59 - <userinfo-share class="button-none flex-vc" binduserinfo="toast">  
60 - <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_invitation-2.png"></image>  
61 - </userinfo-share>  
62 - </view>  
63 - </view>  
64 -</view>  
65 -<view class="opt-view" wx:if="{{!detail.hasCanSuccess}}">  
66 - <userinfo class="button-none flex-vc" binduserinfo="userinfo">  
67 - <view class="buts-share"></view>  
68 - </userinfo>  
69 -</view>  
70 ---> 34 +<view class="cancel-icon" wx:if="{{detail.status==4}}"></view>
71 <!--//商务--> 35 <!--//商务-->
72 <template name="tpl-1"> 36 <template name="tpl-1">
73 <view class="flex-vc shangwu" bindtap="{{options.rid?'goEditor':''}}"> 37 <view class="flex-vc shangwu" bindtap="{{options.rid?'goEditor':''}}">
@@ -77,4 +77,14 @@ image{ @@ -77,4 +77,14 @@ image{
77 color:rgba(236,217,183,1); 77 color:rgba(236,217,183,1);
78 line-height:34rpx; 78 line-height:34rpx;
79 margin-top: 8rpx; 79 margin-top: 8rpx;
  80 +}
  81 +.cancel-icon{
  82 + background-image: url("http://qn.colorcun.com/reserve/images/cancel-icon.png");
  83 + background-size: 100% 100%;
  84 + width: 208rpx;
  85 + height: 172rpx;
  86 + position: fixed;
  87 + top:43%;
  88 + right:22rpx;
  89 + z-index: 9999;
80 } 90 }
@@ -95,8 +95,8 @@ @@ -95,8 +95,8 @@
95 "id": 6, 95 "id": 6,
96 "name": "pages/customer/index", 96 "name": "pages/customer/index",
97 "pathName": "pages/customer/index", 97 "pathName": "pages/customer/index",
98 - "query": "id=1762&fromid=1111&hasInvitation=1",  
99 - "scene": "1044", 98 + "query": "id=58295&fromid=1111&hasInvitation=1",
  99 + "scene": 1044,
100 "shareInfo": { 100 "shareInfo": {
101 "groupName": "测试模拟群1", 101 "groupName": "测试模拟群1",
102 "shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev", 102 "shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",