From ff38cf52b4bfb3d568db18e7eeb7dd38df76acb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com> Date: Fri, 18 Sep 2026 17:50:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(distribution):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=BC=8F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/views/distribution/distributionRecruit.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manager/src/views/distribution/distributionRecruit.vue b/manager/src/views/distribution/distributionRecruit.vue index 014889c4b..1d2289c7c 100644 --- a/manager/src/views/distribution/distributionRecruit.vue +++ b/manager/src/views/distribution/distributionRecruit.vue @@ -103,6 +103,9 @@ 手动申请 满足条件自动申请 +
+ 达标后系统自动提交申请。若配置了分销推广服务协议，系统将视为已同意。 +
需要填写申请信息
申请人需填写对应字段，方便审核分销员信息。
@@ -166,6 +169,9 @@ +
+ 自动申请模式下，达标后系统自动提交并视为已同意协议。 +
保存 From 54c72239d472cf595e081f1f4749dcafe90fc98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E9=A6=99=E7=90=AA?= <624506849@qq.com> Date: Thu, 24 Sep 2026 17:45:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(page-decoration):=20=E7=94=A8=20be?= =?UTF-8?q?foreRelease=20=E6=9B=BF=E6=8D=A2=E5=8F=91=E5=B8=83=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 楼层与移动端装修列表改用 before-change，避免开关被直接切换 - 唯一页面禁止关闭，已开启页面提示改开其他页 - 按接口成功/失败再决定是否切换开关 --- .../src/views/page-decoration/floorList.vue | 29 ++++++++++++----- .../src/views/page-decoration/wap/wapList.vue | 31 +++++++++++++------ seller/src/api/common.js | 2 +- seller/src/views/shop/floorList.vue | 29 ++++++++++++----- seller/src/views/shop/wap/wapList.vue | 31 +++++++++++++------ 5 files changed, 89 insertions(+), 33 deletions(-) diff --git a/manager/src/views/page-decoration/floorList.vue b/manager/src/views/page-decoration/floorList.vue index 3f8b51978..45be7eafd 100644 --- a/manager/src/views/page-decoration/floorList.vue +++ b/manager/src/views/page-decoration/floorList.vue @@ -32,7 +32,7 @@ inline-prompt active-text="开" inactive-text="关" - @change="releaseTemplate(row.id)" + :before-change="() => beforeRelease(row)" /> @@ -200,12 +200,27 @@ export default { }); }, - releaseTemplate(id) { - API_floor.releasePageHome(id).then((res) => { - if (res.success) { - this.$Message.success("发布模板成功"); - this.getTemplateList(); - } + beforeRelease(row) { + if (row.pageShow) { + this.$Message.warning( + this.total === 1 + ? "当前为唯一页面，无法关闭" + : "请直接开启其他页面，当前页面会自动关闭" + ); + return false; + } + return new Promise((resolve, reject) => { + API_floor.releasePageHome(row.id).then((res) => { + if (res && res.success) { + this.$Message.success("发布模板成功"); + resolve(true); + this.getTemplateList(); + } else { + reject(new Error("release failed")); + } + }).catch(() => { + reject(new Error("release failed")); + }); }); }, confirmDel(id) { diff --git a/manager/src/views/page-decoration/wap/wapList.vue b/manager/src/views/page-decoration/wap/wapList.vue index 872f3a1cd..8d9a602d4 100644 --- a/manager/src/views/page-decoration/wap/wapList.vue +++ b/manager/src/views/page-decoration/wap/wapList.vue @@ -27,7 +27,7 @@ inline-prompt active-text="开" inactive-text="关" - @change="changeSwitch(row)" + :before-change="() => beforeRelease(row)" /> @@ -107,14 +107,27 @@ export default { this.params.pageNumber = val; this.init(); }, - changeSwitch(item) { - this.loading = true; - API_Other.releasePageHome(item.id).then((res) => { - this.loading = false; - if (res.result) { - this.$Message.success("发布成功"); - this.init(); - } + beforeRelease(row) { + if (row.pageShow) { + this.$Message.warning( + this.total === 1 + ? "当前为唯一页面，无法关闭" + : "请直接开启其他页面，当前页面会自动关闭" + ); + return false; + } + return new Promise((resolve, reject) => { + API_Other.releasePageHome(row.id).then((res) => { + if (res && res.success) { + this.$Message.success("发布成功"); + resolve(true); + this.init(); + } else { + reject(new Error("release failed")); + } + }).catch(() => { + reject(new Error("release failed")); + }); }); }, init() { diff --git a/seller/src/api/common.js b/seller/src/api/common.js index c9d82feaf..ed14667f0 100644 --- a/seller/src/api/common.js +++ b/seller/src/api/common.js @@ -1,4 +1,4 @@ -import { sellerUrl, getRequest, uploadFileRequest, uploadFile, request} from "@/libs/axios"; +import { sellerUrl, getRequest, uploadFileRequest, uploadFile } from "@/libs/axios"; // 通过id获取子地区 export const getChildRegion = (id) => { diff --git a/seller/src/views/shop/floorList.vue b/seller/src/views/shop/floorList.vue index 63f3786cf..aadcfa821 100644 --- a/seller/src/views/shop/floorList.vue +++ b/seller/src/views/shop/floorList.vue @@ -31,7 +31,7 @@ inline-prompt active-text="开" inactive-text="关" - @change="releaseTemplate(row.id)" + :before-change="() => beforeRelease(row)" /> @@ -195,12 +195,27 @@ export default { }); }, - releaseTemplate(id) { - API_floor.releasePageHome(id).then((res) => { - if (res.success) { - this.$Message.success("发布模板成功"); - this.getTemplateList(); - } + beforeRelease(row) { + if (row.pageShow) { + this.$Message.warning( + this.total === 1 + ? "当前为唯一页面，无法关闭" + : "请直接开启其他页面，当前页面会自动关闭" + ); + return false; + } + return new Promise((resolve, reject) => { + API_floor.releasePageHome(row.id).then((res) => { + if (res && res.success) { + this.$Message.success("发布模板成功"); + resolve(true); + this.getTemplateList(); + } else { + reject(new Error("release failed")); + } + }).catch(() => { + reject(new Error("release failed")); + }); }); }, confirmDel(id) { diff --git a/seller/src/views/shop/wap/wapList.vue b/seller/src/views/shop/wap/wapList.vue index b3cbb9842..c9828fbf5 100644 --- a/seller/src/views/shop/wap/wapList.vue +++ b/seller/src/views/shop/wap/wapList.vue @@ -26,7 +26,7 @@ inline-prompt active-text="开" inactive-text="关" - @change="changeSwitch(row)" + :before-change="() => beforeRelease(row)" /> @@ -106,14 +106,27 @@ export default { this.params.pageNumber = val; this.init(); }, - changeSwitch(item) { - this.loading = true; - API_Other.releasePageHome(item.id).then((res) => { - this.loading = false; - if (res.result) { - this.$Message.success("发布成功"); - this.init(); - } + beforeRelease(row) { + if (row.pageShow) { + this.$Message.warning( + this.total === 1 + ? "当前为唯一页面，无法关闭" + : "请直接开启其他页面，当前页面会自动关闭" + ); + return false; + } + return new Promise((resolve, reject) => { + API_Other.releasePageHome(row.id).then((res) => { + if (res && res.success) { + this.$Message.success("发布成功"); + resolve(true); + this.init(); + } else { + reject(new Error("release failed")); + } + }).catch(() => { + reject(new Error("release failed")); + }); }); }, init() {