Skip to content

Commit 51e6887

Browse files
author
puhui999
committed
Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm
2 parents 1f1ac1f + bde5597 commit 51e6887

File tree

7 files changed

+9620
-8
lines changed

7 files changed

+9620
-8
lines changed

.env.dev

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# 开发环境:本地只启动前端项目,依赖开发环境(后端、APP)
2-
NODE_ENV=development
2+
NODE_ENV=production
33

44
VITE_DEV=true
55

66
# 请求路径
77
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
8-
# VITE_BASE_URL='http://dofast.demo.huizhizao.vip:20001'
98

109
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
1110
VITE_UPLOAD_TYPE=server
@@ -34,4 +33,4 @@ VITE_OUT_DIR=dist
3433
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
3534

3635
# 验证码的开关
37-
VITE_APP_CAPTCHA_ENABLE=false
36+
VITE_APP_CAPTCHA_ENABLE=true
File renamed without changes.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ dist
44
dist-ssr
55
*.local
66
/dist*
7-
*-lock.*
87
pnpm-debug
98
auto-*.d.ts
109
.idea

.vscode/extensions.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"christian-kohler.path-intellisense",
44
"vscode-icons-team.vscode-icons",
55
"davidanson.vscode-markdownlint",
6-
"stylelint.vscode-stylelint",
76
"dbaeumer.vscode-eslint",
87
"esbenp.prettier-vscode",
98
"mrmlnc.vscode-less",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"private": false,
77
"scripts": {
88
"i": "pnpm install",
9-
"dev": "vite --mode local-dev",
9+
"dev": "vite",
1010
"dev-server": "vite --mode dev",
1111
"ts:check": "vue-tsc --noEmit",
12-
"build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
12+
"build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build",
1313
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
1414
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
1515
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",

0 commit comments

Comments
 (0)