Skip to content

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

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

parents fd95b5f6 8138ddb5
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 12 deletions
pages/my/order/afterSale/applyAfterSale/applyAfterSale.vue
View file @ 833379b5
...@@ -9,7 +9,13 @@ ...@@ -9,7 +9,13 @@
<view class="title-name">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view> <view class="title-name">{{orderInfo.merchantName}}（{{orderInfo.productName}}）</view>
<view class="title-num">x{{orderInfo.orderNum}}</view> <view class="title-num">x{{orderInfo.orderNum}}</view>
</view> </view>
<view class="ticket-timer"><text v-if="orderRefundRuleDay!=0">使用日期截止前{{orderRefundRuleDay}}天</text><text v-else>游玩当天</text>{{orderRefundRuleTimer}}之前未使用可退</view> <view class="ticket-timer">
<!-- <text v-if="orderRefundRuleDay!=0">使用日期截止前{{orderRefundRuleDay}}天</text>
<text v-else>游玩当天</text>{{orderRefundRuleTimer}}之前未使用可退 -->
<view v-for="(item,index) in orderRefundRuleListShowMessage" :key="index">
<text>{{item.refundShowMessage}}<br/></text>
</view>
</view>
</view> </view>
<!-- <view class="apply-user general-Box"> <!-- <view class="apply-user general-Box">
<view class="user-title"> <view class="user-title">
...@@ -55,9 +61,13 @@ ...@@ -55,9 +61,13 @@
<view class="apply-toButton" v-else> <view class="apply-toButton" v-else>
退款时间为08:00:00-{{orderRefundRuleTimer}} 退款时间为08:00:00-{{orderRefundRuleTimer}}
</view> </view>
<view class="apply-mask" v-if="orderRefundRuleTimerType==true"> <view class="apply-mask" v-if="orderRefundRuleListShowBtn==false">
<view class="mask-box"> <view class="mask-box">
<view class="box-text">请在{{orderRefundRuleTimer}}前退票</view> <view class="box-text">
<view v-for="(item,index) in orderRefundRuleListShowMessage" :key="index">
<text>{{item.refundShowMessage}}<br/></text>
</view>
</view>
<view class="box-btn" @click="orderRefundRuleTimerBack()">返回</view> <view class="box-btn" @click="orderRefundRuleTimerBack()">返回</view>
</view> </view>
</view> </view>
...@@ -112,6 +122,8 @@ export default { ...@@ -112,6 +122,8 @@ export default {
orderRefundRuleTimer:'',//退款时间 orderRefundRuleTimer:'',//退款时间
orderRefundRuleTimerType:false, orderRefundRuleTimerType:false,
orderRefundRuleDay:'',//退款天 orderRefundRuleDay:'',//退款天
orderRefundRuleListShowMessage:[],//退票规则列表
orderRefundRuleListShowBtn:true,//退票是否超时
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -228,6 +240,21 @@ export default { ...@@ -228,6 +240,21 @@ export default {
// if(this.getNowTime()>this.orderRefundRuleTimer){ // if(this.getNowTime()>this.orderRefundRuleTimer){
// this.orderRefundRuleTimerType = true // this.orderRefundRuleTimerType = true
// } // }
this.orderRefundRuleListShowMessage = this.orderInfo.orderRefundRuleList
//判断是否在退票时间内
this.orderRefundRuleListShowMessage.forEach((item,index)=>{
if(item.refundVisitorApply==1){
var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间
var playdateTimer = this.orderInfo.playDate+' '+item.refundTime //获取游玩时间
var todayTimerNum = this.$commonjs.changeTime(todayTimer) //今天时间转化数字
var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字
if(todayTimerNum<playdateTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
this.orderRefundRuleListShowBtn = false
}
}
})
}else{ }else{
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
...@@ -460,11 +487,14 @@ export default { ...@@ -460,11 +487,14 @@ export default {
background-color: rgba(0,0,0,.3); background-color: rgba(0,0,0,.3);
.mask-box{ .mask-box{
width: 500rpx; width: 500rpx;
height: 200rpx; height: 300rpx;
padding: 24rpx; padding: 24rpx;
background-color: #fff; background-color: #fff;
border-radius: 10px; border-radius: 10px;
margin: auto; margin: auto;
display: flex;
flex-direction:column;
justify-content:center;
position: fixed; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 833379b5
...@@ -333,16 +333,19 @@ ...@@ -333,16 +333,19 @@
<!-- <div> <!-- <div>
规定时间可退 规定时间可退
</div> --> </div> -->
<text v-if="orderInfo.orderRefundRuleList[0]&&orderInfo.orderRefundRuleList[0].refundDay!=0">使用日期截止前{{orderInfo.orderRefundRuleList[0].refundDay}}天</text> <!-- <text v-if="orderInfo.orderRefundRuleList[0]&&orderInfo.orderRefundRuleList[0].refundDay!=0">使用日期截止前{{orderInfo.orderRefundRuleList[0].refundDay}}天</text>
<text v-else>游玩当天</text> <text v-else>游玩当天</text>
<text v-if="orderInfo.orderRefundRuleList[0]">{{orderInfo.orderRefundRuleList[0].refundTime.substr(0,5)}}之前可退</text> <text v-if="orderInfo.orderRefundRuleList[0]">{{orderInfo.orderRefundRuleList[0].refundTime.substr(0,5)}}之前可退</text> -->
<view v-for="(item,index) in orderRefundRuleListShowMessage" :key="index">
<text>{{item.refundShowMessage}}<br/></text>
</view>
</template> </template>
<template v-else-if="orderInfo.isRefund==2">随时可退</template> <template v-else-if="orderInfo.isRefund==2">随时可退</template>
<template v-if="ticketStatus"> <template v-if="ticketStatus">
<view class="list-btnRefund" v-if="orderInfo.orderStatus==2&&orderInfo.isRefund!=0&&ticketStatus==0||orderInfo.orderStatus==7&&orderInfo.isRefund!=0&&ticketStatus==0" @click="refundJump(orderInfo.id)">退款/售后</view> <view class="list-btnRefund" v-if="orderInfo.orderStatus==2&&orderInfo.isRefund!=0&&orderRefundRuleListShowBtn==true&&ticketStatus==0||orderInfo.orderStatus==7&&orderInfo.isRefund!=0&&orderRefundRuleListShowBtn==true&&ticketStatus==0" @click="refundJump(orderInfo.id)">退款/售后</view>
</template> </template>
<template v-else> <template v-else>
<view class="list-btnRefund" v-if="orderInfo.orderStatus==2&&orderInfo.isRefund!=0||orderInfo.orderStatus==7&&orderInfo.isRefund!=0" @click="refundJump(orderInfo.id)">退款/售后</view> <view class="list-btnRefund" v-if="orderInfo.orderStatus==2&&orderInfo.isRefund!=0&&orderRefundRuleListShowBtn==true||orderInfo.orderStatus==7&&orderInfo.isRefund!=0&&orderRefundRuleListShowBtn==true" @click="refundJump(orderInfo.id)">退款/售后</view>
</template> </template>
</view> </view>
...@@ -599,6 +602,8 @@ export default { ...@@ -599,6 +602,8 @@ export default {
// timer:'2023/09/05 17:42:32', // timer:'2023/09/05 17:42:32',
// }, // },
],//退单进程 ],//退单进程
orderRefundRuleListShowMessage:[],//退票规则列表
orderRefundRuleListShowBtn:true,//退票是否超时
} }
}, },
onShow() { onShow() {
...@@ -621,8 +626,6 @@ export default { ...@@ -621,8 +626,6 @@ export default {
}) })
}, },
onLoad(option) { onLoad(option) {
console.log(option.orderId)
console.log('-----------------------')
if(option.orderId!=undefined){ if(option.orderId!=undefined){
this.id = option.orderId this.id = option.orderId
this.orderDataType = true this.orderDataType = true
...@@ -752,6 +755,7 @@ export default { ...@@ -752,6 +755,7 @@ export default {
this.$request(postHttpUrl,data).then((res)=>{ this.$request(postHttpUrl,data).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.orderInfo = res.data this.orderInfo = res.data
this.orderRefundRuleListShowMessage = this.orderInfo.orderRefundRuleList
this.orderExtendList = res.data.orderExtendList this.orderExtendList = res.data.orderExtendList
if(this.orderInfo.orderType==1){ if(this.orderInfo.orderType==1){
this.orderTypeNum =1 this.orderTypeNum =1
...@@ -818,7 +822,20 @@ export default { ...@@ -818,7 +822,20 @@ export default {
this.unsubscribeType = true this.unsubscribeType = true
} }
} }
//判断是否在退票时间内
this.orderRefundRuleListShowMessage.forEach((item,index)=>{
if(item.refundVisitorApply==1){
var todayTimer = this.$commonjs.today()+' '+this.$commonjs.todayTime() //获取今天时间
var playdateTimer = this.orderInfo.playDate+' '+item.refundTime //获取游玩时间
var todayTimerNum = this.$commonjs.changeTime(todayTimer) //今天时间转化数字
var playdateTimerNum = this.$commonjs.changeTime(playdateTimer) //游玩时间转化数字
if(todayTimerNum<playdateTimerNum){
this.orderRefundRuleListShowBtn = true
}else{
this.orderRefundRuleListShowBtn = false
}
}
})
this.findCouponListFun() this.findCouponListFun()
}else{ }else{
uni.showToast({ uni.showToast({
...@@ -963,7 +980,6 @@ export default { ...@@ -963,7 +980,6 @@ export default {
errorCorrectLevel: 'H',//纠错等级 H等级最高(30%) 简单来说，就是二维码被覆盖了多少仍然能被识别出来 详见qrcode.js errorCorrectLevel: 'H',//纠错等级 H等级最高(30%) 简单来说，就是二维码被覆盖了多少仍然能被识别出来 详见qrcode.js
size: 180 size: 180
}) })
console.log(imgData)
this.imagePath = imgData this.imagePath = imgData
}, },
signOverFun(item){//过号遮罩显示 signOverFun(item){//过号遮罩显示
......
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