diff --git a/config/baseUrl.js b/config/baseUrl.js index fbdb4ce..5d6c175 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -2,8 +2,9 @@ let baseUrl = ""; let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 - baseUrl = "https://api.nuttyreading.com/"; //线上正式' - // baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 + // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试 + // baseUrl = "https://api.nuttyreading.com/"; //线上正式' + baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 } else if (process.env.NODE_ENV === 'production') { // 生产环境11 baseUrl = "https://api.nuttyreading.com/"; //线上正式 diff --git a/manifest.json b/manifest.json index 754ff17..8c5ef9a 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "2.0.45", - "versionCode" : 2045, + "versionName" : "2.0.46", + "versionCode" : 2046, "sassImplementationName" : "node-sass", "app-plus" : { "nvueCompiler" : "uni-app", diff --git a/pages/component/commonComponents/orderSubmit.vue b/pages/component/commonComponents/orderSubmit.vue index cd8c42c..b1044f4 100644 --- a/pages/component/commonComponents/orderSubmit.vue +++ b/pages/component/commonComponents/orderSubmit.vue @@ -519,6 +519,17 @@ + @@ -616,6 +627,9 @@ orderModalShowInfo: {}, orderModalShow: false, + presaleRemarkModalShow: false, + presaleRemarkModalContent: "", + presaleRemarkModalResolve: null, payType: 1, freightNum: 0, addressData: { @@ -1350,6 +1364,62 @@ 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") { @@ -1457,6 +1527,11 @@ }); thisproduct = thisproduct.join(","); } + const passPresaleRemark = await this.checkPresaleRemark(); + if (!passPresaleRemark) { + this.buyingFlag = false; + return; + } if ( this.historyOrderInfo && thisproduct == this.historyOrderInfo.product && @@ -2437,4 +2512,4 @@ font-size: 24rpx; } - \ No newline at end of file + diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index e69eb90..4353c4f 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -1308,7 +1308,7 @@ }); const joinedText = this.textList.join('/'); - this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益'; + this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益(不包含论坛)'; } }) }, diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue index 5fbd643..d829868 100644 --- a/pages/goods/order/index.vue +++ b/pages/goods/order/index.vue @@ -132,6 +132,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", diff --git a/pages/medicaldes/medicaldes.vue b/pages/medicaldes/medicaldes.vue index eaae000..fb8978b 100644 --- a/pages/medicaldes/medicaldes.vue +++ b/pages/medicaldes/medicaldes.vue @@ -1,23 +1,32 @@