diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 6ac6d78..db04d7f 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -74,6 +74,7 @@
"watch": true,
"watchEffect": true,
"watchPostEffect": true,
- "watchSyncEffect": true
+ "watchSyncEffect": true,
+ "toValue": true
}
-}
\ No newline at end of file
+}
diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index 028c3a3..f533c6b 100644
--- a/src/hooks/websocket.ts
+++ b/src/hooks/websocket.ts
@@ -18,14 +18,7 @@ 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/views/customermanagement/customerList/customerListEditModal.vue b/src/views/customermanagement/customerList/customerListEditModal.vue
index 4cc0ee5..6de2540 100644
--- a/src/views/customermanagement/customerList/customerListEditModal.vue
+++ b/src/views/customermanagement/customerList/customerListEditModal.vue
@@ -10,8 +10,9 @@
@ok="handleSubmit"
@cancel="handleClose"
>
-
-
+
+
+
线索阶段树
@@ -55,13 +56,13 @@
+
@@ -198,21 +199,21 @@ const formModel = reactive({
customInformation: ''
})
// 表单的校验规则
-const formRule = reactive({
- customInformation: [{ required: true, message: '请输入客户资料', trigger: ['blur', 'change'] }]
-})
+// const formRule = reactive({
+// customInformation: [{ required: true, message: '请输入客户资料', trigger: ['blur', 'change'] }]
+// })
// 表单的提交请求
const formRequestMapping: FormRequestMapping = {
// [FormAction.CREATE]: createMenu,
[FormAction.UPDATE]: updateResource
}
-
-const { submitLoading, validateAndSubmit, resetFields, validateInfos } = useAdminForm(
+// validateInfos
+const { submitLoading, validateAndSubmit, resetFields } = useAdminForm(
formAction,
formRequestMapping,
- formModel,
- formRule
+ formModel
+ // formRule
)
//表单提交处理
@@ -407,13 +408,13 @@ defineExpose({
}
//客户资料textarea
.customInformationInput {
- // margin-left: 10px;
+ margin-left: 10px;
}
::v-deep textarea.ant-input {
min-height: 90px;
}
//客户资料label
-::v-deep .ant-form-item-required {
+::v-deep .ant-form-item-label > label {
color: rgba(0, 0, 0, 0.85);
font-weight: 500;
font-size: 16px;
diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts
index 5bd8e1d..2ad4739 100644
--- a/types/auto-imports.d.ts
+++ b/types/auto-imports.d.ts
@@ -1,6 +1,7 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
// Generated by unplugin-auto-import
export {}
declare global {
diff --git a/vite.config.ts b/vite.config.ts
index b74c85d..53047d0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -26,10 +26,10 @@ import { antdvStyleDeps } from './src/utils/resolvers'
//ts
// export const serverAddress = 'http://172.18.0.228:8000'
//测试
-export const serverAddress = 'http://39.100.77.21:8000'
+// export const serverAddress = 'http://39.100.77.21:8000'
//线上域名,现在用这个
-// export const serverAddress = 'https://byffp.top'
+export const serverAddress = 'https://byffp.top'
export default defineConfig({
server: {