diff --git a/.gitignore b/.gitignore index a503fa2..c6a900e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /unpackage/ +.DS_Store diff --git a/pages/ticket/orderdetail.vue b/pages/ticket/orderdetail.vue index eba6511..c88c36d 100644 --- a/pages/ticket/orderdetail.vue +++ b/pages/ticket/orderdetail.vue @@ -17,7 +17,7 @@ 商品信息 - {{obj.tickets.name}} + {{ticketName}} @@ -270,6 +270,11 @@ } }, computed: { + // xuchao: 门票名称兜底 —— 已退款/下架订单 tickets 可能为 null,回退订单快照 orderGoods.ticketsName + ticketName() { + if (this.obj && this.obj.tickets) return this.obj.tickets.name + return this.obj && this.obj.orderGoods ? this.obj.orderGoods.ticketsName : '' + }, orderStatus() { let str = '' if (this.obj) { @@ -365,8 +370,10 @@ }, aginPlay() { + // xuchao: tickets 可能为 null(已下架),回退订单快照 orderGoods.ticketsId + let ticketsId = this.obj.tickets ? this.obj.tickets.id : this.obj.orderGoods.ticketsId uni.reLaunch({ - url: 'scenicdetail?id=' + this.obj.tickets.id + url: 'scenicdetail?id=' + ticketsId }) }, coyp(e) {