From 33b6a3ea7d99ff04548a93e7c18a9a2318681b29 Mon Sep 17 00:00:00 2001 From: xcbyy <2578898740@qq.com> Date: Wed, 21 Oct 2026 18:03:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(activity):=20=E5=8F=91=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=BB=84=E5=B1=80=E4=B8=8E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=B4=BE=E5=8D=95=E5=85=A5=E5=8F=A3=EF=BC=8C=E6=8E=A5=E5=8D=95?= =?UTF-8?q?=E5=A4=A7=E5=8E=85=E5=B1=95=E7=A4=BA=E9=99=84=E8=BF=91=E7=BB=84?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除附近活动页顶部单独的派单按钮(入口重复) - 「我要发单」新增发布类型切换:发起组局 / 平台派单,派单模式填预算与时长并内联拉起支付,支付成功进入待接单池 - 接单大厅新增「附近组局(可报名)」区块,展示招募中的组局并可进入详情报名 - 113 套件/738 用例全绿 --- .../src/views/banner/manage/index.vue | 2 +- .../src/views/banner/nav-category/index.vue | 2 +- .../src/views/finance/coupons/index.vue | 2 +- .../views/finance/recharge-tiers/index.vue | 2 +- .../views/safety/platform-config/index.vue | 5 +- .../src/views/user/list/index.vue | 2 +- pwuniapp/pages/activity/create.vue | 188 +++++++++++++++++- pwuniapp/pages/activity/list.vue | 49 ----- pwuniapp/pages/expert/hall.vue | 101 +++++++++- server/tests/admin-balance-adjust.spec.ts | 18 ++ 10 files changed, 307 insertions(+), 64 deletions(-) diff --git a/admin/arco-design-pro-vite/src/views/banner/manage/index.vue b/admin/arco-design-pro-vite/src/views/banner/manage/index.vue index 8291d16..95271c8 100644 --- a/admin/arco-design-pro-vite/src/views/banner/manage/index.vue +++ b/admin/arco-design-pro-vite/src/views/banner/manage/index.vue @@ -295,7 +295,7 @@ loading.value = true; try { const res: any = await axios.get('/api/admin/banners'); - if (res && res.data && res.data.code === 20000) { + if (res && res.code === 20000) { bannerList.value = res.data.data; } else if (Array.isArray(res.data)) { bannerList.value = res.data; diff --git a/admin/arco-design-pro-vite/src/views/banner/nav-category/index.vue b/admin/arco-design-pro-vite/src/views/banner/nav-category/index.vue index 3d1f9b2..c240b7e 100644 --- a/admin/arco-design-pro-vite/src/views/banner/nav-category/index.vue +++ b/admin/arco-design-pro-vite/src/views/banner/nav-category/index.vue @@ -259,7 +259,7 @@ loading.value = true; try { const res: any = await axios.get('/api/admin/nav-categories'); - if (res && res.data && res.data.code === 20000) { + if (res && res.code === 20000) { categoryList.value = res.data.data; } else if (Array.isArray(res.data)) { categoryList.value = res.data; diff --git a/admin/arco-design-pro-vite/src/views/finance/coupons/index.vue b/admin/arco-design-pro-vite/src/views/finance/coupons/index.vue index ace970a..cef5d64 100644 --- a/admin/arco-design-pro-vite/src/views/finance/coupons/index.vue +++ b/admin/arco-design-pro-vite/src/views/finance/coupons/index.vue @@ -237,7 +237,7 @@ loading.value = true; try { const res: any = await axios.get('/api/admin/coupons'); - if (res && res.data && res.data.code === 20000) { + if (res && res.code === 20000) { couponList.value = res.data.data; } else if (Array.isArray(res.data)) { couponList.value = res.data; diff --git a/admin/arco-design-pro-vite/src/views/finance/recharge-tiers/index.vue b/admin/arco-design-pro-vite/src/views/finance/recharge-tiers/index.vue index 6679603..9651b62 100644 --- a/admin/arco-design-pro-vite/src/views/finance/recharge-tiers/index.vue +++ b/admin/arco-design-pro-vite/src/views/finance/recharge-tiers/index.vue @@ -174,7 +174,7 @@ loading.value = true; try { const res: any = await axios.get('/api/admin/recharge-tiers'); - if (res && res.data && res.data.code === 20000) { + if (res && res.code === 20000) { tierList.value = res.data.data; } else if (Array.isArray(res.data)) { tierList.value = res.data; diff --git a/admin/arco-design-pro-vite/src/views/safety/platform-config/index.vue b/admin/arco-design-pro-vite/src/views/safety/platform-config/index.vue index 0fdde4e..9e0f6a4 100644 --- a/admin/arco-design-pro-vite/src/views/safety/platform-config/index.vue +++ b/admin/arco-design-pro-vite/src/views/safety/platform-config/index.vue @@ -1712,10 +1712,7 @@ const saveConfig = async (key: string, form: any) => { valueJson: form.valueJson }; const res: any = await axios.put(`/api/admin/system/configs/${key}`, payload); - const isSuccess = - (res && res.code === 20000) || - (res && res.status === 200) || - (res && res.data && res.data.code === 20000); + const isSuccess = Boolean(res && (res.code === 20000 || res.status === 200)); if (isSuccess) { Message.success('配置已保存并同步至小程序端'); diff --git a/admin/arco-design-pro-vite/src/views/user/list/index.vue b/admin/arco-design-pro-vite/src/views/user/list/index.vue index fdfc798..a23863d 100644 --- a/admin/arco-design-pro-vite/src/views/user/list/index.vue +++ b/admin/arco-design-pro-vite/src/views/user/list/index.vue @@ -703,7 +703,7 @@ direction: balanceForm.value.direction, reason: balanceForm.value.reason, }); - if (res && res.data && res.data.code === 20000) { + if (res && res.code === 20000) { Message.success(res.data.message || '余额调整成功'); balanceModalVisible.value = false; await fetchUsers(); diff --git a/pwuniapp/pages/activity/create.vue b/pwuniapp/pages/activity/create.vue index 2e4c6ca..a96de57 100644 --- a/pwuniapp/pages/activity/create.vue +++ b/pwuniapp/pages/activity/create.vue @@ -1,7 +1,27 @@