|
@@ -199,7 +199,7 @@ Page({ |
|
@@ -199,7 +199,7 @@ Page({ |
|
199
|
deskStr += t.name + (i == (res.data.tables.length - 1) ? '' : '、');
|
199
|
deskStr += t.name + (i == (res.data.tables.length - 1) ? '' : '、');
|
|
200
|
})
|
200
|
})
|
|
201
|
let reserev = RS.reserve(res.data)
|
201
|
let reserev = RS.reserve(res.data)
|
|
202
|
- let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY/MM/DD 星期WW HH:II');
|
202
|
+ let dateSmart = util.unixtoTime(reserev.ddate, 'YYYY-MM-DD 星期WW');
|
|
203
|
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
|
203
|
let yearMonthDay = util.unixtoTime(reserev.ddate, 'YYYY年MM月DD日')
|
|
204
|
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
|
204
|
let yearMonth = util.unixtoTime(reserev.ddate, 'MM月DD日')
|
|
205
|
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
|
205
|
let dateStr = util.unixtoTime(reserev.ddate, 'HH点')
|
|
@@ -221,6 +221,7 @@ Page({ |
|
@@ -221,6 +221,7 @@ Page({ |
|
221
|
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
|
221
|
hasUpTime: reserev.type == 1 && reserev.hasRunning && reserev.status != 2,
|
|
222
|
tel: reserev.seller.seller_tel.split(',')[0],
|
222
|
tel: reserev.seller.seller_tel.split(',')[0],
|
|
223
|
soltName: reserev.soltName,
|
223
|
soltName: reserev.soltName,
|
|
|
|
224
|
+ dateTime:util.unixtoTime(reserev.ddate, 'HH:II'),
|
|
224
|
lat: reserev.seller.lat,
|
225
|
lat: reserev.seller.lat,
|
|
225
|
long: reserev.seller.long,
|
226
|
long: reserev.seller.long,
|
|
226
|
seller_tel: reserev.seller.seller_tel,
|
227
|
seller_tel: reserev.seller.seller_tel,
|
|
@@ -528,6 +529,7 @@ Page({ |
|
@@ -528,6 +529,7 @@ Page({ |
|
528
|
this.getRechargeDetail(marketing.recharge_data.id)
|
529
|
this.getRechargeDetail(marketing.recharge_data.id)
|
|
529
|
}
|
530
|
}
|
|
530
|
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
|
531
|
if (store && store.images && store.images.length > 0) store.images = util.determine(store.images);
|
|
|
|
532
|
+ if (reserve && reserve.park_info_images && reserve.park_info_images.length > 0) reserve.park_info_images = util.determine(reserve.park_info_images);
|
|
531
|
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
|
533
|
if (signboard && signboard.images && signboard.images.length > 0) signboard.images = util.determine(signboard.images);
|
|
532
|
if (themeColor == 'turmeric' || themeColor == 'golden') {
|
534
|
if (themeColor == 'turmeric' || themeColor == 'golden') {
|
|
533
|
whiteBj = true
|
535
|
whiteBj = true
|