Skip to content

U
uni-pdtravel
Commit f2073cc0 authored by qipeng's avatar qipeng
Browse files
Options

Merge branch 'develop' into electronicTicket

parents 4d8ef1ba dfd168b1
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 23 deletions
components/buyKnow.vue
View file @ f2073cc0
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<!-- 未配置文字内容 --> <!-- 未配置文字内容 -->
<template v-else> <template v-else>
<!-- 使用日期前 --> <!-- 使用日期前 -->
<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==1"> <text v-if="buyKnowData.productRefundRuleVo.refundTimeType==1">
<text v-if="item.refundDay==0"> <text v-if="item.refundDay==0">
使用日期当天{{item.refundTime}}之前可退 使用日期当天{{item.refundTime}}之前可退
</text> </text>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</text> </text>
</text> </text>
<!-- 过期 --> <!-- 过期 -->
<text v-if="buyKnowData.productRefundRuleVo.refundTimeRule==2"> <text v-if="buyKnowData.productRefundRuleVo.refundTimeType==2">
<text v-if="item.refundDay==0"> <text v-if="item.refundDay==0">
过期当天{{item.refundTime}}之前可退 过期当天{{item.refundTime}}之前可退
</text> </text>
......
pages/my/order/jointElectronicTicket/jointElectronicTicket.vue
View file @ f2073cc0
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
<!-- 未配置文字内容 --> <!-- 未配置文字内容 -->
<template v-else> <template v-else>
<!-- 使用日期前 --> <!-- 使用日期前 -->
<text v-if="item2.refundTimeRule==1"> <text v-if="item2.refundTimeType==1">
<text v-if="item2.refundDay==0"> <text v-if="item2.refundDay==0">
使用日期当天{{item2.refundTime}}之前可退 使用日期当天{{item2.refundTime}}之前可退
</text> </text>
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</text> </text>
</text> </text>
<!-- 过期 --> <!-- 过期 -->
<text v-if="item2.refundTimeRule==2"> <text v-if="item2.refundTimeType==2">
<text v-if="item2.refundDay==0"> <text v-if="item2.refundDay==0">
过期当天{{item2.refundTime}}之前可退 过期当天{{item2.refundTime}}之前可退
</text> </text>
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<!-- 未配置文字内容 --> <!-- 未配置文字内容 -->
<template v-else> <template v-else>
<!-- 使用日期前 --> <!-- 使用日期前 -->
<text v-if="item.refundTimeRule==1"> <text v-if="item.refundTimeType==1">
<text v-if="item.refundDay==0"> <text v-if="item.refundDay==0">
使用日期当天{{item.refundTime}}之前可退 使用日期当天{{item.refundTime}}之前可退
</text> </text>
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</text> </text>
</text> </text>
<!-- 过期 --> <!-- 过期 -->
<text v-if="item.refundTimeRule==2"> <text v-if="item.refundTimeType==2">
<text v-if="item.refundDay==0"> <text v-if="item.refundDay==0">
过期当天{{item.refundTime}}之前可退 过期当天{{item.refundTime}}之前可退
</text> </text>
...@@ -592,12 +592,15 @@ export default { ...@@ -592,12 +592,15 @@ export default {
if(item.subOrderType!=4&&item.subOrderType!=5){ if(item.subOrderType!=4&&item.subOrderType!=5){
if(item.exchangeMode==4||item.exchangeMode==5){ if(item.exchangeMode==4||item.exchangeMode==5){
//多个二维码 //多个二维码
//为了提高性能，游玩时间等于今天才获取排号信息 //为了提高性能，游玩时间等于今天获取动态二维码
if(item.playDate.substr(0,10)==this.$commonjs.today()){ if(item.playDate.substr(0,10)==this.$commonjs.today()){
if(item.orderStatus==2||item.orderStatus==4||item.orderStatus==5||item.orderStatus==7){ if(item.orderStatus==2||item.orderStatus==4||item.orderStatus==5||item.orderStatus==7){
//订单状态为2、4、5、7时才获取动态二维码 //订单状态为2、4、5、7时才获取动态二维码
this.getCodeList(item) this.getCodeList(item)
} }
}else{
//如果不是今天，为了保持页面完整性，临时放一个静态二维码
this.getCode(item)
} }
} }
if(item.exchangeMode==1){ if(item.exchangeMode==1){
...@@ -648,12 +651,12 @@ export default { ...@@ -648,12 +651,12 @@ export default {
let refundTime='' let refundTime=''
if(item2.refundDay){ if(item2.refundDay){
//1使用日期前 //1使用日期前
if(item2.refundTimeRule==1){ if(item2.refundTimeType==1){
let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay) let playDate = this.getNewDate(orderInfo.playDate,-item2.refundDay)
refundTime = playDate+' '+item2.refundTime refundTime = playDate+' '+item2.refundTime
} }
//2过期后 //2过期后
if(item2.refundTimeRule==2){ if(item2.refundTimeType==2){
let playDate = this.getNewDate(orderInfo.playDate,item2.refundDay) let playDate = this.getNewDate(orderInfo.playDate,item2.refundDay)
refundTime = playDate+' '+item2.refundTime refundTime = playDate+' '+item2.refundTime
} }
...@@ -667,8 +670,6 @@ export default { ...@@ -667,8 +670,6 @@ export default {
this.subRefundBtn=true this.subRefundBtn=true
//增加字段用于弹窗展示该产品是否可退 //增加字段用于弹窗展示该产品是否可退
item.ifRefund=true item.ifRefund=true
}else{
this.subRefundBtn=false
} }
} }
if(item2.refundDateType==1){ if(item2.refundDateType==1){
...@@ -683,8 +684,6 @@ export default { ...@@ -683,8 +684,6 @@ export default {
this.subRefundBtn=true this.subRefundBtn=true
//增加字段用于弹窗展示该产品是否可退 //增加字段用于弹窗展示该产品是否可退
item.ifRefund=true item.ifRefund=true
}else{
this.subRefundBtn=false
} }
} }
if(item2.refundDateType==2){ if(item2.refundDateType==2){
...@@ -692,8 +691,6 @@ export default { ...@@ -692,8 +691,6 @@ export default {
this.subRefundBtn=true this.subRefundBtn=true
//增加字段用于弹窗展示该产品是否可退 //增加字段用于弹窗展示该产品是否可退
item.ifRefund=true item.ifRefund=true
}else{
this.subRefundBtn=false
} }
} }
} }
...@@ -720,12 +717,12 @@ export default { ...@@ -720,12 +717,12 @@ export default {
let refundTime='' let refundTime=''
if(item.refundDay){ if(item.refundDay){
//1使用日期前 //1使用日期前
if(item.refundTimeRule==1){ if(item.refundTimeType==1){
let playDate = this.getNewDate(orderInfo.playDate,-item.refundDay) let playDate = this.getNewDate(orderInfo.playDate,-item.refundDay)
refundTime = playDate+' '+item.refundTime refundTime = playDate+' '+item.refundTime
} }
//2过期后 //2过期后
if(item.refundTimeRule==2){ if(item.refundTimeType==2){
let playDate = this.getNewDate(orderInfo.playDate,item.refundDay) let playDate = this.getNewDate(orderInfo.playDate,item.refundDay)
refundTime = playDate+' '+item.refundTime refundTime = playDate+' '+item.refundTime
} }
...@@ -737,8 +734,6 @@ export default { ...@@ -737,8 +734,6 @@ export default {
if(item.refundDateType==0){ if(item.refundDateType==0){
if(nowTimeNumber<refundTimeNumber){ if(nowTimeNumber<refundTimeNumber){
this.mainRefundBtn=true this.mainRefundBtn=true
}else{
this.mainRefundBtn=false
} }
} }
if(item.refundDateType==1){ if(item.refundDateType==1){
...@@ -751,15 +746,11 @@ export default { ...@@ -751,15 +746,11 @@ export default {
} }
if(refundTime<nowTime<refundEndTime){ if(refundTime<nowTime<refundEndTime){
this.mainRefundBtn=true this.mainRefundBtn=true
}else{
this.mainRefundBtn=false
} }
} }
if(item.refundDateType==2){ if(item.refundDateType==2){
if(nowTimeNumber>refundTimeNumber){ if(nowTimeNumber>refundTimeNumber){
this.mainRefundBtn=true this.mainRefundBtn=true
}else{
this.mainRefundBtn=false
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment