xt / xcx-book · Commits

Go to a project

Commit 7427dfa72d1252d727192a147958053dcbf2711d

Authored by vking
1 parent 56e4ec32
build: skipped

到店时间显示

Inline Side-by-side
Showing 9 changed files with 90 additions and 25 deletions
<wxs src="../../../../utils/util.wxs" module="util" />
<view class="book-list-tds flex-lr font30r black-font reserve-status-{{vitem.status}}">
<formids bindtap="detail" class="book-list-td flex-vc">
<view class="flex-vc">
... ... @@ -12,7 +13,14 @@
</view>
</formids>
<formids bindtap="detail" class="book-list-td flex-vc">
<view class="flex-vc">{{vitem.order_time}}</view>
<view class="flex-vc">
<block wx:if="{{vitem.type==1}}">
{{vitem.is_set_ddate==1?vitem.order_time:util.reserveTimeSpace(vitem.ddate_solt)}}
</block>
<block wx:else="">
{{vitem.order_time}}
</block>
</view>
</formids>
<formids bindtap="{{(vitem.status==1 || vitem.status==5)?'invitation':'detail'}}" class="book-list-td flex-vc">
<view class="flex-rr green-font">
... ...
<wxs src="../../../utils/util.wxs" module="util" />
<nav hasHome>订座详情</nav>
<a2l bindshow="a2lshow" bindhide="a2lshow" key="BOOK-DETAIL" type="black" hitStr="通知客户"></a2l>
<!--订单信息-->
<view class="order-info">
<view class="flex-lr order-detail">
<view class="gray-deep-font font30r">到店时间</view>
<view class="black-font font34r">{{bookInfo.rdateStr}}</view>
<view class="gray-deep-font font30r">用餐时段</view>
<view class="black-font font34r">
{{util.unixtoTime(bookInfo.ddate,'YYYY年MM月DD日 ')}}
{{util.reserveTimeSpace(bookInfo.ddate_solt)}}
</view>
</view>
<view class="flex-lr order-detail">
<view class="gray-deep-font font30r">用餐时间</view>
<view class="black-font font34r" wx:if="{{bookInfo.type==1}}">
{{bookInfo.is_set_ddate==1?util.unixtoTime(bookInfo.ddate,'HH:II'):''}}
</view>
<view class="black-font font34r" wx:else="">
{{util.unixtoTime(bookInfo.ddate,'HH:II')}}
</view>
</view>
<view class="flex-lr order-detail" wx:if="{{bookInfo.type==1}}">
<view class="gray-deep-font font30r">包间需求</view>
... ...
... ... @@ -124,15 +124,12 @@ view{
}
.reserve-status-tip{
position: absolute;
top:200rpx;
right:140rpx;
top:150rpx;
right:240rpx;
width: 82rpx;
height: 52rpx;
z-index: 99;
}
.reserve-status-tip.online{
top:150rpx;
}
.reserve-status-tip .text{
font-weight: bold;
font-size: 32rpx;
... ...
... ... @@ -17,7 +17,13 @@
</view>
<view class="flex-ll">
<view class="label">就餐时间：</view>
<view class="content">{{util.unixtoTime(item.ddate,'YYYY-MM-DD HH:II')}}</view>
<view class="content" wx:if="{{item.is_set_ddate==1}}">
{{util.unixtoTime(item.ddate,'YYYY-MM-DD '+util.reserveTimeSpace(item.ddate_solt)+' HH:II')}}
</view>
<view class="content" wx:else="">
{{util.unixtoTime(item.ddate,'YYYY-MM-DD')}}
{{util.reserveTimeSpace(item.ddate_solt)}}
</view>
</view>
<view class="flex-lr">
<view class="flex-ll">
... ...
... ... @@ -3,6 +3,7 @@ var mta = require('mta-wechat-analysis')
import util from '../../utils/util';
import App from '../../utils/api';
import TP from '../../utils/tpls';
import RS from '../../utils/reserveStatus'
const {regeneratorRuntime} = global
Page({
... ... @@ -106,20 +107,33 @@ Page({
res.data.tables.forEach(t=>{
tables.push(t.name);
})
let reserev=RS.reserve(res.data)
console.log('reserev',reserev)
let dateSmart
if(res.data.type==1){
dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[0])
if(res.data.is_set_ddate==1){
dateSmart+=' '+util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[1])
}else{
dateSmart+=' '+reserev.soltName
}
}else{
dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStr)
}
this.setData({
detail: this.formatDatail(res.data),
detail: this.formatDatail(res.data,dateSmart),
seller:{
name:res.data.seller.sellername,
room:tables.join('、'),
date:util.unixtoTime(res.data.ddate,this.data.tpls[this.data.current].timeStr),
date:dateSmart,
addr:res.data.seller.real_address||res.data.seller.map_address,
image:res.data.image_url,
}
})
})
},
formatDatail(detail){
detail.rdateStr = util.unixtoTime(detail.ddate, 'YYYY/MM/DD 星期WW HH:II');
formatDatail(detail,dateSmart){
detail.rdateStr = dateSmart;
detail.tableFirst = detail.tables[0].name;
if (detail.tables.length > 1) {
detail.tableSubInfo = '等' + (detail.tables.length) + '个'
... ...
... ... @@ -109,27 +109,40 @@ Page({
res.data.tables.forEach(t=>{
tables.push(t.name);
})
let reserev=RS.reserve(res.data)
console.log('reserev',reserev)
let dateSmart
if(res.data.type==1){
dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[0])
if(res.data.is_set_ddate==1){
dateSmart+=' '+util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[1])
}else{
dateSmart+=' '+reserev.soltName
}
}else{
dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStr)
}
this.setData({
detail: this.formatDatail(res.data),
detail: this.formatDatail(reserev,dateSmart),
seller:{
name:res.data.seller.sellername,
name:reserev.seller.sellername,
room:tables.join('、'),
date:util.unixtoTime(res.data.ddate,this.data.tpls[this.data.current].timeStr),
addr:res.data.seller.real_address||res.data.seller.map_address,
image:res.data.image_url,
date:dateSmart,
addr:reserev.seller.real_address||reserev.seller.map_address,
image:reserev.image_url,
hasOwner:true,
type:res.data.type,
is_set_ddate:res.data.is_set_ddate
type:reserev.type,
is_set_ddate:reserev.is_set_ddate,
}
})
App.Reserve.SellerInfo({seller_id:res.data.seller.id}).then(async sc=>{
this.msgTpl=await ST.getTplMsg(res.data,sc.data.setting.template_code,sc.data)
App.Reserve.SellerInfo({seller_id:reserev.seller.id}).then(async sc=>{
this.msgTpl=await ST.getTplMsg(reserev,sc.data.setting.template_code,sc.data)
console.log('this.msgTpl',this.msgTpl);
})
})
},
formatDatail(detail){
detail.rdateStr = util.unixtoTime(detail.ddate, 'YYYY/MM/DD 星期WW HH:II');
formatDatail(detail,dateSmart){
detail.rdateStr = dateSmart;
detail.tableFirst = detail.tables[0].name;
if (detail.tables.length > 1) {
detail.tableSubInfo = '等' + (detail.tables.length) + '个'
... ... @@ -153,7 +166,7 @@ Page({
// detail.cusman_phone='15877556369';
// detail.cusman_account='wx:vking';
// }
detail=RS.reserve(detail);
//detail=RS.reserve(detail);
return detail;
},
showManager(){
... ...
// pages/customer/list.js
import util from '../../utils/util';
import App from '../../utils/api';
import RS from '../../utils/reserveStatus'
const {regeneratorRuntime} = global
import TP from '../../utils/tpls';
... ... @@ -90,6 +91,7 @@ Page({
row.hasOwner = getApp().openid == row.openid
let d = util.unixtoTime(row.rdate, 'MM月DD日 DAY 星期WW');
typeof dlist[d] == 'undefined' ? dlist[d] = [] : '';
row=RS.reserve(row)
dlist[d].push(row);
this.ids.push(row.id);
})
... ...
... ... @@ -146,6 +146,16 @@ module.exports ={
break;
}
let tpl = this.tpls[tplcode];
if(bookInfo.type==1 && smsData.date){
if(bookInfo.is_set_ddate!=1){
if(tplcode=='SMS_154587043'){
smsData.date=smsData.date.replace(/[\d]{2}:[\d]2/,txb[tx.timeIndex])
}else{
smsData.date=smsData.date.replace(/[\d]{2}:[\d]2/,'')
}
}
}
this.smsData = smsData;
tpl = tpl.replace(/\${([^}]+)}/ig, function ($0, $1) {
//console.log($0, $1);
... ...
... ... @@ -6,6 +6,7 @@ let tpls=[
name: '商务',
hasImage:false,
timeStr:'YYYY/MM/DD 星期WW HH:II',
timeStrSmart:['YYYY/MM/DD 星期WW','HH:II'],
shareFirstImage:'http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148572.jpg',
shareImage:'http://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148573.jpg',
shareFirstTitle:'用餐已为您安排，点击查看详情',
... ... @@ -17,6 +18,7 @@ let tpls=[
name: '温馨',
hasImage:true,
timeStr:'YYYY年MM月DD日HH时II分',
timeStrSmart:['YYYY年MM月DD日','HH时II分'],
shareFirstImage:'http://qn.colorcun.com/manager-invitation/wx3/wx1.jpg',
shareImage:'http://qn.colorcun.com/manager-invitation/wx3/wx2.jpg',
shareFirstTitle:'用餐已为您安排，点击查看详情',
... ...