xt / xcx-book · Commits

Go to a project

Commit 3e6a30dac7aa917c66438f111cf754b5408b4f24

Authored by vking
1 parent e26dd0db
build: skipped

pay

Inline Side-by-side
Showing 3 changed files with 69 additions and 20 deletions
@@ -62,8 +62,17 @@ Page({ @@ -62,8 +62,17 @@ Page({
62 }, 62 },
63 GetCheckout(){ 63 GetCheckout(){
64 App.Customer.GetOrderInfo({rid:this.options.rid}).then(res=>{ 64 App.Customer.GetOrderInfo({rid:this.options.rid}).then(res=>{
  65 + let checkout=res.data
  66 + let remark=[]
  67 + if(res.data.is_wine>0){
  68 + remark.push('有剩余酒水要退')
  69 + }
  70 + if(res.data.is_pack>0){
  71 + remark.push('菜品打包')
  72 + }
  73 + checkout.remark=remark.join('、')
65 this.setData({ 74 this.setData({
66 - checkout:res.data 75 + checkout:checkout
67 }) 76 })
68 }) 77 })
69 }, 78 },
@@ -123,4 +132,10 @@ Page({ @@ -123,4 +132,10 @@ Page({
123 this.GetOrderInfoInterval=null 132 this.GetOrderInfoInterval=null
124 } 133 }
125 }, 134 },
  135 + txSeller(){
  136 + this.selectComponent('#showModal').options({
  137 + header: '温馨提示',
  138 + body: '已为您催促商家，请耐心等待'
  139 + }).show();
  140 + },
126 }) 141 })
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <jinduBar checkout="{{checkout}}"></jinduBar> 6 <jinduBar checkout="{{checkout}}"></jinduBar>
7 </view> 7 </view>
8 <!--//买单相关（可选）--> 8 <!--//买单相关（可选）-->
9 - <block wx:if="{{true || checkout.status<1}}"> 9 + <block wx:if="{{checkout.status<1}}">
10 <checkbox-group bindchange="checkoutData"> 10 <checkbox-group bindchange="checkoutData">
11 <view class="content checkout"> 11 <view class="content checkout">
12 <view class="title">买单相关（可选）</view> 12 <view class="title">买单相关（可选）</view>
@@ -28,17 +28,13 @@ @@ -28,17 +28,13 @@
28 </view> 28 </view>
29 </block> 29 </block>
30 <block wx:elif="{{checkout.status==1}}"> 30 <block wx:elif="{{checkout.status==1}}">
31 - <view class="content checkout" wx:if="{{checkout.is_pack==1 || checkout.is_wine==1}}">  
32 - <view class="title">已提交信息</view>  
33 - <view class="item flex-lr" wx:if="{{checkout.is_wine==1}}">  
34 - <view>有剩余酒水饮料要退</view>  
35 - </view>  
36 - <view class="item flex-lr" wx:if="{{checkout.is_pack==1}}">  
37 - <view>菜品打包</view> 31 + <view class="content checkout">
  32 + <view class="waiting-money flex-vc">
  33 + <icon type="waiting" size="47" color="#C0A369"/>
  34 + <view class="waiting-txt">商家处理中</view>
38 </view> 35 </view>
39 </view> 36 </view>
40 <view class="content invoice"> 37 <view class="content invoice">
41 - <view class="title">提前开发票</view>  
42 <view class="item flex-lr" bindtap="setInvoice"> 38 <view class="item flex-lr" bindtap="setInvoice">
43 <view>发票</view> 39 <view>发票</view>
44 <invoice bindevent="setInvoice"> 40 <invoice bindevent="setInvoice">
@@ -50,18 +46,22 @@ @@ -50,18 +46,22 @@
50 </view> 46 </view>
51 </view> 47 </view>
52 <subscribe ids="{{[0]}}"> 48 <subscribe ids="{{[0]}}">
53 - <view class="checkout-get subscribe">商家反馈金额后提醒我</view> 49 + <view class="checkout-get subscribe">点我，商家反馈金额后提醒我</view>
54 </subscribe> 50 </subscribe>
55 - <view class="checkout-get tx-seller" bindtap="">催一下商家</view> 51 + <view class="checkout-get tx-seller" bindtap="txSeller">催一下商家</view>
56 </block> 52 </block>
57 <block wx:elif="{{checkout.status==2}}"> 53 <block wx:elif="{{checkout.status==2}}">
58 <view class="content money"> 54 <view class="content money">
  55 + <view class="waiting-money flex-vc">
  56 + <icon type="waiting" size="47" color="#C0A369"/>
  57 + <view class="waiting-txt">待支付</view>
  58 + </view>
