From bb1d9ef2817eed4620b9055774041dc201a634ba Mon Sep 17 00:00:00 2001 From: chenghuan Date: Wed, 25 Mar 2026 11:39:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=A2=84=E5=94=AE?= =?UTF-8?q?=E4=B9=A6=E9=87=8D=E5=A4=8D=E8=B4=AD=E4=B9=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将manifest.json中的版本号更新至1.0.60 - 在订单提交页面中新增预售备注弹窗功能，支持用户确认预售备注 - 添加presaleRemark API接口以获取预售备注内容 - 删除不再使用的订单页面副本文件 --- manifest.json | 4 +- .../commonComponents/orderSubmit.vue | 75 + pages/goods/order/index copy.vue | 2596 ----------------- pages/goods/order/index.vue | 1 + 4 files changed, 78 insertions(+), 2598 deletions(-) delete mode 100644 pages/goods/order/index copy.vue diff --git a/manifest.json b/manifest.json index d0834c2..eac0803 100644 --- a/manifest.json +++ b/manifest.json @@ -13,8 +13,8 @@ "src" : "图片路径" } ], - "versionName" : "1.0.59", - "versionCode" : 1059, + "versionName" : "1.0.60", + "versionCode" : 1060, "app-plus" : { "nvueCompiler" : "weex", "compatible" : { diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue index c7f292d..aa8ac14 100644 --- a/pages/component/commonComponents/orderSubmit.vue +++ b/pages/component/commonComponents/orderSubmit.vue @@ -520,6 +520,17 @@ + @@ -621,6 +632,9 @@ export default { orderModalShowInfo: {}, orderModalShow: false, + presaleRemarkModalShow: false, + presaleRemarkModalContent: "", + presaleRemarkModalResolve: null, payType: 1, freightNum: 0, addressData: { @@ -1344,6 +1358,62 @@ export default { this.content = this.remark; } }, + openPresaleRemarkModal(content) { + this.presaleRemarkModalContent = content; + this.presaleRemarkModalShow = true; + return new Promise((resolve) => { + this.presaleRemarkModalResolve = resolve; + }); + }, + handlePresaleRemarkConfirm() { + this.presaleRemarkModalShow = false; + if (this.presaleRemarkModalResolve) { + const resolve = this.presaleRemarkModalResolve; + this.presaleRemarkModalResolve = null; + resolve(true); + } + }, + handlePresaleRemarkCancel() { + this.presaleRemarkModalShow = false; + if (this.presaleRemarkModalResolve) { + const resolve = this.presaleRemarkModalResolve; + this.presaleRemarkModalResolve = null; + resolve(false); + } + }, + async checkPresaleRemark() { + if (this.pageType != "goods") { + return true; + } + const productIds = this.goodsDataList + .map((e) => e.productId) + .filter((id) => id) + .join(","); + if (!productIds || !this.urlList.presaleRemark) { + return true; + } + try { + const res = await this.$http.request({ + url: `${this.urlList.presaleRemark}`, + method: "POST", + data: { + productIds, + }, + header: { + "Content-Type": "application/json", + }, + }); + const remark = + res && typeof res.remark == "string" ? res.remark.trim() : ""; + if (!remark) { + return true; + } + return await this.openPresaleRemarkModal(remark); + } catch (error) { + console.log("presaleRemark error:", error); + return true; + } + }, async goBuyJie() { if (this.pageType == "vip") { if (this.radioValue != "1") { @@ -1449,6 +1519,11 @@ export default { }); thisproduct = thisproduct.join(","); } + const passPresaleRemark = await this.checkPresaleRemark(); + if (!passPresaleRemark) { + this.buyingFlag = false; + return; + } if ( this.historyOrderInfo && thisproduct == this.historyOrderInfo.product && diff --git a/pages/goods/order/index copy.vue b/pages/goods/order/index copy.vue deleted file mode 100644 index 6c8eed0..0000000 --- a/pages/goods/order/index copy.vue +++ /dev/null @@ -1,2596 +0,0 @@ - - - - - diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue index d805fc5..8a38c64 100644 --- a/pages/goods/order/index.vue +++ b/pages/goods/order/index.vue @@ -145,6 +145,7 @@ export default { list: "app/phone.do?getCourseDetail_new", initPrepareOrder: "common/buyOrder/initPrepareOrder", buyOrder: "book/buyOrder/placeOrder", + presaleRemark: "book/buyOrder/presaleRemark", curriculumInfo: "app/phone.do?getCourseInfo", detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new", userInfo: "common/user/getUserInfo",