Merge remote-tracking branch 'origin/master'

pull/551/head
痴货 2024-08-27 12:13:56 +08:00
commit f542fda3d3
3 changed files with 14 additions and 9 deletions

View File

@ -3,13 +3,13 @@ NODE_ENV=production
VITE_DEV=true VITE_DEV=true
# 请求路径 # 请求路径VITE_BASE_URL='http://saas.yibeidl.cn'
VITE_BASE_URL='http://saas.yibeidl.cn' VITE_BASE_URL='http://100.98.30.68:48080'
# 文件上传类型server - 后端上传, client - 前端直连上传仅支持S3服务 # 文件上传类型server - 后端上传, client - 前端直连上传仅支持S3服务
VITE_UPLOAD_TYPE=server VITE_UPLOAD_TYPE=server
# 上传路径 # 上传路径VITE_UPLOAD_URL='http://saas.yibeidl.cn/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://saas.yibeidl.cn/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://100.98.30.68:48080/admin-api/infra/file/upload'
# 接口地址 # 接口地址
VITE_API_URL=/admin-api VITE_API_URL=/admin-api
@ -29,8 +29,8 @@ VITE_BASE_PATH=/
# 输出路径 # 输出路径
VITE_OUT_DIR=dist VITE_OUT_DIR=dist
# 商城H5会员端域名 # 商城H5会员端域名VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' VITE_MALL_H5_DOMAIN='http://100.98.30.68:48080'
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true VITE_APP_CAPTCHA_ENABLE=true

View File

@ -5,13 +5,13 @@ VITE_DEV=true
# 请求路径VITE_BASE_URL='http://localhost:48080' # 请求路径VITE_BASE_URL='http://localhost:48080'
# 请求路径 # 请求路径
VITE_BASE_URL='http://saas.yibeidl.cn' VITE_BASE_URL='http://100.98.30.68:48080'
# 文件上传类型server - 后端上传, client - 前端直连上传,仅支持 S3 服务 # 文件上传类型server - 后端上传, client - 前端直连上传,仅支持 S3 服务
VITE_UPLOAD_TYPE=server VITE_UPLOAD_TYPE=server
# 上传路径VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' # 上传路径VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 上传路径 # 上传路径
VITE_UPLOAD_URL='http://saas.yibeidl.cn/admin-api/infra/file/upload' VITE_UPLOAD_URL='http://100.98.30.68:48080/admin-api/infra/file/upload'
# 接口地址 # 接口地址
VITE_API_URL=/admin-api VITE_API_URL=/admin-api
@ -29,7 +29,7 @@ VITE_SOURCEMAP=false
VITE_BASE_PATH=/ VITE_BASE_PATH=/
# 商城H5会员端域名 # 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://localhost:3000' VITE_MALL_H5_DOMAIN='http://100.98.30.68:48080'
# 验证码的开关 # 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false VITE_APP_CAPTCHA_ENABLE=false

View File

@ -147,6 +147,11 @@ export const APP_LINK_GROUP_LIST = [
name: '文章详情', name: '文章详情',
path: '/pages/public/richtext', path: '/pages/public/richtext',
type: APP_LINK_TYPE_ENUM.ARTICLE_DETAIL type: APP_LINK_TYPE_ENUM.ARTICLE_DETAIL
},
{
name: '砍价',
path: '/pages/bargain/index',
type: APP_LINK_TYPE_ENUM.ARTICLE_DETAIL
} }
] ]
}, },