|
@@ -283,6 +283,10 @@ Page({
|
|
["voucherList["+index+"].buyNumber"]:value
|
|
["voucherList["+index+"].buyNumber"]:value
|
|
}
|
|
}
|
|
)
|
|
)
|
|
|
|
+ var id = this.data.voucherList[index].id
|
|
|
|
+ if(this.data.buyVoucher.indexOf(id+'')==-1){
|
|
|
|
+ return
|
|
|
|
+ }
|
|
this.getOrderDetail()
|
|
this.getOrderDetail()
|
|
},
|
|
},
|
|
//获取订单详情
|
|
//获取订单详情
|
|
@@ -316,7 +320,8 @@ Page({
|
|
payMoney:res.data.data.orderMessage.finalPrice,
|
|
payMoney:res.data.data.orderMessage.finalPrice,
|
|
["other.discount"]:res.data.data.orderMessage.discount,
|
|
["other.discount"]:res.data.data.orderMessage.discount,
|
|
["other.price"]:res.data.data.orderMessage.price,
|
|
["other.price"]:res.data.data.orderMessage.price,
|
|
- // ["other.discountPrice"]:Decimal.sub([res.data.data.orderMessage.price,res.data.data.orderMessage.finalPrice]),
|
|
|
|
|
|
+ ["other.finalPrice"]:res.data.data.orderMessage.finalPrice,
|
|
|
|
+ ["other.discountPrice"]:Decimal.sub([res.data.data.orderMessage.price,res.data.data.orderMessage.finalPrice]),
|
|
}
|
|
}
|
|
)
|
|
)
|
|
}
|
|
}
|
|
@@ -351,8 +356,10 @@ Page({
|
|
type:'0',
|
|
type:'0',
|
|
goods:goods,
|
|
goods:goods,
|
|
servicePrice:0.00,
|
|
servicePrice:0.00,
|
|
- price:this.data.payMoney,
|
|
|
|
|
|
+ price:this.data.other.price,
|
|
|
|
+ finalPrice:this.data.other.finalPrice,
|
|
discount:this.data.other.discount,
|
|
discount:this.data.other.discount,
|
|
|
|
+ discountPrice:this.data.other.discountPrice,
|
|
activityId:this.data.other.activityId
|
|
activityId:this.data.other.activityId
|
|
}
|
|
}
|
|
pay.openPay(data)
|
|
pay.openPay(data)
|