Commit 9754e342c3094f7ee769afcd4a58d75f8b5495a0

Authored by vking
1 parent 09ca1f41

discount and activity

@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
71 line-height:28rpx; 71 line-height:28rpx;
72 padding: 0 6rpx; 72 padding: 0 6rpx;
73 /*min-width: 60rpx;*/ 73 /*min-width: 60rpx;*/
  74 + white-space:nowrap;
74 text-align: center; 75 text-align: center;
75 } 76 }
76 .activity-right{ 77 .activity-right{
@@ -173,34 +173,34 @@ @@ -173,34 +173,34 @@
173 <!--通知预订人--> 173 <!--通知预订人-->
174 <view class="notice-opt" wx:if="{{bookInfo.hasRunning}}"> 174 <view class="notice-opt" wx:if="{{bookInfo.hasRunning}}">
175 <view class="notice-button-border font34r flex-lr"> 175 <view class="notice-button-border font34r flex-lr">
176 - <view> 176 + <view class="item">
177 <formids bindclick="noticeCall">通知客户</formids> 177 <formids bindclick="noticeCall">通知客户</formids>
178 </view> 178 </view>
179 - <view wx:if="{{bookInfo.order && bookInfo.order.cookbooklist.length>0}}"> 179 + <view class="item" wx:if="{{bookInfo.order && bookInfo.order.cookbooklist.length>0}}">
180 <formids bindclick="showOrder">查看菜品</formids> 180 <formids bindclick="showOrder">查看菜品</formids>
181 </view> 181 </view>
182 </view> 182 </view>
183 <view class="notice-button-border font34r flex-lr" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}"> 183 <view class="notice-button-border font34r flex-lr" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
184 - <view> 184 + <view class="item">
185 <formids bindclick="gotoModify">变更预订</formids> 185 <formids bindclick="gotoModify">变更预订</formids>
186 </view> 186 </view>
187 - <view > 187 + <view class="item">
188 <formids bindclick="cancelReserve">取消预订</formids> 188 <formids bindclick="cancelReserve">取消预订</formids>
189 </view> 189 </view>
190 - <view> 190 + <view class="item">
191 <formids bindclick="startDinner" data-status="2">确认到店</formids> 191 <formids bindclick="startDinner" data-status="2">确认到店</formids>
192 </view> 192 </view>
193 </view> 193 </view>
194 </view> 194 </view>
195 <view class="notice-opt" wx:if="{{bookInfo.status==2}}"> 195 <view class="notice-opt" wx:if="{{bookInfo.status==2}}">
196 <view class="notice-button-border font34r flex-lr"> 196 <view class="notice-button-border font34r flex-lr">
197 - <view wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}"> 197 + <view class="item" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
198 <formids bindclick="gotoModify">变更预订</formids> 198 <formids bindclick="gotoModify">变更预订</formids>
199 </view> 199 </view>
200 - <view wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}"> 200 + <view class="item" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
201 <formids bindclick="cancelReserve">取消预订</formids> 201 <formids bindclick="cancelReserve">取消预订</formids>
202 </view> 202 </view>
203 - <view> 203 + <view class="item">
204 <formids bindclick="noticeCall">通知客户</formids> 204 <formids bindclick="noticeCall">通知客户</formids>
205 </view> 205 </view>
206 </view> 206 </view>
@@ -621,7 +621,7 @@ @@ -621,7 +621,7 @@
621 "id": 71, 621 "id": 71,
622 "name": "pages/reserve/detail", 622 "name": "pages/reserve/detail",
623 "pathName": "pages/reserve/detail", 623 "pathName": "pages/reserve/detail",
624 - "query": "id=1001&_activeTab=reserve&date=2020-02-16&pnum=6", 624 + "query": "id=4352&_activeTab=reserve&date=2020-02-16&pnum=6",
625 "scene": null 625 "scene": null
626 }, 626 },
627 { 627 {