Merge branch 'master' of http://codez.tuoz.net:3000/lsq/byhl-zt

src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue

@@ -523,11 +523,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')}:${(

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'