From 7e6843fb099d7c1a29f1f54a9d1023f18f043d90 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Mon, 1 Sep 2025 10:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=A8=E6=89=93=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E7=94=B5=E8=AF=9D=E5=A4=B1=E6=95=88=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A6=96=E9=A1=B5=E5=85=AC=E5=8F=B8=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer-service-modal.vue                | 103 +++++++++++++-----
 pages/index/index.vue                         |   2 +-
 utils/request.js                              |   2 +-
 3 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/components/customer-service-modal/customer-service-modal.vue b/components/customer-service-modal/customer-service-modal.vue
index 5be160a..efba0a9 100644
--- a/components/customer-service-modal/customer-service-modal.vue
+++ b/components/customer-service-modal/customer-service-modal.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script setup>
-import { ref, defineProps, defineEmits, onMounted } from 'vue'
+import { ref, defineProps, defineEmits, onMounted, watch } from 'vue'
 import { getCustomerList } from '../../api/customer/customer'
 
 // 定义props
@@ -77,6 +77,15 @@ const handleOverlayClick = () => {
 
 // 拨打电话
 const handleCall = service => {
+  // 添加调试日志
+  console.log('拨打电话 - service对象:', service)
+  console.log('工作时间字段:', {
+    startTime: service.startTime,
+    entTime: service.entTime,
+    hasStartTime: !!service.startTime,
+    hasEntTime: !!service.entTime
+  })
+
   uni.showModal({
     title: '确认拨打电话',
     content: `是否拨打 ${service.name} 的电话 ${service.contact}？`,
@@ -86,13 +95,52 @@ const handleCall = service => {
         const now = new Date()
         const currentTime = now.getHours() * 10000 + now.getMinutes() * 100 + now.getSeconds()
 
-        // 解析工作时间
-        const [startTime, endTime] = service.workTime.split('~')
-        const start = parseInt(startTime.replace(/:/g, ''))
-        const end = parseInt(endTime.replace(/:/g, ''))
+        // 解析工作时间 - 使用 startTime 和 entTime 字段
+        if (service.startTime && service.entTime) {
+          const start = parseInt(service.startTime.replace(/:/g, ''))
+          const end = parseInt(service.entTime.replace(/:/g, ''))
 
-        if (currentTime >= start && currentTime <= end) {
-          // 在工作时间内，直接拨打电话
+          if (currentTime >= start && currentTime <= end) {
+            // 在工作时间内，直接拨打电话
+            uni.makePhoneCall({
+              phoneNumber: service.contact,
+              success: () => {
+                console.log('拨打电话成功')
+              },
+              fail: err => {
+                console.error('拨打电话失败:', err)
+                uni.showToast({
+                  title: '拨打电话失败',
+                  icon: 'none',
+                })
+              },
+            })
+          } else {
+            // 不在工作时间内，提示用户
+            uni.showModal({
+              title: '温馨提示',
+              content: `${service.name} 当前不在工作时间内，是否仍要拨打？`,
+              success: res => {
+                if (res.confirm) {
+                  uni.makePhoneCall({
+                    phoneNumber: service.contact,
+                    success: () => {
+                      console.log('拨打电话成功')
+                    },
+                    fail: err => {
+                      console.error('拨打电话失败:', err)
+                      uni.showToast({
+                        title: '拨打电话失败',
+                        icon: 'none',
+                      })
+                    },
+                  })
+                }
+              },
+            })
+          }
+        } else {
+          // 如果没有工作时间信息，直接拨打电话
           uni.makePhoneCall({
             phoneNumber: service.contact,
             success: () => {
@@ -106,29 +154,6 @@ const handleCall = service => {
               })
             },
           })
-        } else {
-          // 不在工作时间内，提示用户
-          uni.showModal({
-            title: '温馨提示',
-            content: `${service.name} 当前不在工作时间内，是否仍要拨打？`,
-            success: res => {
-              if (res.confirm) {
-                uni.makePhoneCall({
-                  phoneNumber: service.contact,
-                  success: () => {
-                    console.log('拨打电话成功')
-                  },
-                  fail: err => {
-                    console.error('拨打电话失败:', err)
-                    uni.showToast({
-                      title: '拨打电话失败',
-                      icon: 'none',
-                    })
-                  },
-                })
-              }
-            },
-          })
         }
       }
     },
@@ -147,6 +172,17 @@ const fetchCustomerList = async () => {
     if (response && response.data) {
       serviceList.value = response.data
       console.log('客服列表获取成功:', serviceList.value)
+      
+      // 添加详细的数据结构日志
+      if (serviceList.value.length > 0) {
+        console.log('第一个客服对象结构:', serviceList.value[0])
+        console.log('所有客服对象:', serviceList.value.map(service => ({
+          name: service.name,
+          contact: service.contact,
+          startTime: service.startTime,
+          entTime: service.entTime
+        })))
+      }
     } else {
       console.warn('API响应中没有data字段:', response)
     }
@@ -167,6 +203,13 @@ onMounted(() => {
   console.log('组件挂载，visible状态:', props.visible)
   fetchCustomerList()
 })
+
+// 监听 visible 属性变化，当弹窗显示时获取客服列表
+watch(props.visible, (newVal, oldVal) => {
+  if (newVal && !oldVal) {
+    fetchCustomerList()
+  }
+}, { immediate: true }) // immediate: true 确保在组件挂载时也触发一次
 </script>
 
 <style scoped>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b445825..fa99df7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,7 +4,7 @@
 
     <custom-nav-bar
       background-color="#FFDECB"
-      title="福鼎创特物联科技有限公司"
+      title="湖北幺娘子厨燃能源科技有限公司"
       title-align="left"
     ></custom-nav-bar>
 
diff --git a/utils/request.js b/utils/request.js
index 8bcc538..292112d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -232,7 +232,7 @@ export function request(options = {}) {
       header: getRequestHeaders(options.header),
       timeout: options.timeout || 60000, // 默认60秒超时
       success: res => {
-        console.log('成功发送请求:', res)
+        console.log('成功发送请求的相应结果:', res)
         // 隐藏加载状态
         if (options.showLoading !== false) {
           hideLoading()