替换人脸拍照
This commit is contained in:
@ -484,6 +484,15 @@ export default {
|
||||
} else {
|
||||
// 未选中则添加
|
||||
this.selectedTime[title].push(time);
|
||||
// 添加后进行升序排序
|
||||
this.selectedTime[title].sort((a, b) => {
|
||||
// 假设时间格式为 "HH:mm" 或 "HH:mm-HH:mm"
|
||||
// 只取开始时间进行比较
|
||||
const getStart = t => t.includes('-') ? t.split('-')[0] : t;
|
||||
const [ah, am] = getStart(a).split(":").map(Number);
|
||||
const [bh, bm] = getStart(b).split(":").map(Number);
|
||||
return ah !== bh ? ah - bh : am - bm;
|
||||
});
|
||||
}
|
||||
this.countSelectedTime = Object.values(this.selectedTime).reduce((acc, times) => acc + times.length, 0);
|
||||
|
||||
@ -493,6 +502,7 @@ export default {
|
||||
let totalPrice = 0;
|
||||
let totalLightPrice = 0;
|
||||
let amount_price = 0;
|
||||
console.log("🚀 ~ selectedTime:", this.selectedTime)
|
||||
|
||||
Object.keys(this.selectedTime).forEach(roomTitle => {
|
||||
const roomId = this.cdList.find(cd => cd.title === roomTitle)?.room_id;
|
||||
@ -536,6 +546,11 @@ export default {
|
||||
// const total = Number((totalPrice + totalLightPrice).toFixed(2)); 2025-12-30要求显示灯光费用,但是不显示在总价中
|
||||
const total = Number((totalPrice - 0).toFixed(2));
|
||||
|
||||
// 按 room_id 升序排序
|
||||
room_list.sort((a, b) => {
|
||||
// room_id 可能为字符串或数字,统一转为数字比较
|
||||
return Number(a.room_id) - Number(b.room_id);
|
||||
});
|
||||
this.selectedReserveTime = room_list;
|
||||
|
||||
// 计算场地费用
|
||||
@ -638,8 +653,9 @@ export default {
|
||||
|
||||
// 立即预约-提交订单
|
||||
toReserve() {
|
||||
|
||||
|
||||
let self = this
|
||||
|
||||
// 一进来就锁定,彻底防止高频点击
|
||||
if (self.typeId == 1) {
|
||||
if (self.selectedReserveTime.length === 0) {
|
||||
@ -654,12 +670,21 @@ export default {
|
||||
mask: true,
|
||||
});
|
||||
try {
|
||||
const start = self.selectedReserveTime[0].day_time + ' ' + self.selectedReserveTime[0].end_time;
|
||||
const start = self.selectedReserveTime[0].day_time + ' ' + self.selectedReserveTime[0].start_time;
|
||||
const end = self.selectedReserveTime[self.selectedReserveTime.length -1].day_time + ' ' + self.selectedReserveTime[self.selectedReserveTime.length -1].end_time;
|
||||
// 转换为时间戳
|
||||
const startTimestamp = Math.floor(Date.parse(start.replace(/-/g, '/')) / 1000);;
|
||||
const endTimestamp = Math.floor(Date.parse(end.replace(/-/g, '/')) / 1000);;
|
||||
|
||||
const startTimestamp = Math.floor(Date.parse(start.replace(/-/g, '/')) / 1000);
|
||||
const endTimestamp = Math.floor(Date.parse(end.replace(/-/g, '/')) / 1000);
|
||||
// let p = {
|
||||
// app_id: self.getAppId(),
|
||||
// ground_id: self.id,
|
||||
// room_list: JSON.stringify(self.selectedReserveTime),
|
||||
// type: self.typeId,
|
||||
// start_end: startTimestamp + '-' + endTimestamp,
|
||||
// amount_price: self.bill.total
|
||||
// }
|
||||
// console.log("🚀 ~ p:", p)
|
||||
|
||||
// 订单提交
|
||||
self._post(
|
||||
'order.groundOrder/submitStoreOrder',
|
||||
|
||||
Reference in New Issue
Block a user