|
|
@@ -466,7 +466,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!this.currentTicket) {
|
|
|
+ if (!this.currentTicket?.id) {
|
|
|
return this.$message.error('请选择门票')
|
|
|
}
|
|
|
|
|
|
@@ -493,9 +493,9 @@ export default {
|
|
|
this.syncTouristList()
|
|
|
const { playDateBegin, playDateEnd } = this.form
|
|
|
const { currentBatch } = this
|
|
|
- const { id, name, checkCount, isUseDateLimit, printTemplateId } = this.currentTicket
|
|
|
- const price = this.currentPrice
|
|
|
- const originalPrice = this.currentPrice
|
|
|
+ const { id, name, checkCount, isUseDateLimit, printTemplateId, price } = this.currentTicket
|
|
|
+ // const price = this.currentPrice
|
|
|
+ const originalPrice = price
|
|
|
|
|
|
if (this.isTeam) {
|
|
|
if (!this.form.teamId) {
|
|
|
@@ -547,6 +547,7 @@ export default {
|
|
|
printTemplateId
|
|
|
}
|
|
|
})
|
|
|
+ const ticketNum = tickets.length
|
|
|
|
|
|
// 合并游玩日期相同的票种数据
|
|
|
const existItem = this.orderItems.find(i => {
|
|
|
@@ -557,7 +558,7 @@ export default {
|
|
|
dateIsEque = true
|
|
|
}
|
|
|
// 日期对象不全等
|
|
|
- return i.id === id && dateIsEque && i.price === this.currentPrice
|
|
|
+ return i.id === id && dateIsEque && i.price === price
|
|
|
})
|
|
|
|
|
|
if (existItem) {
|
|
|
@@ -571,11 +572,11 @@ export default {
|
|
|
keyId: randomString(), // 唯一标识
|
|
|
id, // 票种Id
|
|
|
ticketName: name,
|
|
|
- count: tickets.length,
|
|
|
+ count: ticketNum,
|
|
|
price,
|
|
|
originalPrice,
|
|
|
discountPrice: 0,
|
|
|
- total: this.totalPrice,
|
|
|
+ total: ticketNum * price,
|
|
|
playDateBegin: pdb,
|
|
|
currentTicket: {
|
|
|
...this.currentTicket,
|
|
|
@@ -639,7 +640,7 @@ export default {
|
|
|
// this.ticketAutoAddMap[this.currentTicket.id] = true
|
|
|
// }
|
|
|
this.addToOrder()
|
|
|
- }, 500)
|
|
|
+ }, 600)
|
|
|
})
|
|
|
|
|
|
if (this.retailLockCheckStyle) {
|