Commit c65c580ab78575db92d6198ad067dd4cbdc44aab

Authored by wangfan
1 parent 275d0313

录入调整

@@ -3,20 +3,14 @@ @@ -3,20 +3,14 @@
3 3
4 <view class="item flex-vc {{pi==0?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_addnew"> 4 <view class="item flex-vc {{pi==0?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_addnew">
5 <view class="icon reserve"></view> 5 <view class="icon reserve"></view>
6 - <view class="text">  
7 - 订座  
8 - </view> 6 + <view class="text">订座</view>
9 </view> 7 </view>
10 <view class="item flex-vc {{pi==1?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_index"> 8 <view class="item flex-vc {{pi==1?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_index">
11 <view class="icon book"></view> 9 <view class="icon book"></view>
12 - <view class="text">  
13 - 预定本  
14 - </view> 10 + <view class="text">预定本</view>
15 </view> 11 </view>
16 <view class="item flex-vc {{pi==2?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_setting"> 12 <view class="item flex-vc {{pi==2?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_setting">
17 <view class="icon setting"></view> 13 <view class="icon setting"></view>
18 - <view class="text">  
19 - 设置  
20 - </view> 14 + <view class="text">设置</view>
21 </view> 15 </view>
22 </view> 16 </view>
@@ -107,5 +107,8 @@ Page({ @@ -107,5 +107,8 @@ Page({
107 wx.redirectTo({ 107 wx.redirectTo({
108 url:'./b_addnew?id='+this.data.bookInfo.id 108 url:'./b_addnew?id='+this.data.bookInfo.id
109 }) 109 })
110 - } 110 + },
  111 + cancelReserve(){
  112 + util.toast('不能取消','none')
  113 + }
111 }) 114 })
1 <nav>订座详情</nav> 1 <nav>订座详情</nav>
2 <!--订单信息--> 2 <!--订单信息-->
3 -<view class="order-info" bindtap="gotoModify"> 3 +<view class="order-info">
4 <view class="flex-lr order-detail"> 4 <view class="flex-lr order-detail">
5 <view class="gray-deep-font font30r">用餐时间</view> 5 <view class="gray-deep-font font30r">用餐时间</view>
6 <view class="black-font font34r">{{bookInfo.rdateStr}}</view> 6 <view class="black-font font34r">{{bookInfo.rdateStr}}</view>
@@ -63,10 +63,14 @@ @@ -63,10 +63,14 @@
63 </view> 63 </view>
64 64
65 65
66 -<view style="height: 160rpx;"></view> 66 +<view style="height: 250rpx;"></view>
67 67
68 <!--通知预订人--> 68 <!--通知预订人-->
69 -<block wx:if="{{bookInfo.code}}"> 69 +<view class="notice-opt">
70 <view class="notice-button white-font font34r flex-cc" bindtap="noticeCall">通知预订人</view> 70 <view class="notice-button white-font font34r flex-cc" bindtap="noticeCall">通知预订人</view>
71 - <noticeCall id="notice" bookInfo="{{bookInfo}}"></noticeCall>  
72 -</block> 71 + <view class="notice-button-border font34r flex-lr">
  72 + <view bindtap="gotoModify">变更预定</view>
  73 + <view bindtap="cancelReserve">取消预定</view>
  74 + </view>
  75 +</view>
  76 +<noticeCall id="notice" bookInfo="{{bookInfo}}"></noticeCall>
@@ -88,15 +88,36 @@ view{ @@ -88,15 +88,36 @@ view{
88 margin:0 auto; 88 margin:0 auto;
89 } 89 }
90 90
91 -  
92 -.notice-button{  
93 - width:675rpx;  
94 - height:85rpx;  
95 - background:#199095;  
96 - border-radius:10rpx;  
97 - margin:0 auto; 91 +.notice-opt{
98 position:fixed; 92 position:fixed;
99 left:0; 93 left:0;
100 right:0; 94 right:0;
101 - bottom:50rpx; 95 + bottom: 0;
  96 + padding-bottom: 50rpx;
  97 + background-color: #fefefe;
  98 +}
  99 +.notice-button{
  100 + height:85rpx;
  101 + width:90%;
  102 + background:#199095;
  103 + border-radius:0;
  104 + margin:20rpx auto 0;
  105 +}
  106 +.notice-button-border{
  107 + height:85rpx;
  108 + width:90%;
  109 + border:solid 2rpx #199095;
  110 + border-radius:0;
  111 + margin:20rpx auto 0;
  112 + color: #199095;
  113 +}
  114 +.notice-button-border view{
  115 + width: 49%;
  116 + border-right: 2rpx solid #199095;
  117 + text-align: center;
  118 + height: 50rpx;
  119 + line-height: 50rpx;
  120 +}
  121 +.notice-button-border view:last-child{
  122 + border-right-width: 0;
102 } 123 }