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({
},
GetCheckout(){
App.Customer.GetOrderInfo({rid:this.options.rid}).then(res=>{
let checkout=res.data
let remark=[]
if(res.data.is_wine>0){
remark.push('有剩余酒水要退')
}
if(res.data.is_pack>0){
remark.push('菜品打包')
}
checkout.remark=remark.join('、')
this.setData({
checkout:res.data
checkout:checkout
})
})
},
... ... @@ -123,4 +132,10 @@ Page({
this.GetOrderInfoInterval=null
}
},
txSeller(){
this.selectComponent('#showModal').options({
header: '温馨提示',
body: '已为您催促商家，请耐心等待'
}).show();
},
})
\ No newline at end of file
... ...
... ... @@ -6,7 +6,7 @@
<jinduBar checkout="{{checkout}}"></jinduBar>
</view>
<!--//买单相关（可选）-->
<block wx:if="{{true || checkout.status<1}}">
<block wx:if="{{checkout.status<1}}">
<checkbox-group bindchange="checkoutData">
<view class="content checkout">
<view class="title">买单相关（可选）</view>
... ... @@ -28,17 +28,13 @@
</view>
</block>
<block wx:elif="{{checkout.status==1}}">
<view class="content checkout" wx:if="{{checkout.is_pack==1 || checkout.is_wine==1}}">
<view class="title">已提交信息</view>
<view class="item flex-lr" wx:if="{{checkout.is_wine==1}}">
<view>有剩余酒水饮料要退</view>
</view>
<view class="item flex-lr" wx:if="{{checkout.is_pack==1}}">
<view>菜品打包</view>
<view class="content checkout">
<view class="waiting-money flex-vc">
<icon type="waiting" size="47" color="#C0A369"/>
<view class="waiting-txt">商家处理中</view>
</view>
</view>
<view class="content invoice">
<view class="title">提前开发票</view>
<view class="item flex-lr" bindtap="setInvoice">
<view>发票</view>
<invoice bindevent="setInvoice">
... ... @@ -50,18 +46,22 @@
</view>
</view>
<subscribe ids="{{[0]}}">
<view class="checkout-get subscribe">商家反馈金额后提醒我</view>
<view class="checkout-get subscribe">点我，商家反馈金额后提醒我</view>
</subscribe>
<view class="checkout-get tx-seller" bindtap="">催一下商家</view>
<view class="checkout-get tx-seller" bindtap="txSeller">催一下商家</view>
</block>
<block wx:elif="{{checkout.status==2}}">
<view class="content money">
<view class="waiting-money flex-vc">
<icon type="waiting" size="47" color="#C0A369"/>
<view class="waiting-txt">待支付</view>
</view>
<view class="list flex-lr">
<view class="list-name">消费总额</view>
<view class="list-val">¥ {{checkout.price}}</view>
</view>
<view class="list flex-lr">
<view class="list-name">红包抵扣</view>
<view class="list-name">红　　包</view>
<view class="list-val">-¥ {{user.price}}</view>
</view>
<view class="list flex-lr">
... ... @@ -76,18 +76,26 @@
<view class="list-name">包间名称</view>
<view class="list-val">{{checkout.tablename}}</view>
</view>
<view class="list flex-lr" wx:if="{{checkout.remark}}">
<view class="list-name">备注信息</view>
<view class="list-val">{{checkout.remark}}</view>
</view>
<view class="checkout-get" bindtap="">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0}}元</view>
</view>
<view class="money-tips">注：消费清单，离店时请到前台索要；</view>
<view class="checkout-get" bindtap="">立即支付{{checkout.price-user.price>0?checkout.price-user.price:0}}元</view>
</block>
<block wx:else="">
<view class="content money">
<view class="waiting-money flex-vc">
<icon type="success" size="47" color="#C8B16D"/>
<view class="waiting-txt">已买单</view>
</view>
<view class="list flex-lr">
<view class="list-name">消费总额</view>
<view class="list-val">¥ {{checkout.price}}</view>
</view>
<view class="list flex-lr">
<view class="list-name">红包抵扣</view>
<view class="list-name">红　　包</view>
<view class="list-val">-¥ {{checkout.discount[0].price}}</view>
</view>
<view class="list flex-lr">
... ... @@ -102,6 +110,10 @@
<view class="list-name">包间名称</view>
<view class="list-val">{{checkout.tablename}}</view>
</view>
<view class="list flex-lr" wx:if="{{checkout.remark}}">
<view class="list-name">备注信息</view>
<view class="list-val">{{checkout.remark}}</view>
</view>
<view class="list flex-lr pay-time">
<view class="list-name">买单时间</view>
<view class="list-val">{{util.unixtoTime(checkout.pay_time,'YYYY-MM-DD HH:II')}}</view>
... ... @@ -112,8 +124,8 @@
<view>发票</view>
<invoice bindevent="setInvoice">
<view class="invoice-right disabled">
<view class="title active">{{checkout.invoice.title}}</view>
<view class="title">{{checkout.invoice.taxnumber}}</view>
<view class="invoice-title">{{checkout.invoice.title}}</view>
<view class="invoice-taxnumber">{{checkout.invoice.taxnumber}}</view>
</view>
</invoice>
</view>
... ...
... ... @@ -3,7 +3,7 @@ page{
background-color: #F5F5F5;
}
.pages{
padding: 204rpx 0 52rpx;
padding: 204rpx 0 60rpx;
background-size: 100% auto;
background-repeat: no-repeat;
background-image: url("http://qn.colorcun.com/checkout/images/3.png");
... ... @@ -14,7 +14,7 @@ page{
position: relative;
background-color: #fff;
background:rgba(255,255,255,1);
border-radius:10px;
border-radius:10rpx;
padding: 0 40rpx;
box-sizing: border-box;
}
... ... @@ -102,12 +102,12 @@ page{
.money-tips{
height:40rpx;
font-size:28rpx;
font-family:PingFang-SC-Medium,PingFang-SC;
font-weight:500;
color:rgba(53,53,53,1);
line-height:40rpx;
margin-left: 40rpx;
margin-top: 20rpx;
padding-bottom: 140rpx;
}
.should_price{
color:rgba(224,32,32,1);
... ... @@ -151,4 +151,26 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked:before{
position: absolute;
top:-28rpx;
right:40rpx;
}
.waiting-txt{
margin-top: 32rpx;
height:50rpx;
font-size:36rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:50rpx;
}
.waiting-money{
height: 260rpx;
}
.money .checkout-get{
bottom: 66rpx;
}
.invoice-title,.invoice-taxnumber{
height:44rpx;
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:44rpx;
text-align: right;
}
\ No newline at end of file
... ...