Commit 23ff89bfd633566c093aa4d75406dff3893e6e16

Authored by vking
1 parent fe2076b4

cancel reserve,fix 包间需求

@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <view class="value" wx:else="">{{rdateStr}}</view> 27 <view class="value" wx:else="">{{rdateStr}}</view>
28 </view> 28 </view>
29 <view class="line"></view> 29 <view class="line"></view>
30 - <view class="right info Medium" wx:if="{{(detail.type==1 && detail.status==4) || hasOnlineReserve || detail.status==0 || detail.status==6}}"> 30 + <view class="right info Medium" wx:if="{{(detail.type==1 && (detail.status==4 || detail.status==0)) || hasOnlineReserve || detail.status==0 || detail.status==6}}">
31 <view class="label">包间</view> 31 <view class="label">包间</view>
32 <view class="value">{{util.getRoomName(detail.room_demand)}}</view> 32 <view class="value">{{util.getRoomName(detail.room_demand)}}</view>
33 </view> 33 </view>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
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=58295&fromid=1111&hasInvitation=1", 98 + "query": "id=58295&fromid=1111&hasInvitation=2",
99 "scene": 1044, 99 "scene": 1044,
100 "shareInfo": { 100 "shareInfo": {
101 "groupName": "测试模拟群1", 101 "groupName": "测试模拟群1",