From f1c2a6ef3735fb0de6952d499c7c7ae635caadfe Mon Sep 17 00:00:00 2001 From: shizhong <124974919@qq.com> Date: Mon, 11 Mar 2024 23:49:08 +0800 Subject: [PATCH] BUG --- package.json | 2 +- src/api/crm/contract/index.ts | 10 ---------- src/views/Login/components/LoginForm.vue | 1 - src/views/mall/promotion/bargain/activity/index.vue | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index fb1b4f6b..90c17598 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "vue-router": "^4.3.0", "vue-types": "^5.1.1", "vuedraggable": "^4.1.0", - "vxe-table": "^4.3.11", + "vxe-table": "4.4.7", "web-storage-cache": "^1.1.1", "xe-utils": "^3.5.7", "xml-js": "^1.6.11" diff --git a/src/api/crm/contract/index.ts b/src/api/crm/contract/index.ts index 4f566a3a..faee9495 100644 --- a/src/api/crm/contract/index.ts +++ b/src/api/crm/contract/index.ts @@ -112,13 +112,3 @@ export const getAuditContractCount = async () => { export const getRemindContractCount = async () => { return await request.get({ url: '/crm/contract/remind-count' }) } - -// 获得待审核合同数量 -export const getAuditContractCount = async () => { - return await request.get({ url: '/crm/contract/audit-count' }) -} - -// 获得即将到期(提醒)的合同数量 -export const getRemindContractCount = async () => { - return await request.get({ url: '/crm/contract/remind-count' }) -} diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index a6777204..563f5e87 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -215,7 +215,6 @@ const getTenantId = async () => { if (loginData.tenantEnable === 'true') { const res = await LoginApi.getTenantIdByNameApi(loginData.loginForm.tenantName) authUtil.setTenantId(res) - authUtil.setTenantName(loginData.loginForm.tenantName) } } // 记住我 diff --git a/src/views/mall/promotion/bargain/activity/index.vue b/src/views/mall/promotion/bargain/activity/index.vue index 789b9e25..2e4f1bf5 100644 --- a/src/views/mall/promotion/bargain/activity/index.vue +++ b/src/views/mall/promotion/bargain/activity/index.vue @@ -206,7 +206,7 @@ const handleClose = async (id: number) => { // 关闭的二次确认 await message.confirm('确认关闭该砍价活动吗?') // 发起关闭 - await BargainActivityApi.closeSeckillActivity(id) + await BargainActivityApi.closeBargainActivity(id) message.success('关闭成功') // 刷新列表 await getList()