59 <view class="list flex-lr"> 59 <view class="list flex-lr">
60 <view class="list-name">消费总额</view> 60 <view class="list-name">消费总额</view>
61 <view class="list-val">¥ {{checkout.price}}</view> 61 <view class="list-val">¥ {{checkout.price}}</view>
62 </view> 62 </view>
63 <view class="list flex-lr"> 63 <view class="list flex-lr">
64 - <view class="list-name">红包抵扣</view> 64 + <view class="list-name">红　　包</view>
65 <view class="list-val">-¥ {{user.price}}</view> 65 <view class="list-val">-¥ {{user.price}}</view>
66 </view> 66 </view>
67 <view class="list flex-lr"> 67 <view class="list flex-lr">
@@ -76,18 +76,26 @@ @@ -76,18 +76,26 @@
76 <view class="list-name">包间名称</view> 76 <view class="list-name">包间名称</view>
77 <view class="list-val">{{checkout.tablename}}</view> 77 <view class="list-val">{{checkout.tablename}}</view>
78 </view> 78 </view>
  79 + <view class="list flex-lr" wx:if="{{checkout.remark}}">
  80 + <view class="list-name">备注信息</view>
  81 + <view class="list-val">{{checkout.remark}}</view>
  82 + </view>
  83 + <view class="checkout-get" bindtap="">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0}}元</view>
79 </view> 84 </view>
80 <view class="money-tips">注：消费清单，离店时请到前台索要；</view> 85 <view class="money-tips">注：消费清单，离店时请到前台索要；</view>
81 - <view class="checkout-get" bindtap="">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0}}元</view>  
82 </block> 86 </block>
83 <block wx:else=""> 87 <block wx:else="">
84 <view class="content money"> 88 <view class="content money">
  89 + <view class="waiting-money flex-vc">
  90 + <icon type="success" size="47" color="#C8B16D"/>
  91 + <view class="waiting-txt">已买单</view>
  92 + </view>
85 <view class="list flex-lr"> 93 <view class="list flex-lr">
86 <view class="list-name">消费总额</view> 94 <view class="list-name">消费总额</view>
87 <view class="list-val">¥ {{checkout.price}}</view> 95 <view class="list-val">¥ {{checkout.price}}</view>
88 </view> 96 </view>
89 <view class="list flex-lr"> 97 <view class="list flex-lr">
90 - <view class="list-name">红包抵扣</view> 98 + <view class="list-name">红　　包</view>
91 <view class="list-val">-¥ {{checkout.discount[0].price}}</view> 99 <view class="list-val">-¥ {{checkout.discount[0].price}}</view>
92 </view> 100 </view>
93 <view class="list flex-lr"> 101 <view class="list flex-lr">
@@ -102,6 +110,10 @@ @@ -102,6 +110,10 @@
102 <view class="list-name">包间名称</view> 110 <view class="list-name">包间名称</view>
103 <view class="list-val">{{checkout.tablename}}</view> 111 <view class="list-val">{{checkout.tablename}}</view>
104 </view> 112 </view>
  113 + <view class="list flex-lr" wx:if="{{checkout.remark}}">
  114 + <view class="list-name">备注信息</view>
  115 + <view class="list-val">{{checkout.remark}}</view>
  116 + </view>
