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

.env.dev

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

.gitignore

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

.vscode/extensions.json

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

package.json

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

src/views/mall/promotion/bargain/activity/index.vue

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