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

Compare commits

base: qiushanhe:b3435a9a86b5e37ea6a2e096d2b74e02a302e1c2
Branches Tags
qiushanhe:main qiushanhe:dev-cl qiushanhe:dev-report qiushanhe:dev-cjl qiushanhe:salary
...
compare: qiushanhe:6a07c0c7119bbdea41680c8d5d884eb7a54ccf51
Branches Tags
qiushanhe:main qiushanhe:dev-cl qiushanhe:dev-report qiushanhe:dev-cjl qiushanhe:salary

2 Commits
b3435a9a86 ... 6a07c0c711

Author SHA1 Message Date
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
qsh
3abe367954 sc 2025-02-12 17:10:23 +08:00
8 changed files with 9 additions and 7 deletions
Expand all files Collapse all files

2
.env.base
View File

@@ -8,7 +8,7 @@ VITE_BASE_URL='http://localhost:48080'
#VITE_BASE_URL='http://114.55.169.15:48080'
# 上传路径
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
# VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
# 接口前缀

2
.env.dev
View File

@@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
# 接口前缀
VITE_API_BASEPATH=/crm-api

4
.env.front
View File

@@ -4,11 +4,11 @@ VITE_NODE_ENV=development
VITE_DEV=true
# 请求路径
#VITE_BASE_URL='http://118.31.23.45:48080'
#VITE_BASE_URL='http://47.98.161.246:48080'
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
# 接口前缀
VITE_API_BASEPATH=/crm-api

2
.env.stage
View File

@@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# 上传路径
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
# 接口前缀
VITE_API_BASEPATH=/crm-api

2
.env.static
View File

@@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
# 接口前缀
VITE_API_BASEPATH=/crm-api

2
.env.test
View File

@@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'
VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
# 接口前缀
VITE_API_BASEPATH=/crm-api

1
src/views/Home/Comp/ChannelMonthly.vue
View File

@@ -17,6 +17,7 @@
:data="props.sourceOptions"
:props="defaultProps"
check-strictly
filterable
node-key="sourceId"
placeholder="请选择渠道"
/>

1
src/views/Home/Comp/ChannelPeriod.vue
View File

@@ -25,6 +25,7 @@
:data="props.sourceOptions"
:props="defaultProps"
check-strictly
filterable
node-key="sourceId"
placeholder="请选择渠道"
style="width: 100%"