Commit fca6443c9424c4a94fdae33cf47181f04d65f5f1

Authored by wangfan
1 parent 08892796

ui fix

@@ -148,10 +148,29 @@ Page({ @@ -148,10 +148,29 @@ Page({
148 url:'./b_addnew?id='+this.data.bookInfo.id 148 url:'./b_addnew?id='+this.data.bookInfo.id
149 }) 149 })
150 }, 150 },
151 - cancelReserve(){  
152 - util.toast('不能取消预订','none');return;  
153 - this.setData({  
154 - actionSheetHidden:false 151 + async cancelReserve(){
  152 + let enter_params=util.cache('enter_params');
  153 + let sc=(await App.Reserve.SellerInfo(enter_params)).data
  154 + let cause='';
  155 + if(sc.seller_user){
  156 + cause=(sc.seller_user.nick_name||sc.seller_user.nickname)+'手动取消'
  157 + }
  158 + wx.showModal({
  159 + title: '确认取消',
  160 + content: '你确认要取消预订吗',
  161 + success:(res)=>{
  162 + if (res.confirm) {
  163 + App.Reserve.SetReserveStatus({
  164 + rid:this.data.bookInfo.id,
  165 + status:4,
  166 + cause:cause,
  167 + }).then(()=>{
  168 + this.getDetail(this.data.bookInfo.id,true);
  169 + })
  170 + } else if (res.cancel) {
  171 + console.log('用户点击取消')
  172 + }
  173 + }
155 }) 174 })
156 }, 175 },
157 actionSheetChange(e){ 176 actionSheetChange(e){
@@ -28,9 +28,11 @@ @@ -28,9 +28,11 @@
28 <view>{{detail.seller.real_address||detail.seller.map_address}}</view> 28 <view>{{detail.seller.real_address||detail.seller.map_address}}</view>
29 </view> 29 </view>
30 </view> 30 </view>
31 - <view class="opt flex-cc">  
32 - <button class="but button-none flex-vc" bindtap="lookLocation">一键导航</button>  
33 - <button class="but button-none flex-vc" open-type="share" >转发给同行人</button>  
34 - </view> 31 + </view>
  32 +</view>
  33 +<view class="opt-view">
  34 + <view class="opt flex-cc">
  35 + <button class="but button-none flex-vc" bindtap="lookLocation">一键导航</button>
  36 + <button class="but button-none flex-vc" open-type="share">转发好友</button>
35 </view> 37 </view>
36 </view> 38 </view>
@@ -39,21 +39,21 @@ image{ @@ -39,21 +39,21 @@ image{
39 width: 90%; 39 width: 90%;
40 } 40 }
41 .seller{ 41 .seller{
42 - margin-top: 150rpx; 42 + margin-top: 110rpx;
43 } 43 }
44 .seller .title{ 44 .seller .title{
45 - font-size: 26rpx; 45 + font-size: 28rpx;
46 color:#999999; 46 color:#999999;
47 - margin-bottom: 30rpx; 47 + margin-bottom: 32rpx;
48 } 48 }
49 .seller .content{ 49 .seller .content{
50 - margin-bottom: 30rpx; 50 + margin-bottom: 68rpx;
51 font-size: 30rpx; 51 font-size: 30rpx;
52 line-height: 30rpx; 52 line-height: 30rpx;
53 } 53 }
54 .seller .name{ 54 .seller .name{
55 - font-size: 42rpx;  
56 - line-height: 42rpx; 55 + font-size: 44rpx;
  56 + line-height: 44rpx;
57 } 57 }
58 .invit-addr{ 58 .invit-addr{
59 width: 20rpx; 59 width: 20rpx;
@@ -62,20 +62,26 @@ image{ @@ -62,20 +62,26 @@ image{
62 } 62 }
63 63
64 64
65 - 65 +.opt-view{
  66 + position: fixed;
  67 + bottom: 120rpx;
  68 + width: 100%;
  69 +}
66 .opt{ 70 .opt{
67 - margin-top: 52rpx; 71 + width: 90%;
  72 + margin: 0 auto;
68 } 73 }
69 .opt .but{ 74 .opt .but{
70 - width: 330rpx; 75 + width: 100%;
71 height: 80rpx; 76 height: 80rpx;
72 border: 2rpx solid #ECD9B7; 77 border: 2rpx solid #ECD9B7;
73 border-radius: 6rpx; 78 border-radius: 6rpx;
74 - line-height: 80rpx; 79 + line-height: 78rpx;
75 text-align: center; 80 text-align: center;
76 font-size: 30rpx; 81 font-size: 30rpx;
77 color:#ECD9B7; 82 color:#ECD9B7;
78 - margin-right: 20rpx; 83 + margin-right: 5%;
  84 + padding-bottom: 4rpx!important;
79 } 85 }
80 .opt .but:last-child{ 86 .opt .but:last-child{
81 margin-right: 0; 87 margin-right: 0;
@@ -85,7 +85,7 @@ Page({ @@ -85,7 +85,7 @@ Page({
85 url = '/pages/customer/detail_invitation'; 85 url = '/pages/customer/detail_invitation';
86 } 86 }
87 if (res.data.openid == opt.openid) { 87 if (res.data.openid == opt.openid) {
88 - //url = '/pages/customer/detail_owner'; 88 + url = '/pages/customer/detail_owner';
89 } 89 }
90 } 90 }
91 } 91 }