Commit 96085c94787d1d4953bed134056782c1e93b0be7

Authored by vking
1 parent 9e69900c

提交预订卡片调整

<!--components/seller-card/seller-card.wxml-->
<wxs src="../../utils/util.wxs" module="util" />
<view class="card {{hasOnlineReserve?'online':''}}">
<formids url="{{hasOnlineReserve?'':('/pages/reserve/detail?id='+seller.id)}}" catchtap="">
<view class="seller flex-lr">
... ... @@ -20,12 +21,15 @@
<view class="context flex-lr">
<view class="left info Medium">
<view class="label">时间</view>
<view class="value">{{rdateStr}}</view>
<view class="value" wx:if="{{hasOnlineReserve || detail.hasUpdateDate}}">
{{util.unixtoTime(detail.ddate,'MM月DD日')}} {{util.reserveTimeSpace(detail.section||detail.ddate_solt)}}
</view>
<view class="value" wx:else="">{{rdateStr}}</view>
</view>
<view class="line"></view>
<view class="right info Medium" wx:if="{{hasOnlineReserve || (detail.type==1 && (detail.status==0 || detail.status==6))}}">
<view class="label">人数</view>
<view class="value">{{detail.pnum}}人包间</view>
<view class="right info Medium" wx:if="{{hasOnlineReserve}}">
<view class="label">包间</view>
<view class="value">{{util.getRoomName(detail.selectroom)}}</view>
</view>
<view class="right info Medium" wx:else="">
<view class="label">包间{{detail.tables.length>1?(" ("+detail.tables.length+"个)"):""}}</view>
... ...
... ... @@ -53,6 +53,7 @@
}
.info {
text-indent: 40rpx;
text-align: left;
}
.info .label{
font-size: 26rpx;
... ...
... ... @@ -24,6 +24,7 @@ Page({
options:null,
onLoad: function (options) {
console.log(options)
options.selectroom=JSON.parse(decodeURIComponent(options.selectroom))
this.options=options
this.GetSellerDetail();
App.Customer.GetCustomerInfo().then(res=>{
... ... @@ -91,10 +92,7 @@ Page({
let seller = res.data
this.setData({
seller: seller,
detail:{
ddate:options.ddate,
pnum:options.pnum,
}
detail:options
})
}
})
... ...
... ... @@ -464,7 +464,7 @@
"id": 55,
"name": "pages/reserve/submit",
"pathName": "pages/reserve/submit",
"query": "sid=1&ddate=1234567890&pnum=10",
"query": "date=2019-09-28&section=noon&time=15%3A00&selectroom=%5B%7B%22id%22%3A1%2C%22name%22%3A%226%E4%BA%BA%E9%97%B4%22%2C%22mostpnum%22%3A8%2C%22lastmoney%22%3A3000%2C%22isfull%22%3A0%2C%22selectnum%22%3A2%7D%2C%7B%22id%22%3A1%2C%22name%22%3A%226%E4%BA%BA%E9%97%B4%22%2C%22mostpnum%22%3A8%2C%22lastmoney%22%3A3000%2C%22isfull%22%3A0%2C%22selectnum%22%3A2%7D%5D&sid=1&ddate=1569654000",
"scene": null
},
{
... ...
... ... @@ -28,6 +28,8 @@ export default {
detail.hasCancel=detail.status==4;
detail.hasOvered=detail.status!=0 && detail.status!=6;
}
//是否可以修改到店时间
detail.hasUpdateDate=detail.type==1 && detail.is_set_ddate==0
detail.getStatusStr='';
if(detail.status>=0){
detail.getStatusStr=status[detail.status];
... ...
... ... @@ -52,4 +52,19 @@ function unixtoTime(ns,format="YYYY-MM-DD HH:II:SS") {
module.exports = {
unixtoTime: unixtoTime,
reserveTimeSpace:function(enspace){
var names=['早餐','午餐','晚餐','夜宵'];
if(typeof enspace=='string'){
enspace={morning: 0, noon: 1, night: 2}[enspace]
}
return names[enspace]||names[3]
},
getRoomName:function(rooms=[]){
if(rooms.length<1) return ""
var name=rooms[0].name
if(rooms.length>1){
name+=" 等"+rooms.length+'间'
}
return name
},
};
\ No newline at end of file
... ...