Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm

This commit is contained in:
puhui999 2024-05-01 14:52:16 +08:00
commit 51e6887bde
7 changed files with 9620 additions and 8 deletions

View File

@ -1,11 +1,10 @@
# 开发环境本地只启动前端项目依赖开发环境后端、APP
NODE_ENV=development
NODE_ENV=production
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# VITE_BASE_URL='http://dofast.demo.huizhizao.vip:20001'
# 文件上传类型server - 后端上传, client - 前端直连上传仅支持S3服务
VITE_UPLOAD_TYPE=server
@ -34,4 +33,4 @@ VITE_OUT_DIR=dist
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false
VITE_APP_CAPTCHA_ENABLE=true

1
.gitignore vendored
View File

@ -4,7 +4,6 @@ dist
dist-ssr
*.local
/dist*
*-lock.*
pnpm-debug
auto-*.d.ts
.idea

View File

@ -3,7 +3,6 @@
"christian-kohler.path-intellisense",
"vscode-icons-team.vscode-icons",
"davidanson.vscode-markdownlint",
"stylelint.vscode-stylelint",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"mrmlnc.vscode-less",

View File

@ -6,10 +6,10 @@
"private": false,
"scripts": {
"i": "pnpm install",
"dev": "vite --mode local-dev",
"dev": "vite",
"dev-server": "vite --mode dev",
"ts:check": "vue-tsc --noEmit",
"build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
"build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build",
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",

9614
pnpm-lock.yaml Normal file

File diff suppressed because it is too large Load Diff

View File

@ -151,6 +151,7 @@ import * as BargainActivityApi from '@/api/mall/promotion/bargain/bargainActivit
import BargainActivityForm from './BargainActivityForm.vue'
import { formatDate } from '@/utils/formatTime'
import { fenToYuanFormat } from '@/utils/formatter'
import { closeBargainActivity } from '@/api/mall/promotion/bargain/bargainActivity'
defineOptions({ name: 'PromotionBargainActivity' })
@ -206,7 +207,7 @@ const handleClose = async (id: number) => {
//
await message.confirm('确认关闭该砍价活动吗?')
//
await BargainActivityApi.closeSeckillActivity(id)
await BargainActivityApi.closeBargainActivity(id)
message.success('关闭成功')
//
await getList()