diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index db04d7f..6ac6d78 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -74,7 +74,6 @@
"watch": true,
"watchEffect": true,
"watchPostEffect": true,
- "watchSyncEffect": true,
- "toValue": true
+ "watchSyncEffect": true
}
-}
+}
\ No newline at end of file
diff --git a/src/api/customermanagement/customerList/types.ts b/src/api/customermanagement/customerList/types.ts
index 67a5b1a..fd246f6 100644
--- a/src/api/customermanagement/customerList/types.ts
+++ b/src/api/customermanagement/customerList/types.ts
@@ -121,6 +121,7 @@ export interface queryReservation {
nid?: string | undefined
startTime?: string
endTime?: string
+ salesmanType: number
}
//修改是否有效
export interface isEffectiveType {
diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index 16e5198..028c3a3 100644
--- a/src/hooks/websocket.ts
+++ b/src/hooks/websocket.ts
@@ -18,9 +18,14 @@ const useAdminWebSocket = () => {
// ws地址
const baseUri = import.meta.env.VITE_API_URL
const host = window.location.host
+<<<<<<< HEAD
console.log(host, 'host')
const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
console.log(baseUri, 'baseUri')
+=======
+ const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
+ console.log(wsUri, 'wsUri')
+>>>>>>> 51148e12890616d99b5cb637a2b4197ca26fbcf1
//使用useWebSocket函数创建WebSocket连接,并配置自动重连和心跳机制
useWebSocketReturn = useWebSocket(wsUri, {
diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index f8772da..2058ad0 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -78,9 +78,9 @@