|
@@ -2,6 +2,7 @@ |
|
@@ -2,6 +2,7 @@ |
|
2
|
import util from '../../../utils/util';
|
2
|
import util from '../../../utils/util';
|
|
3
|
import App from '../../../utils/api';
|
3
|
import App from '../../../utils/api';
|
|
4
|
import TP from '../../../utils/tpls';
|
4
|
import TP from '../../../utils/tpls';
|
|
|
|
5
|
+import RS from '../../../utils/reserveStatus'
|
|
5
|
const {regeneratorRuntime} = global
|
6
|
const {regeneratorRuntime} = global
|
|
6
|
Page({
|
7
|
Page({
|
|
7
|
|
8
|
|
|
@@ -44,11 +45,24 @@ Page({ |
|
@@ -44,11 +45,24 @@ Page({ |
|
44
|
res.data.tables.forEach(t=>{
|
45
|
res.data.tables.forEach(t=>{
|
|
45
|
tables.push(t.name);
|
46
|
tables.push(t.name);
|
|
46
|
})
|
47
|
})
|
|
|
|
48
|
+ let reserev=RS.reserve(res.data)
|
|
|
|
49
|
+ console.log('reserev',reserev)
|
|
|
|
50
|
+ let dateSmart
|
|
|
|
51
|
+ if(res.data.type==1){
|
|
|
|
52
|
+ dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[0])
|
|
|
|
53
|
+ if(res.data.is_set_ddate==1){
|
|
|
|
54
|
+ dateSmart+=' '+util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStrSmart[1])
|
|
|
|
55
|
+ }else{
|
|
|
|
56
|
+ dateSmart+=' '+reserev.soltName
|
|
|
|
57
|
+ }
|
|
|
|
58
|
+ }else{
|
|
|
|
59
|
+ dateSmart=util.unixtoTime(reserev.ddate,this.data.tpls[this.data.current].timeStr)
|
|
|
|
60
|
+ }
|
|
47
|
this.setData({
|
61
|
this.setData({
|
|
48
|
seller:{
|
62
|
seller:{
|
|
49
|
name:res.data.seller.sellername,
|
63
|
name:res.data.seller.sellername,
|
|
50
|
room:tables.join('、'),
|
64
|
room:tables.join('、'),
|
|
51
|
- date:util.unixtoTime(res.data.ddate,this.data.tpls[this.data.current].timeStr),
|
65
|
+ date:dateSmart,
|
|
52
|
addr:res.data.seller.real_address||res.data.seller.map_address,
|
66
|
addr:res.data.seller.real_address||res.data.seller.map_address,
|
|
53
|
image:res.data.image_url,
|
67
|
image:res.data.image_url,
|
|
54
|
hasOwner:true,
|
68
|
hasOwner:true,
|
