Skip to content

U
uni-pdtravel
Commit 7690be48 authored by 潘永坪's avatar 潘永坪
Browse files
Options

Merge branch 'develop' of http://192.168.0.204/panyongping/uni-pdtravel into develop

parents a68f2c14 989f0886
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 22 deletions
pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue
View file @ 7690be48
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
退款提交 退款提交
</view> </view>
<view class="apply-toButton" v-else> <view class="apply-toButton" v-else>
退款时间为08:00:00-{{orderRefundRuleTimer}} 退款时间为{{orderRefundRuleTimer}}-{{orderRefundRuleEndTimer}}
</view> </view>
<view class="apply-mask" v-if="orderRefundRuleListShowBtn==false"> <view class="apply-mask" v-if="orderRefundRuleListShowBtn==false">
<view class="mask-box"> <view class="mask-box">
...@@ -164,6 +164,7 @@ export default { ...@@ -164,6 +164,7 @@ export default {
orderInfo:{},//订单信息 orderInfo:{},//订单信息
isRefund:false,//是否可以退单 isRefund:false,//是否可以退单
orderRefundRuleTimer:'',//退款时间 orderRefundRuleTimer:'',//退款时间
orderRefundRuleEndTimer:'',//退款截止时间
orderRefundRuleTimerType:false, orderRefundRuleTimerType:false,
orderRefundRuleDay:'',//退款天 orderRefundRuleDay:'',//退款天
orderRefundRuleListShowMessage:[],//退票规则列表 orderRefundRuleListShowMessage:[],//退票规则列表
...@@ -265,22 +266,22 @@ export default { ...@@ -265,22 +266,22 @@ export default {
this.$request('order/userOrder/findOrderDetail',data).then((res)=>{ this.$request('order/userOrder/findOrderDetail',data).then((res)=>{
if(res.code == '00'){ if(res.code == '00'){
this.orderInfo = res.data this.orderInfo = res.data
var refundTimer= '23:59:59' // var refundTimer= '23:59:59'
if(this.orderInfo.orderRefundRuleList!=undefined&&this.orderInfo.orderRefundRuleList.length>0){ // if(this.orderInfo.orderRefundRuleList!=undefined&&this.orderInfo.orderRefundRuleList.length>0){
refundTimer = this.orderInfo.orderRefundRuleList[0].refundTime // refundTimer = this.orderInfo.orderRefundRuleList[0].refundTime
if(this.orderInfo.orderRefundRuleList[0].refundDay!=undefined){ // if(this.orderInfo.orderRefundRuleList[0].refundDay!=undefined){
this.orderRefundRuleDay = this.orderInfo.orderRefundRuleList[0].refundDay // this.orderRefundRuleDay = this.orderInfo.orderRefundRuleList[0].refundDay
} // }
} // }
// if(this.getNowTime()>'08:00:00'&&this.getNowTime()<refundTimer){ // if(this.getNowTime()>'08:00:00'&&this.getNowTime()<refundTimer){
// this.isRefund = true // this.isRefund = true
// }else{ // }else{
// this.isRefund = false // this.isRefund = false
// } // }
this.isRefund = true // this.isRefund = true
this.merchantId = res.data.merchantId this.merchantId = res.data.merchantId
this.orderRefundRuleTimer = refundTimer // this.orderRefundRuleTimer = refundTimer
// if(this.getNowTime()>this.orderRefundRuleTimer){ // if(this.getNowTime()>this.orderRefundRuleTimer){
// this.orderRefundRuleTimerType = true // this.orderRefundRuleTimerType = true
// } // }
...@@ -289,14 +290,40 @@ export default { ...@@ -289,14 +290,40 @@ export default {
this.orderRefundRuleListShowMessage.forEach((item,index)=>{ this.orderRefundRuleListShowMessage.forEach((item,index)=>{
if(item.refundVisitorApply==1){ if(item.refundVisitorApply==1){
var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间 var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间
var playdateTimer = this.orderInfo.playDate+' '+item.refundTime //获取游玩时间 var playdateTimer = this.orderInfo.playDate+' '+item.refundTime //获取游玩时间开始
var todayTimerNum = this.$commonjs.changeTime(todayTimer) //今天时间转化数字 var todayTimerNum = this.$commonjs.changeTime(todayTimer) //今天时间转化数字
var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字 var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字
if(todayTimerNum<playdateTimerNum){ var playdateEndTimer = ''//退票截止时间
this.orderRefundRuleListShowBtn = true var playdateEndTimerNum = '' //截止时间转化数字
}else{ if(item.refundDateType!=undefined&&item.refundDateType==2){//refundDateType 退款时间展示文字（0之前1之后2至（用于区间））
this.orderRefundRuleListShowBtn = false playdateEndTimer = this.orderInfo.playDate+' '+item.refundEndTime //获取游玩时间开始
} playdateEndTimerNum = this.$commonjs.changeTime(playdateEndTimer)
}
if(item.refundDateType!=undefined&&item.refundDateType==2){
if(todayTimerNum>playdateTimerNum&&todayTimerNum<playdateEndTimerNum){
this.orderRefundRuleListShowBtn = true
this.isRefund = true
this.orderRefundRuleTimer = item.refundTime
this.orderRefundRuleEndTimer = item.refundEndTime
}else{
this.orderRefundRuleListShowBtn = false
this.isRefund = false
this.orderRefundRuleTimer = item.refundTime
this.orderRefundRuleEndTimer = item.refundEndTime
}
}else{
if(todayTimerNum<playdateTimerNum){
this.orderRefundRuleListShowBtn = true
this.isRefund = true
this.orderRefundRuleTimer = '08:00:00'
this.orderRefundRuleEndTimer = item.refundTime
}else{
this.orderRefundRuleListShowBtn = false
this.isRefund = false
this.orderRefundRuleTimer = '08:00:00'
this.orderRefundRuleEndTimer = item.refundTime
}
}
} }
}) })
}else{ }else{
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 7690be48
...@@ -848,13 +848,27 @@ export default { ...@@ -848,13 +848,27 @@ export default {
this.orderRefundRuleListShowMessage.forEach((item,index)=>{ this.orderRefundRuleListShowMessage.forEach((item,index)=>{
if(item.refundVisitorApply==1){ if(item.refundVisitorApply==1){
var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间 var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间
var playdateTimer = this.orderInfo.playDate+' '+item.refundTime //获取游玩时间 var playdateTimer = this.orderInfo.playDate+' '+item.refundTime //获取游玩时间开始
var todayTimerNum = this.$commonjs.changeTime(todayTimer) //今天时间转化数字 var todayTimerNum = this.$commonjs.changeTime(todayTimer) //今天时间转化数字
var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字 var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字
if(todayTimerNum<playdateTimerNum){ var playdateEndTimer = ''//退票截止时间
this.orderRefundRuleListShowBtn = true var playdateEndTimerNum = '' //截止时间转化数字
if(item.refundDateType!=undefined&&item.refundDateType==2){//refundDateType 退款时间展示文字（0之前1之后2至（用于区间））
playdateEndTimer = this.orderInfo.playDate+' '+item.refundEndTime //获取游玩时间开始
playdateEndTimerNum = this.$commonjs.changeTime(playdateEndTimer)
}
if(item.refundDateType!=undefined&&item.refundDateType==2){
if(todayTimerNum>playdateTimerNum&&todayTimerNum<playdateEndTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
this.orderRefundRuleListShowBtn = false
}
}else{ }else{
this.orderRefundRuleListShowBtn = false if(todayTimerNum<playdateTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
this.orderRefundRuleListShowBtn = 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