|
|
@@ -487,7 +487,7 @@ export default {
|
|
|
this.infoMap.type = this.DigitstoChinese_type(
|
|
|
res.data.invoice.invoice_variety
|
|
|
)
|
|
|
- this.infoMap.content = res.data.invoice.invoice_content
|
|
|
+ this.infoMap.content = res.data.invoice.invoice_content || '--'
|
|
|
this.infoMap.invoiceHeader = this.DigitstoChinese_invoiceHeader(
|
|
|
res.data.invoice.invoice_type
|
|
|
)
|
|
|
@@ -552,7 +552,7 @@ export default {
|
|
|
this.infoMap.type = this.DigitstoChinese_type(
|
|
|
this.chooseInvoice.invoice_variety
|
|
|
)
|
|
|
- this.infoMap.content = this.chooseInvoice.invoice_content
|
|
|
+ this.infoMap.content = this.chooseInvoice.invoice_content || '--'
|
|
|
this.infoMap.invoiceHeader = this.DigitstoChinese_invoiceHeader(
|
|
|
this.chooseInvoice.invoice_type
|
|
|
)
|
|
|
@@ -585,7 +585,7 @@ export default {
|
|
|
this.infoMap.price >= 10000 &&
|
|
|
this.enterSource === 'qrcode')
|
|
|
) {//扫码入口且金额大于10000
|
|
|
- location.href = this.url
|
|
|
+ window.open(this.url)
|
|
|
} else { // 我的订单入口
|
|
|
if (androidOrIOS() === 'ios') {
|
|
|
location.href = this.url
|
|
|
@@ -701,7 +701,9 @@ export default {
|
|
|
DigitstoChinese_type(val) {
|
|
|
if (val === '电子普通发票') {
|
|
|
return '1'
|
|
|
- } else if (val === '电子专用发票') {
|
|
|
+ } else if(val === '普通发票（电子发票）'){
|
|
|
+ return '1'
|
|
|
+ }else if (val === '电子专用发票') {
|
|
|
return '2'
|
|
|
} else if (val === '纸质普通发票') {
|
|
|
return '3'
|
wenmenghao