qiushanhe/ss-crm-manage-web
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: qiushanhe:main
Branches Tags
qiushanhe:main qiushanhe:dev-cl qiushanhe:dev-report qiushanhe:dev-cjl qiushanhe:salary
...
pull from: qiushanhe:dev-cl
Branches Tags
qiushanhe:main qiushanhe:dev-cl qiushanhe:dev-report qiushanhe:dev-cjl qiushanhe:salary

52 Commits
main ... dev-cl

Author SHA1 Message Date
caolin
2f34778ee0 Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2025-08-21 21:50:49 +08:00
caolin
c4df756715 Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl 2025-08-18 21:29:42 +08:00
caolin
2e19a4c6f6 Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
#	package.json
#	yarn.lock
 2025-08-02 17:03:02 +08:00
caolin
d74161b8ce Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2025-05-26 21:11:30 +08:00
caolin
e8ec9bdc47 Merge branch 'main' of http://114.215.207.150:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2025-05-13 22:49:55 +08:00
caolin
6a07c0c711 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
#	.env.front
 2025-02-14 00:04:42 +08:00
caolin
b3435a9a86 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2025-01-20 14:05:55 +08:00
caolin
6d83198a9f Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2024-12-30 22:15:08 +08:00
caolin
29ee948cbb Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-26 21:21:30 +08:00
caolin
f044dbbe7b Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-15 14:29:26 +08:00
caolin
1c0f0651d8 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-10 22:12:55 +08:00
caolin
b052af5507 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-09 21:56:06 +08:00
caolin
f7e81fad0e Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-05 22:16:26 +08:00
caolin
c6b6602181 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-03 17:59:49 +08:00
caolin
f2cea1585d Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-12-02 21:48:52 +08:00
caolin
32bda88a41 Merge remote-tracking branch 'origin/main' into dev-cl 2024-11-24 19:40:16 +08:00
caolin
6d866b7e7c Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2024-11-11 21:55:13 +08:00
caolin
bbecf28819 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-11-07 23:10:45 +08:00
caolin
5740ca00d1 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 
# Conflicts:
#	.env.base
 2024-11-06 22:54:14 +08:00
caolin
206315c642 本地启动 2024-11-06 22:53:31 +08:00
caolin
b9a3424d98 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-11-02 13:46:40 +08:00
caolin
16cb210988 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-30 21:37:55 +08:00
caolin
bc3c4f2ebc Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-29 19:31:52 +08:00
caolin
6ba54c8bcd Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-22 19:58:50 +08:00
caolin
acccadd43a Merge remote-tracking branch 'origin/main' into dev-cl 2024-10-21 21:23:46 +08:00
caolin
02af7babc4 Merge branch 'dev-report' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-12 13:49:38 +08:00
caolin
505139cfe2 Merge branch 'dev-report' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-10 22:44:57 +08:00
caolin
6246d46d53 Merge branch 'dev-report' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-10-09 22:23:47 +08:00
caolin
98a5d374a4 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-28 18:00:22 +08:00
caolin
dd049320f6 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-23 21:45:29 +08:00
caolin
696e96a0c0 Merge remote-tracking branch 'origin/main' into dev-cl 2024-09-22 16:08:37 +08:00
caolin
ee770b9e60 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-18 23:08:40 +08:00
caolin
6908183a36 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-11 23:01:08 +08:00
caolin
af9bcb7024 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-08 14:26:43 +08:00
caolin
5c6c3df4d0 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-05 22:31:59 +08:00
caolin
acdcc670de Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-09-05 22:31:44 +08:00
caolin
9472c5ea56 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-29 22:20:26 +08:00
caolin
4f150b0912 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-28 22:04:46 +08:00
caolin
f76d6dce66 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-27 23:04:20 +08:00
caolin
dd4bdb0786 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-26 22:00:11 +08:00
caolin
477a279867 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-23 22:26:44 +08:00
caolin
c87637cc78 Merge branch 'dev-cjl' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-20 23:52:46 +08:00
caolin
a544840679 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-16 12:47:36 +08:00
caolin
247c6ed4a0 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-13 21:43:40 +08:00
caolin
769c901954 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-10 13:21:15 +08:00
caolin
18bfc7d353 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-06 22:05:52 +08:00
caolin
fb6b341242 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-06 19:27:40 +08:00
caolin
fea69da8ed Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-04 14:15:30 +08:00
caolin
125f6f28ad Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-08-02 21:02:44 +08:00
caolin
39cddaa8e0 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-07-31 21:11:55 +08:00
caolin
ffd15e2433 Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl 2024-07-30 21:32:07 +08:00
caolin
2bebd0480e 本地启动 2024-07-13 11:30:36 +08:00
2 changed files with 5 additions and 3 deletions
Expand all files Collapse all files

5
.env.base
View File

@@ -4,8 +4,9 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://47.98.161.246:48080'
# VITE_BASE_URL='http://114.215.207.150:48080'
VITE_BASE_URL='http://localhost:48080'
# VITE_BASE_URL='http://47.98.161.246:48080'
#VITE_BASE_URL='http://114.215.207.150:48080'
# 高德地图key密钥
# 1寻驾

3
.env.front
View File

@@ -4,7 +4,8 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://47.98.161.246:48080'
#VITE_BASE_URL='http://47.98.161.246:48080'
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'