Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

.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",

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()