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

Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

Browse Source 
# Conflicts:
#	.env.base
#	.env.front
dev-cl
caolin 2 months ago
parent b3435a9a86 3abe367954
commit 6a07c0c711
8 changed files with 9 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .env.base
  2. 2
      .env.dev
  3. 4
      .env.front
  4. 2
      .env.stage
  5. 2
      .env.static
  6. 2
      .env.test
  7. 1
      src/views/Home/Comp/ChannelMonthly.vue
  8. 1
      src/views/Home/Comp/ChannelPeriod.vue

2
.env.base
Unescape View File

@ -8,7 +8,7 @@ VITE_BASE_URL='http://localhost:48080'
#VITE_BASE_URL='http://114.55.169.15: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' # VITE_UPLOAD_URL='http://114.55.169.15:48080/admin-api/system/file/upload'
# 接口前缀 # 接口前缀

2
.env.dev
Unescape View File

@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://localhost: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 VITE_API_BASEPATH=/crm-api

4
.env.front
Unescape View File

@ -4,11 +4,11 @@ VITE_NODE_ENV=development
VITE_DEV=true 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_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 VITE_API_BASEPATH=/crm-api

2
.env.stage
Unescape View File

@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn' 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 VITE_API_BASEPATH=/crm-api

2
.env.static
Unescape View File

@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://localhost: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 VITE_API_BASEPATH=/crm-api

2
.env.test
Unescape View File

@ -7,7 +7,7 @@ VITE_DEV=false
VITE_BASE_URL='http://localhost: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 VITE_API_BASEPATH=/crm-api

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

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

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

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

Write Preview
Loading…
Cancel
Save