diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal copy.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal copy.vue deleted file mode 100644 index a078cc3..0000000 --- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal copy.vue +++ /dev/null @@ -1,1318 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 匹配 - 重置 - - - - - - - - - - - - - - - - - - {{ item.title }} - - - - - 地址:{{ item.description }} - - - - - 电话:{{ item.tel }} - - - - - - - 添加 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 重置 - 报名 - 暂存 - - 确定 - - 重审 - 分发 - - - - - 您提交的表单信息为: - 称呼:{{ formModel.customName }} - 联系方式:{{ formModel.customNid }} - - - {{ `报名的门店${index + 1}为` }}: {{ item.storeName }} -- - {{ `${item.reservationDate?.toString().split(' ')[0]} ${item.reservationTime}` }} - - - - - - - - diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue index cee0298..ff26588 100644 --- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue +++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue @@ -521,11 +521,14 @@ const generateTimeSlots = (tradeStartTime: string, tradeEndTime: string) => { const endMinute = Number(tradeEndTime.split(':')[1]) const timeSlots = [] - for (let hour = startHour; hour < endHour; hour++) { + for (let hour = startHour; hour <= endHour; hour++) { for (let minute = 0; minute < 60; minute += 30) { if (hour === startHour && minute < startMinute) { continue } + if (hour === endHour && minute >= endMinute) { + break + } const startTime = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}` const endTime = `${(hour + Math.floor(minute / 30)).toString().padStart(2, '0')}:${( diff --git a/vite.config.ts b/vite.config.ts index 52fd77b..c42433a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -24,11 +24,11 @@ import { antdvStyleDeps } from './src/utils/resolvers' //xy // const serverAddress = 'http://172.18.0.225:8000' //jt -const serverAddress = 'http://172.18.1.8:8000' +// const serverAddress = 'http://172.18.1.8:8000' //ts // const serverAddress = 'http://172.18.0.228:8000' //测试 -// const serverAddress = 'http://39.100.77.21:8000' +const serverAddress = 'http://39.100.77.21:8000' //线上ip // const serverAddress = 'http://175.27.212.74:80'
您提交的表单信息为:
称呼:{{ formModel.customName }}
联系方式:{{ formModel.customNid }}
- {{ `报名的门店${index + 1}为` }}: {{ item.storeName }} -- - {{ `${item.reservationDate?.toString().split(' ')[0]} ${item.reservationTime}` }} -