cancel reserve,fix 包间需求

@@ -27,7 +27,7 @@
                 <view class="value" wx:else="">{{rdateStr}}</view>
             </view>
             <view class="line"></view>
-            <view class="right info Medium" wx:if="{{(detail.type==1 && detail.status==4) || hasOnlineReserve || detail.status==0 || detail.status==6}}">
+            <view class="right info Medium" wx:if="{{(detail.type==1 && (detail.status==4 || detail.status==0)) || hasOnlineReserve || detail.status==0 || detail.status==6}}">
                 <view class="label">包间</view>
                 <view class="value">{{util.getRoomName(detail.room_demand)}}</view>
             </view>

@@ -95,7 +95,7 @@
 					"id": 6,
 					"name": "pages/customer/index",
 					"pathName": "pages/customer/index",
-					"query": "id=58295&fromid=1111&hasInvitation=1",
+					"query": "id=58295&fromid=1111&hasInvitation=2",
 					"scene": 1044,
 					"shareInfo": {
 						"groupName": "测试模拟群1",