diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue index 2005c77..e2fd70a 100644 --- a/pagesOrder/order/OrderDetails/index.vue +++ b/pagesOrder/order/OrderDetails/index.vue @@ -202,7 +202,7 @@ - + @@ -602,7 +602,7 @@ {{ drawTicketPopup.ticketCode }} - 开奖时间:{{ drawTicketPopup.drawTime }} + 开奖时间:{{ (drawTicketPopup.drawTime) }} @@ -780,13 +780,24 @@ export default { this.drawTicketPopup = { show: true, orderId: this.id || this.$yroute.query.id || '', - ticketCode: result.ticketCode || '', + ticketCode: result.ticketCode || result.code || '', drawTime: result.drawTime || '' } }, closeDrawTicketPopup() { this.drawTicketPopup.show = false }, + formatDrawTime(time) { + if (!time) return '--' + const date = new Date(String(time).replace(/-/g, '/')) + if (Number.isNaN(date.getTime())) return time + const y = date.getFullYear() + const m = String(date.getMonth() + 1).padStart(2, '0') + const d = String(date.getDate()).padStart(2, '0') + const hh = String(date.getHours()).padStart(2, '0') + const mm = String(date.getMinutes()).padStart(2, '0') + return `${y}年${m}月${d}日 ${hh}:${mm}` + }, goHomeFromPopup() { this.drawTicketPopup.show = false uni.switchTab({ @@ -845,8 +856,9 @@ export default { } }) }, - goGoodsCon(item, isGiftCardReceiveBlind) { + goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder) { if(isGiftCardReceiveBlind) return + if(isDrawOrder) return this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: {