|
...
|
...
|
@@ -2,6 +2,7 @@ |
|
|
|
import util from '../../../utils/util';
|
|
|
|
import App from '../../../utils/api';
|
|
|
|
import TP from '../../../utils/tpls';
|
|
|
|
import RS from '../../../utils/reserveStatus'
|
|
|
|
const {regeneratorRuntime} = global
|
|
|
|
Page({
|
|
|
|
|
|
...
|
...
|
@@ -44,11 +45,24 @@ 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({
|
|
|
|
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,
|
|
|
|
hasOwner:true,
|
...
|
...
|
|