feat: 新增预售书重复购买提示

在结算页面中新增预售备注的弹窗功能，用户在结算时可查看相关备注信息。更新manifest.json中的版本号至1.2.87。

config/baseUrl.js

@@ -2,6 +2,7 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	//开发环境
+	// 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') {

manifest.json

@@ -13,8 +13,8 @@
         }
     ],
     "sassImplementationName" : "node-sass",
-    "versionName" : "1.2.84",
+    "versionName" : "1.2.87",
-    "versionCode" : 1284,
+    "versionCode" : 1287,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true

pages/acupoint/givenDegree.vue

@@ -66,11 +66,11 @@
 				SunList: {
 					title: '阳经',
 					vlue: '属性',
-					attribute: ['阳经', '属性', '大肠经(金)', '脾经(土)', '心(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'],
+					attribute: ['阳经', '属性', '大肠经(金)', '胃经(土)', '小肠(火)', '膀胱经(水)', '三焦经(冬至前相火,冬至后相水)', '胆经(木)'],
 					arry: [
 						['井', '金', '商阳(本穴)', '厉兑(子穴)', '少泽', '至阴(母穴)', '关冲(冬至后母穴)', '窍阴'],
 						['荥', '水', '二间(子穴)', '内庭(泄井当泄荥)', '前谷', '通谷(本穴)', '液门(冬至后本穴)', '侠溪(母穴)'],
-						['俞', '木', '三间', '陷谷', '后匾(母穴)', '束骨(子穴)', '中渚(冬至前回穴，冬至后子穴)', '临泣(本穴)'],
+						['俞', '木', '三间', '陷谷', '后溪(母穴)', '束骨(子穴)', '中渚(冬至前回穴，冬至后子穴)', '临泣(本穴)'],
 						['经', '火', '阳溪', '解溪(母穴)', '阳谷(本穴)', '昆仑', '支沟(冬至前本穴)', '阳辅(子穴)'],
 						['合', '土', '曲池(母穴)', '足三里(本穴)', '小海(子穴)', '委中(补井当补合)', '天井(冬至前子穴)', '阳陵泉'],
 						['原', '', '合谷', '冲阳', '腕骨', '京骨', '阳池', '丘墟'],

pages/bookShop/settlement.vue

@@ -374,6 +374,18 @@
       </view>
     </u-popup>
 
+    <u-modal
+      :show="presaleRemarkModalShow"
+      title="提示"
+      :content="presaleRemarkModalContent"
+      :showCancelButton="true"
+      confirmText="继续购买"
+      cancelText="取消"
+      @confirm="handlePresaleRemarkConfirm"
+      @cancel="handlePresaleRemarkCancel"
+      @close="handlePresaleRemarkCancel"
+    ></u-modal>
+
     <music-play :playData="playData"></music-play>
   </view>
 </template>
@@ -413,6 +425,9 @@ export default {
       realPrice: 0,
       payType: 1,
       nowClick: true,
+      presaleRemarkModalShow: false,
+      presaleRemarkModalContent: "",
+      presaleRemarkModalResolve: null,
       paylist: [
         {
           title: "支付宝",
@@ -556,6 +571,59 @@ export default {
       }
     },
     // 获取优惠券列表
+    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() {
+      const productIds = this.cartList
+        .map((e) => e.productId)
+        .filter((id) => id)
+        .join(",");
+      if (!productIds) {
+        return true;
+      }
+      try {
+        const res = await $http.request({
+          url: "book/buyOrder/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;
+      }
+    },
     getCourpe() {
       let proId = "";
       for (let i = 0; i < this.cartList.length; i++) {
@@ -894,7 +962,7 @@ export default {
       this.youhuiShow = false;
     },
     // 提交结算
-    goBuyJie() {
+    async goBuyJie() {
       if (this.addressList.length == 0) {
         this.dizhiShow = true; // 如果没有地址信息
         return;
@@ -923,6 +991,11 @@ export default {
           quantity: this.cartList[i].productAmount,
         });
       }
+      const passPresaleRemark = await this.checkPresaleRemark();
+      if (!passPresaleRemark) {
+        this.nowClick = true;
+        return;
+      }
       let data = {
         buyType: this.typeId, //0- 商品页直接下单  1- 购物车结算
         userId: this.userInfo.id, //下单人ID