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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ addressData.address }}
-
- {{ addressData.consigneeName }}
- {{ addressData.consigneePhone }}
-
-
-
-
-
- 请添加收件地址
-
-
-
-
-
-
-
-
-
-
-
- VIP优惠
-
-
-
-
- {{ v.productName }}
-
-
- ¥{{ v.vipPrice.toFixed(2) }}
- VIP到手价
- ¥{{ Number(v.price).toFixed(2) }}
-
-
-
- ¥{{ v.activityPrice.toFixed(2) }}
- 活动价
- ¥{{ Number(v.price).toFixed(2) }}
-
-
- ¥{{ Number(v.price).toFixed(2) }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ v.text }}
-
-
-
- {{ remark == "" ? v.placeholder : remark }}
-
-
-
-
-
-
-
-
-
-
- 价格明细
-
-
-
-
-
-
-
-
-
- {{ v.text }}
-
- (全部积分:{{ initData.user.jf }})
-
-
- VIP
- 专享立减
- {{ v.text }}
-
-
- ¥{{ totalPrice }}
-
-
- ¥{{
- isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
- }}
-
-
- -¥{{ jfNumberShow }}
-
-
- - ¥{{ districtAmount.toFixed(2) }}
-
-
- - ¥{{ vipPrice.toFixed(2) }}
-
-
-
-
-
-
- 可用积分({{ jfNumberMax }}分)
-
-
-
-
-
-
-
-
-
- 支付方式
-
-
-
-
-
-
-
- {{ v.text }}
-
- (余额:{{
- initData && initData.user ? initData.user.peanutCoin : 0
- }})
-
-
- {{ v.text }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确保您的天医币足够支付
-
-
- 立即充值
-
-
-
- 说明
- 1. 1天医币 = 1元人民币
-
- 2.若有疑问或意见请致电客服
- 022-24142321
-
-
-
-
- 3.非中国大陆用户可以信用卡支付。简单快捷,推荐使用!
- 支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
-
- publisher@tmrjournals.com
-
- (点击复制)发送支付请求,内容需包含:拟购买的课程名称、支付金额、APP注册姓名及手机号码,或者加一路健康客服微信(
-
- yilujiankangkefu )(点击复制)联系我们,我们将在24小时内向您的邮箱或者微信发送支付链接,根据提示即可完成信用卡支付,无需兑换外币。
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 共{{ orderNumber }}件
- 合计:
-
- ¥{{ actualPayment }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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",