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

src/api/geopoliticalCustomers/types.ts

@@ -154,6 +154,7 @@ interface customStoreEntitiesItem {
   // customStoreId: number
   // storeId: number
   // customId: number
+  option?: any
   //门店id
   customStoreId?: number
   //预约id

src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue

@@ -327,7 +327,7 @@
                 ref="select"
                 v-model:value="item.reservationTime"
                 :allow-clear="title === '新建预约' || title === '编辑预约'"
-                :options="appointmentTimeOptions"
+                :options="item.option"
                 :class="reservationTimeClass"
                 :style="{ width: title === '详情' || title === '审核' ? '103%' : '100%' }"
               >
@@ -465,7 +465,7 @@ const radiusChange = (value: SelectValue) => {
 const listData: any = ref([])
 
 //预约时间下拉框列表数据
-const appointmentTimeOptions = ref<SelectProps['options']>([])
+const appointmentTimeOptions = ref<any>([])
 const time_array = [
   '0:00~0:30',
   '0:30~1:00',
@@ -517,6 +517,37 @@ const time_array = [
   '23:30~0:00'
 ]
 
+const generateTimeSlots = (tradeStartTime: string, tradeEndTime: string) => {
+  const startHour = Number(tradeStartTime.split(':')[0])
+  const startMinute = Number(tradeStartTime.split(':')[1])
+  const endHour = Number(tradeEndTime.split(':')[0])
+  const endMinute = Number(tradeEndTime.split(':')[1])
+
+  const timeSlots = []
+  for (let hour = startHour; hour < endHour; hour++) {
+    for (let minute = 0; minute < 60; minute += 30) {
+      if (hour === startHour && minute < startMinute) {
+        continue
+      }
+
+      const startTime = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`
+      const endTime = `${(hour + Math.floor(minute / 30)).toString().padStart(2, '0')}:${(
+        (minute + 30) %
+        60
+      )
+        .toString()
+        .padStart(2, '0')}`
+      const timeSlot = {
+        label: `${startTime}~${endTime}`,
+        value: `${startTime}~${endTime}`
+      }
+      timeSlots.push(timeSlot)
+    }
+  }
+
+  return timeSlots
+}
+
 //经纬度
 const lng = ref<number | undefined>()
 const lat = ref<number | undefined>()
@@ -558,6 +589,16 @@ const pagingQuery = () => {
             result.data &&
               result.data.forEach((item: any) => {
                 const disabled = ids.includes(Number(item.id))
+                // console.log(
+                //   generateTimeSlots(item.tradeStartTime, item.tradeEndTime),
+                //   'generateTimeSlots(item.tradeStartTime, item.tradeEndTime)'
+                // )
+                // generateTimeSlots(item.tradeStartTime, item.tradeEndTime).forEach((i: string) => {
+                //   generateTimeSlots(item.tradeStartTime, item.tradeEndTime).push({
+                //     value: i,
+                //     label: i
+                //   })
+                // })
                 listData.value.push({
                   title: item.storeName,
                   description: item.address,
@@ -568,8 +609,10 @@ const pagingQuery = () => {
                   id: item.id,
                   index: item.index,
                   tel: item.nid ? item.nid : '',
-                  reservationDate: item.reservationDate
+                  reservationDate: item.reservationDate,
+                  option: generateTimeSlots(item.tradeStartTime, item.tradeEndTime)
                 })
+                console.log(listData.value, 'listData.value')
               })
             pois.push(...listData.value)
             // 设置缩放级别,设置地图视图级别为
@@ -680,7 +723,8 @@ const addStore = (item: any) => {
     storeName: item.title,
     reservationTime: '',
     storeId: item.id,
-    reservationDate: ''
+    reservationDate: '',
+    option: item.option
   })
 }
 //门店重置

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'