Skip to content

J
jz_Travel
Commit ed36f8b5 authored by youjie's avatar youjie
Browse files
Options

定时器

parent 129d7b27
Show whitespace changes
Inline Side-by-side
Showing with 228 additions and 99 deletions
pages/AggregateOrders/components/orders.vue
View file @ ed36f8b5
...@@ -122,31 +122,31 @@ ...@@ -122,31 +122,31 @@
orders: { orders: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
this.g = JSON.parse(JSON.stringify(newVal)) this.g = JSON.parse(JSON.stringify(newVal))
this.g.forEach(x => { // this.g.forEach(x => {
let goodsTypeHotel = 0 // let goodsTypeHotel = 0
// #ifdef MP-DI // // #ifdef MP-DI
goodsTypeHotel = x.goodsType==9?1:0 // goodsTypeHotel = x.goodsType==9?1:0
// #endif // // #endif
// #ifdef MP-AG // // #ifdef MP-AG
goodsTypeHotel = x.goodsType==7?1:0 // goodsTypeHotel = x.goodsType==7?1:0
// #endif // // #endif
if(x.orderStatus!=1) x.isExpired = true // if(x.orderStatus!=1) x.isExpired = true
if (x.orderStatus==1&&goodsTypeHotel>0) { // if (x.orderStatus==1&&goodsTypeHotel>0) {
const now = Date.now(); // const now = Date.now();
// const customStr = '2025-05-12 14:43:00' // // const customStr = '2025-05-12 14:43:00'
const customStr = x.createTimeStr // const customStr = x.createTimeStr
const [date, time] = customStr.split(' ') // const [date, time] = customStr.split(' ')
const [year, month, day] = date.split('-') // const [year, month, day] = date.split('-')
const [hours, minutes, seconds] = time.split(':') // const [hours, minutes, seconds] = time.split(':')
const parsedDate = new Date(year, month-1, day, hours, minutes, seconds) // const parsedDate = new Date(year, month-1, day, hours, minutes, seconds)
x.orderTime = parsedDate.getTime() // x.orderTime = parsedDate.getTime()
const diff = x.orderTime + 5 * 60 * 1000 - now; // 5分钟倒计时 // const diff = x.orderTime + 5 * 60 * 1000 - now; // 5分钟倒计时
let remainingSeconds = Math.max(diff, 0); // 确保不出现负数 // let remainingSeconds = Math.max(diff, 0); // 确保不出现负数
x.remainingSeconds = Math.floor(remainingSeconds/1000) // x.remainingSeconds = Math.floor(remainingSeconds/1000)
// console.log("支付倒计时",x.remainingSeconds) // // console.log("支付倒计时",x.remainingSeconds)
if(x.remainingSeconds) this.initCountdown(x) // if(x.remainingSeconds) this.initCountdown(x)
} // }
}); // });
}, },
deep: true, deep: true,
} }
...@@ -162,9 +162,9 @@ ...@@ -162,9 +162,9 @@
mounted() { mounted() {
this.b2b_user = uni.getStorageSync("b2b_user") this.b2b_user = uni.getStorageSync("b2b_user")
// 全局定时检查（防止极端情况下定时器失效） // 全局定时检查（防止极端情况下定时器失效）
this.checkInterval = setInterval(() => { // this.checkInterval = setInterval(() => {
this.checkExpiredOrders() // this.checkExpiredOrders()
}, 60000) // 每分钟检查一次 // }, 60000) // 每分钟检查一次
}, },
methods: { methods: {
// 时间格式化 // 时间格式化
......
pages/airTicket/airTicketOrderDetail.vue
View file @ ed36f8b5
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<text class="q-ml-sm col bold"> <text class="q-ml-sm col bold">
{{(order.status==0?'待支付':(order.status==1?'正常':'已取消'))}} {{(order.status==0?'待支付':(order.status==1?'正常':'已取消'))}}
</text> </text>
<u-count-down :timestamp="endts" v-if="order.status==0" color="#ffffffdd" separator-color="#ffffffdd" :show-days="false" bg-color="transparent"></u-count-down> <u-count-down :timestamp="endts" v-if="order.status==0" color="#ffffff" separator-color="#ffffff" :show-days="false" bg-color="transparent"></u-count-down>
<!-- #endif --> <!-- #endif -->
</view> </view>
<view class="content q-mt-sm"> <view class="content q-mt-sm">
......
pages/airTicket/flightDetail.vue
View file @ ed36f8b5
...@@ -263,7 +263,6 @@ ...@@ -263,7 +263,6 @@
goVisible:false, goVisible:false,
orderInfo: {}, orderInfo: {},
Mailbox: '', Mailbox: '',
price: 0,
} }
}, },
components: { components: {
......
pages/bus/order.vue
View file @ ed36f8b5
...@@ -338,6 +338,13 @@ ...@@ -338,6 +338,13 @@
<coupon v-if="couponList.length > 0 && showCoupon" :price="orderMsg.Money" :list="couponList" <coupon v-if="couponList.length > 0 && showCoupon" :price="orderMsg.Money" :list="couponList"
:current="useCouponIds" @close="closeCouponHandler" :order="orderMsg" :numberPeople="orderMsg.peoples"> :current="useCouponIds" @close="closeCouponHandler" :order="orderMsg" :numberPeople="orderMsg.peoples">
</coupon> </coupon>
<u-modal :border-radius="16"
@confirm="nativageToOrderHandle"
title="订单提醒"
content="订单创建成功,请您在5分钟内完成付款,否则将会被取消."
@cancel="navigatorToHomeHandle"
v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页'
confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
</view> </view>
</template> </template>
...@@ -450,6 +457,7 @@ ...@@ -450,6 +457,7 @@
{name: '女',value: 2}, {name: '女',value: 2},
], ],
ErpOrderId: '', ErpOrderId: '',
successVisible: false,
} }
}, },
onLoad(options) { onLoad(options) {
...@@ -493,6 +501,23 @@ ...@@ -493,6 +501,23 @@
}); });
}, },
methods: { methods: {
navigatorToHomeHandle() {
uni.redirectTo({
url: '/pages/index/index'
})
},
nativageToOrderHandle(){
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '12,13,14'
// #endif
// #ifdef MP-AG
OrderTypeStr = '5'
// #endif
uni.redirectTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
});
},
radioChange(e){ radioChange(e){
this.orderMsg.Sex = e this.orderMsg.Sex = e
}, },
...@@ -592,8 +617,18 @@ ...@@ -592,8 +617,18 @@
icon: "none", icon: "none",
}); });
setTimeout(() => { setTimeout(() => {
// uni.redirectTo({
// url: "/pages/bus/orderdetails?orderId=" + that.ErpOrderId,
// });
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '12,13,14'
// #endif
// #ifdef MP-AG
OrderTypeStr = '5'
// #endif
uni.redirectTo({ uni.redirectTo({
url: "/pages/bus/orderdetails?orderId=" + that.ErpOrderId, url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
}); });
}, 100); }, 100);
}, },
......
pages/hotel/order.vue
View file @ ed36f8b5
...@@ -228,6 +228,13 @@ ...@@ -228,6 +228,13 @@
<coupon v-if="couponList.length > 0 && showCoupon" :price="orderMsg.TotalPrice" :list="couponList" <coupon v-if="couponList.length > 0 && showCoupon" :price="orderMsg.TotalPrice" :list="couponList"
:current="useCouponIds" @close="closeCouponHandler" :order="orderMsg" :numberPeople="searchObj.peoples"> :current="useCouponIds" @close="closeCouponHandler" :order="orderMsg" :numberPeople="searchObj.peoples">
</coupon> </coupon>
<u-modal :border-radius="16"
@confirm="nativageToOrderHandle"
title="订单提醒"
content="订单创建成功,请您在5分钟内完成付款,否则将会被取消."
@cancel="navigatorToHomeHandle"
v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页'
confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
</view> </view>
</template> </template>
...@@ -347,6 +354,7 @@ ...@@ -347,6 +354,7 @@
submit: false, submit: false,
orderInfo: null, orderInfo: null,
price: 0, price: 0,
successVisible: false,
} }
}, },
onLoad(options) { onLoad(options) {
...@@ -414,6 +422,23 @@ ...@@ -414,6 +422,23 @@
}); });
}, },
methods: { methods: {
navigatorToHomeHandle() {
uni.redirectTo({
url: '/pages/index/index'
})
},
nativageToOrderHandle(){
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '8,9,10,11'
// #endif
// #ifdef MP-AG
OrderTypeStr = '7'
// #endif
uni.redirectTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
});
},
//获取房间价格 //获取房间价格
getRoomPrice(priceList) getRoomPrice(priceList)
{ {
...@@ -592,14 +617,26 @@ ...@@ -592,14 +617,26 @@
}, },
fail: function(err) { fail: function(err) {
that.submit = true; that.submit = true;
uni.showToast({ that.successVisible = true
title: "支付失败", // uni.showToast({
icon: "none", // title: "支付失败",
}); // icon: "none",
// });
setTimeout(() => { setTimeout(() => {
uni.redirectTo({
url: "/pages/hotel/orderdetails?orderId=" + item.ErpOrderId, // uni.redirectTo({
}); // url: "/pages/hotel/orderdetails?orderId=" + item.ErpOrderId,
// });
// let OrderTypeStr = ''
// // #ifdef MP-DI
// OrderTypeStr = '8,9,10,11'
// // #endif
// // #ifdef MP-AG
// OrderTypeStr = '7'
// // #endif
// uni.redirectTo({
// url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
// });
}, 100); }, 100);
}, },
}); });
......
pages/hotel/orderdetails.vue
View file @ ed36f8b5
<template> <template>
<view class="hotel-detail" v-if="orderData"> <view class="hotel-detail f-order" v-if="orderData">
<scroll-view ref="scrollView" scroll-y="true" style="height: 1px;flex: 1;box-sizing: border-box;" <scroll-view ref="scrollView" scroll-y="true" style="height: 1px;flex: 1;box-sizing: border-box;"
@scroll="scroll"> @scroll="scroll">
<view class="media" :style="{ opacity: 100 - boxOption + '%' }"> <view class="media" :style="{ opacity: 100 - boxOption + '%' }">
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
<u-icon name="arrow-left" size="44" style="margin-top: 22rpx"></u-icon> <u-icon name="arrow-left" size="44" style="margin-top: 22rpx"></u-icon>
</view> --> </view> -->
<!-- #endif --> <!-- #endif -->
<view class="orderStatusBox flex" style="margin-bottom: 30rpx;justify-content: space-between"> <view class="orderStatusBox column" style="margin-bottom: 30rpx;justify-content: space-between">
<view class="row"> <view class="row-sbas-n">
<view class="row items-center">
<u-icon customPrefix="iconfont" name="icondaizhifu-" size="52" color="#DFBE6E" <u-icon customPrefix="iconfont" name="icondaizhifu-" size="52" color="#DFBE6E"
v-if="orderStatus.code == 0"></u-icon> v-if="orderStatus.code == 0"></u-icon>
<u-icon customPrefix="iconfont" name="iconquxiao" size="52" color="#f26c6c" <u-icon customPrefix="iconfont" name="iconquxiao" size="52" color="#f26c6c"
...@@ -29,11 +30,28 @@ ...@@ -29,11 +30,28 @@
{{ orderStatus.text }} {{ orderStatus.text }}
</text> </text>
</view> </view>
<view class="RemainderBox" v-if="remainingSeconds"> <u-count-down :showDays="false" :showHours="false" :timestamp="remainingSeconds"
<text>剩余支付时间：</text> @change="changeSeconds"
<text>{{formattedTime}}</text> v-if="orderData.directOrder.OrderStatus==1" color="#000" separator-color="#000" :show-days="false" bg-color="transparent"></u-count-down>
</view>
<view class="timecontent q-mt-sm">
<view v-if="orderData.directOrder.OrderStatus&&orderData.directOrder.OrderStatus==1">
<view class="row">
<text>请您于{{dielineTime}}前支付：¥</text>
<text class="bold">{{ DanWei }}{{(orderData.model.TotalPrice-orderData.model.DiscountMoney).toFixed(2)}}</text>
</view>
<view class="small">
完成支付才能锁定酒店</view>
</view> </view>
<view class="small" v-else-if="orderData.directOrder.OrderStatus==2||(orderData.directOrder.OrderStatus&&orderData.directOrder.OrderStatus==4)">
取消原因：用户超时未付款，自动取消
</view> </view>
<view class="small" v-else>
感谢您的预定，服务专员将会持续为您提供服务
</view>
</view>
</view>
<view class="orderIforRzBox row"> <view class="orderIforRzBox row">
<view class="orderIforRzImg"> <view class="orderIforRzImg">
<img style="width: 14rpx;height: 68rpx;" <img style="width: 14rpx;height: 68rpx;"
...@@ -258,6 +276,7 @@ ...@@ -258,6 +276,7 @@
</button> </button>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
...@@ -311,6 +330,8 @@ ...@@ -311,6 +330,8 @@
isExpired: false, isExpired: false,
countdownInterval: null, countdownInterval: null,
currentTime: Date.now(), currentTime: Date.now(),
endts:0,
dielineTime: '',
}; };
}, },
computed: { computed: {
...@@ -321,11 +342,10 @@ ...@@ -321,11 +342,10 @@
} }
}, },
beforeDestroy() { beforeDestroy() {
this.clearInterval()
}, },
onHide() { onHide() {
// 清除所有定时器
this.clearInterval()
}, },
created() { created() {
this.Up = uni.getStorageSync("mall_UserInfo") ? this.Up = uni.getStorageSync("mall_UserInfo") ?
...@@ -350,6 +370,18 @@ ...@@ -350,6 +370,18 @@
this.getdidaMealType() this.getdidaMealType()
}, },
methods: { methods: {
changeSeconds(seconds) {
if(seconds<=0) {
let cancelMsg = {
OrderNo: this.orderData.directOrder.OrderNo,
ErpOrderId: this.orderData.model.OrderID,
OrderTypeStr: "Hotel", //订单类型为酒店
ConfirmID: "",
Amount: 0,
};
this.cancelOrder(cancelMsg,1)
}
},
payHotelOrder() { payHotelOrder() {
let userInfo = uni.getStorageSync("mall_UserInfo"); let userInfo = uni.getStorageSync("mall_UserInfo");
var payMsg = { var payMsg = {
...@@ -466,7 +498,7 @@ ...@@ -466,7 +498,7 @@
} }
}) })
}, },
cancelOrder(postMsg) { cancelOrder(postMsg,type) {
this.apipost( this.apipost(
"post_CancelThirdHotelOrder", postMsg, "post_CancelThirdHotelOrder", postMsg,
(res) => { (res) => {
...@@ -475,6 +507,7 @@ ...@@ -475,6 +507,7 @@
title: "操作成功", title: "操作成功",
icon: "success", icon: "success",
}); });
if(type) this.orderData.directOrder.OrderStatus = 4;
this.getOrderDetail(this.id) this.getOrderDetail(this.id)
} }
}, },
...@@ -540,7 +573,6 @@ ...@@ -540,7 +573,6 @@
this.orderData.directOrder.CreateTime = this.$utils.formatDates(new Date(tempData.directOrder.CreateTime), 'yyyy-MM-dd hh:mm:ss') this.orderData.directOrder.CreateTime = this.$utils.formatDates(new Date(tempData.directOrder.CreateTime), 'yyyy-MM-dd hh:mm:ss')
// 支付倒计时 // 支付倒计时
console.log(tempData.directOrder.OrderStatus,'--------')
if (this.orderData.directOrder.CreateTime&&tempData.directOrder.OrderStatus==1) { if (this.orderData.directOrder.CreateTime&&tempData.directOrder.OrderStatus==1) {
const now = Date.now(); const now = Date.now();
// const customStr = '2025-05-12 14:33:47' // const customStr = '2025-05-12 14:33:47'
...@@ -554,9 +586,20 @@ ...@@ -554,9 +586,20 @@
const diff = this.orderTime + 5 * 60 * 1000 - now; // 5分钟倒计时 const diff = this.orderTime + 5 * 60 * 1000 - now; // 5分钟倒计时
let remainingSeconds = Math.max(diff, 0); // 确保不出现负数 let remainingSeconds = Math.max(diff, 0); // 确保不出现负数
this.remainingSeconds = Math.floor(remainingSeconds/1000) this.remainingSeconds = Math.floor(remainingSeconds/1000)
// 启动倒计时
if(this.remainingSeconds) this.startCountdown() let endTime = new Date(this.orderData.directOrder.CreateTime)
else this.handleTimeout() endTime.setHours(endTime.getHours()+6)
this.endts = this.remainingSeconds
console.log(this.endts,'----------')
if(this.endts<=0){
this.cancleOrderHandle()
}
const m = Math.floor(this.remainingSeconds / 60)
const s = this.remainingSeconds % 60
this.dielineTime = `${m}分${s}秒`
// // 启动倒计时
// if(this.remainingSeconds) this.startCountdown()
// else this.handleTimeout()
} }
...@@ -580,37 +623,6 @@ ...@@ -580,37 +623,6 @@
} }
); );
}, },
clearInterval() {
if (this.countdownInterval) {
clearInterval(this.countdownInterval)
this.countdownInterval = null
}
},
handleTimeout() {
if(this.isExpired) return this.clearInterval()
this.isExpired = true
if (this.submitCancel) return
let cancelMsg = {
OrderNo: this.orderData.directOrder.OrderNo,
ErpOrderId: this.orderData.model.OrderID,
OrderTypeStr: "Hotel", //订单类型为酒店
ConfirmID: "",
Amount: 0,
};
this.getOrderDetail(this.id)
// this.cancelOrder(cancelMsg)
},
startCountdown() {
this.countdownInterval = setInterval(() => {
if (this.remainingSeconds > 0) {
this.remainingSeconds--
} else {
this.handleTimeout()
}
}, 1000)
},
//未付款是初始化预定房型，餐型等， //未付款是初始化预定房型，餐型等，
initBookHotel() { initBookHotel() {
var cMsg = { var cMsg = {
...@@ -1397,4 +1409,50 @@ ...@@ -1397,4 +1409,50 @@
font-size: 20px; font-size: 20px;
font-weight: 600; font-weight: 600;
} }
.timecontent{
font-size: 26rpx;
padding: 0 30rpx;
margin-bottom: 20rpx;
}
.f-order .bold{
font-weight: bold;
}
.f-order .small{
font-size: 22rpx;
}
.f-order .flight-status {
background: #E1C278;
border-radius: 8rpx;
font-size: 24rpx;
color: #111111;
font-weight: 400;
padding: 7rpx 14rpx;
}
.day-diff{
position: absolute;
top: -35rpx;
line-height: 1;
font-size: 22rpx;
color: #FF5858;
left: 4rpx;
}
.thin{
line-height: 1;
margin-top: 16rpx;
font-weight: 400;
font-size: 22rpx;
color: #9999A5;
max-width: 45px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.f-order .used-time{
margin-top: -16rpx;
}
.f-order .how-time{
height: 24rpx;
font-size: 20rpx;
color: #9999A5;
}
</style> </style>
\ No newline at end of file
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