xt / xcx-book · Commits

Go to a project

Commit 0652445fee56d003c53a0e9eb875609ce70d02c6

Authored by vking
1 parent 32b2f5d5
build: skipped

seller-do

Inline Side-by-side
Showing 10 changed files with 413 additions and 9 deletions
... ... @@ -90,7 +90,8 @@
"pages/book/smsbatch/result",
"pages/book/roomtype/roomtype",
"pages/book/b_reserve",
"pages/checkout/index"
"pages/checkout/index",
"pages/checkout/invoice"
]
}
],
... ...
... ... @@ -225,7 +225,8 @@ image{
}
.Medium{
font-weight: 400;
font-family:PingFangSC-Medium,PingFang SC;
font-weight: 500;
}
.button-none {
display: inline-block;
... ...
... ... @@ -210,7 +210,8 @@ image{
}
.Medium{
font-weight: 400;
font-family:PingFangSC-Medium,PingFang SC;
font-weight: 500;
}
.button-none {
display: inline-block;
... ...
... ... @@ -5,7 +5,7 @@
<block wx:if="{{detail.order_info.status>1}}">
<view class="block payinfo">
<view class="title flex-lr">
<view>消费信息</view>
<view class="Medium">消费信息</view>
</view>
<view class="center">
<view class="item flex-lr">
... ... @@ -21,7 +21,7 @@
</view>
<view class="block userinfo">
<view class="title flex-lr">
<view>顾客信息</view>
<view class="Medium">顾客信息</view>
<view class="orderRemark">{{detail.orderRemark}}</view>
</view>
<view class="center">
... ... @@ -55,9 +55,9 @@
</view>
</view>
</view>
<view class="block userinfo" wx:if="{{detail.order_info.status==3}}">
<view class="block payinfo" wx:if="{{detail.order_info.status==3}}">
<view class="title flex-lr">
<view>买单信息</view>
<view class="Medium">买单信息</view>
</view>
<view class="center">
<view class="item flex-lr">
... ... @@ -69,8 +69,8 @@
<view class="item-value">¥ {{detail.order_info.subsidy_price}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">实收金额</view>
<view class="item-value">¥ {{detail.order_info.price}}</view>
<view class="item-label Medium">实收金额</view>
<view class="item-value Medium">¥ {{detail.order_info.price}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">支付方式</view>
... ...
... ... @@ -92,6 +92,9 @@ page{
font-weight:500;
color:rgba(53,53,53,1);
}
.payinfo .item-value{
font-weight:400;
}
.pay-tips-icon{
position: absolute;
top:calc(50% - 84rpx);
... ...
// pack-book/pages/checkout/index.js
import util from '../../../utils/util';
import App from '../../../utils/api';
import RS from '../../../utils/reserveStatus';
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.options=options
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.getDetail();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
detail:null,
getDetail(hasCache=false){
App.Reserve.Detail({
openid: getApp().openid,
rid: this.options.rid
},hasCache).then(async res => {
this.detail=this.formatDatail(res.data)
this.detail.ddate_solt=Number(this.detail.ddate_solt);
let title=''
if(this.detail.order_info.status>1){
title='买单申请详情'
}
this.setData({
detail: this.detail,
title:title,
})
})
},
formatDatail(detail) {
detail=RS.reserve(detail);
let formatDate='YYYY-MM-DD '+detail.soltName
if(detail.type==1 && detail.is_set_ddate==1){
formatDate +=' HH:II'
}
detail.rdateStr = util.unixtoTime(detail.ddate, formatDate);
detail.orderRemark='';
if(detail.order_info){
if(detail.order_info.is_wine==1 || detail.order_info.is_pack==1){
detail.orderRemark='*顾客'
let orderRemark=[]
if(detail.order_info.is_wine==1){
orderRemark.push('有酒水要退')
}
if(detail.order_info.is_pack==1){
orderRemark.push('菜品需要打包')
}
detail.orderRemark+=orderRemark.join('，')
}
}
return detail;
},
displayTables(){
if(this.data.tabs){
this.setData({
tabs:'',
})
return;
}
let tables=this.detail.tables
let tabs={}
tables.some(t=>{
if(!tabs[t.tid]){
tabs[t.tid]=t.name
}else{
tabs[t.tid]+="、"+t.name
}
})
this.setData({
tabs:tabs,
})
},
})
\ No newline at end of file
... ...
{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle":"white",
"usingComponents": {
"nav":"/components/nav/nav",
"qnupload": "plugin://vktool/qnupload",
"confirm-price":"../../components/checkout/confirm-price"
}
}
\ No newline at end of file
... ...
<!--pack-book/pages/checkout/index.wxml-->
<wxs src="../../../utils/util.wxs" module="util" />
<nav hasHome backgroundColor="#199095" color="#fefefe">invoice</nav>
<view class="pages flex-vc">
<view class="block userinfo">
<view class="center">
<view class="item {{tabs?'auto-height':''}}">
<view class="flex-lr" bindtap="{{detail.tables.length>1?'displayTables':''}}">
<view class="item-label">桌位信息</view>
<view class="item-value flex-rr">
<view wx:if="{{!tabs}}">【{{util.reserveTidName(detail.tables[0].tid)}}】{{detail.tables[0].name}}</view>
<view class="bg-img bg-{{tabs?'x2':'x1'}}" wx:if="{{detail.tables.length>1}}"></view>
</view>
</view>
<view class="tabs-view" wx:if="{{tabs}}">
<view class="tabs-item" wx:for="{{tabs}}" wx:key="tabs">【{{util.reserveTidName(index)}}】{{item}}</view>
</view>
</view>
</view>
</view>
<view class="block invoice">
<view class="title flex-lr">
<view class="Medium">发票信息</view>
</view>
<view class="center">
<view class="item flex-lr" style="align-items:flex-start">
<view class="item-label">名称</view>
<view class="item-value Medium">{{detail.invoice.title}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">税号</view>
<view class="item-value Medium">{{detail.invoice.taxnumber}}</view>
</view>
<view class="item flex-lr" style="align-items:flex-start">
<view class="item-label">单位地址</view>
<view class="item-value">{{detail.invoice.companyaddress}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">电话号码</view>
<view class="item-value">{{detail.invoice.telephone}}</view>
</view>
<view class="item flex-lr" style="align-items:flex-start">
<view class="item-label">开户银行</view>
<view class="item-value">{{detail.invoice.bankname}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">银行账户</view>
<view class="item-value">{{detail.invoice.bankaccount}}</view>
</view>
</view>
</view>
<view class="block userinfo">
<view class="title flex-lr">
<view class="Medium">顾客信息</view>
</view>
<view class="center">
<view class="item flex-lr">
<view class="item-label">买单顾客</view>
<view class="item-value">{{detail.rname}} {{util.reserveSexName(detail.sex)}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">顾客电话</view>
<view class="item-value">{{detail.phone}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">到店时间</view>
<view class="item-value">{{detail.rdateStr}}</view>
</view>
<view class="item flex-lr">
<view class="item-label">申请时间</view>
<view class="item-value">{{util.unixtoTime(detail.order_info.create_time,'YYYY-MM-DD HH:II')}}</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
... ...
/* pack-book/pages/checkout/index.wxss */
page{
background:rgba(245,245,245,1);
}
.bg-img{
background-image: url("http://nosqn.colorcun.com/checkout/images/css_sprites.png");
zoom: 33.5%;
}
.bg-add {
width: 48px; height: 48px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -141px -111px;
}
.bg-x2 {
width: 42px; height: 24px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -265px -111px;
}
.bg-x1 {
width: 42px; height: 24px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -141px -179px;
margin-left: 20rpx;
}
.bg-pay3 {
width: 165px; height: 81px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -10px -10px;
}
.bg-pay2 {
width: 165px; height: 81px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -195px -10px;
}
.bg-pay {
width: 111px; height: 99px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -10px -111px;
}
.bg-c2 {
width: 30px; height: 30px;
background: url('http://nosqn.colorcun.com/checkout/images/css_sprites.png') -10px -230px;
}
.pay-image-view{
margin-top: 40rpx;
}
.pay-txt{
margin-top: 12rpx;
height:44rpx;
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
line-height:44rpx;
}
.block{
background:rgba(250,250,250,1);
border-radius:10rpx;
width: calc(100% - 40rpx);
margin-top: 20rpx;
}
.block .title{
height: 116rpx;
line-height: 116rpx;
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
padding: 0 20rpx;
box-sizing: border-box;
}
.orderRemark{
font-size:28rpx;
font-weight:500;
color:rgba(253,86,86,1);
}
.orderRemark-view{
width: calc(100% - 40rpx);
height:40rpx;
line-height:40rpx;
margin: 10rpx auto;
font-weight:500;
}
.block .center{
padding: 0 40rpx 36rpx;
background:rgba(255,255,255,1);
box-sizing: border-box;
position: relative;
}
.center .item{
padding-top: 24rpx;
font-size:28rpx;
font-weight:400;
color:rgba(112,112,112,1);
}
.item-label{
min-width: 150rpx;
}
.item-value{
font-weight:500;
color:rgba(53,53,53,1);
text-align: right;
}
.invoice .item-value{
font-size:28rpx;
font-family:PingFangSC-Regular,PingFang SC;
font-weight:400;
color:rgba(112,112,112,1);
line-height:40rpx;
}
.invoice .item-value.Medium{
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
color:rgba(53,53,53,1);
}
.pay-tips-icon{
position: absolute;
top:calc(50% - 84rpx);
left:calc(50% - 111rpx);
}
.order_info-price{
font-size:32rpx;
font-weight:500;
color:rgba(53,53,53,1);
}
.order_info-bill_list{
font-size:24rpx;
font-weight:500;
color:rgba(36,164,168,1);
height:34rpx;
line-height: 34rpx;
border-bottom: 2rpx solid #24A4A8;
}
.orderinput{
margin-top: 40rpx;
}
.orderinput .center{
padding-bottom: 0;
}
.orderinput .item{
font-size:32rpx;
font-weight:400;
height: 116rpx;
line-height: 116rpx;
box-sizing: border-box;
border-bottom: 2rpx solid rgba(238,238,238,1);
padding-top: 0;
}
.orderinput .auto-height,.userinfo .auto-height{
height: auto;
}
.orderinput .item:last-child{
border-bottom-width: 0;
}
.item-value-input{
text-align: right;
font-size:44rpx;
font-weight:500;
color:rgba(53,53,53,1);
}
.tabs-view{
font-size:32rpx;
font-weight:400;
color:rgba(53,53,53,1);
padding: 0 20rpx 36rpx;
}
.tabs-item{
line-height: 44rpx;
}
.userinfo .tabs-view{
font-size:28rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-weight:500;
padding: 24rpx 20rpx 0;
}
.userinfo .tabs-item{
line-height:40rpx;
}
.hasPrice{
position: absolute;
top:0;
right:30rpx;
height: 44rpx;
line-height: 44rpx;
}
.orderimage .center{
padding: 40rpx 0 36rpx 56rpx;
}
\ No newline at end of file
... ...
... ... @@ -653,6 +653,13 @@
"pathName": "pack-book/pages/checkout/index",
"query": "rid=62202",
"scene": null
},
{
"id": -1,
"name": "pack-book/pages/checkout/invoice",
"pathName": "pack-book/pages/checkout/invoice",
"query": "rid=62202",
"scene": null
}
]
}
... ...