105 <view class="list flex-lr pay-time"> 117 <view class="list flex-lr pay-time">
106 <view class="list-name">买单时间</view> 118 <view class="list-name">买单时间</view>
107 <view class="list-val">{{util.unixtoTime(checkout.pay_time,'YYYY-MM-DD HH:II')}}</view> 119 <view class="list-val">{{util.unixtoTime(checkout.pay_time,'YYYY-MM-DD HH:II')}}</view>
@@ -112,8 +124,8 @@ @@ -112,8 +124,8 @@
112 <view>发票</view> 124 <view>发票</view>
113 <invoice bindevent="setInvoice"> 125 <invoice bindevent="setInvoice">
114 <view class="invoice-right disabled"> 126 <view class="invoice-right disabled">
115 - <view class="title active">{{checkout.invoice.title}}</view>  
116 - <view class="title">{{checkout.invoice.taxnumber}}</view> 127 + <view class="invoice-title">{{checkout.invoice.title}}</view>
  128 + <view class="invoice-taxnumber">{{checkout.invoice.taxnumber}}</view>
117 </view> 129 </view>
118 </invoice> 130 </invoice>
119 </view> 131 </view>
@@ -3,7 +3,7 @@ page{ @@ -3,7 +3,7 @@ page{
3 background-color: #F5F5F5; 3 background-color: #F5F5F5;
4 } 4 }
5 .pages{ 5 .pages{
6 - padding: 204rpx 0 52rpx; 6 + padding: 204rpx 0 60rpx;
7 background-size: 100% auto; 7 background-size: 100% auto;
8 background-repeat: no-repeat; 8 background-repeat: no-repeat;
9 background-image: url("http://qn.colorcun.com/checkout/images/3.png"); 9 background-image: url("http://qn.colorcun.com/checkout/images/3.png");
@@ -14,7 +14,7 @@ page{ @@ -14,7 +14,7 @@ page{
14 position: relative; 14 position: relative;
15 background-color: #fff; 15 background-color: #fff;
16 background:rgba(255,255,255,1); 16 background:rgba(255,255,255,1);
17 - border-radius:10px; 17 + border-radius:10rpx;
18 padding: 0 40rpx; 18 padding: 0 40rpx;
19 box-sizing: border-box; 19 box-sizing: border-box;
20 } 20 }
@@ -102,12 +102,12 @@ page{ @@ -102,12 +102,12 @@ page{
102 .money-tips{ 102 .money-tips{
103 height:40rpx; 103 height:40rpx;
104 font-size:28rpx; 104 font-size:28rpx;
105 - font-family:PingFang-SC-Medium,PingFang-SC;  
106 font-weight:500; 105 font-weight:500;
107 color:rgba(53,53,53,1); 106 color:rgba(53,53,53,1);
108 line-height:40rpx; 107 line-height:40rpx;
109 margin-left: 40rpx; 108 margin-left: 40rpx;
110 margin-top: 20rpx; 109 margin-top: 20rpx;
  110 + padding-bottom: 140rpx;
111 } 111 }
112 .should_price{ 112 .should_price{
113 color:rgba(224,32,32,1); 113 color:rgba(224,32,32,1);
@@ -151,4 +151,26 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked:before{ @@ -151,4 +151,26 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked:before{
151 position: absolute; 151 position: absolute;
152 top:-28rpx; 152 top:-28rpx;
153 right:40rpx; 153 right:40rpx;
  154 +}
  155 +.waiting-txt{
  156 + margin-top: 32rpx;
  157 + height:50rpx;
  158 + font-size:36rpx;
  159 + font-weight:500;
  160 + color:rgba(53,53,53,1);
  161 + line-height:50rpx;
  162 +}
  163 +.waiting-money{
  164 + height: 260rpx;
  165 +}
  166 +.money .checkout-get{
  167 + bottom: 66rpx;
  168 +}
  169 +.invoice-title,.invoice-taxnumber{
  170 + height:44rpx;
  171 + font-size:32rpx;
  172 + font-weight:500;
  173 + color:rgba(53,53,53,1);
  174 + line-height:44rpx;
  175 + text-align: right;
154 } 176 }