From 7f2456c0f4986f865d31e1d086c9996a2ef3a4cb Mon Sep 17 00:00:00 2001
From: "lenovo008\\lenovo" <lenovo008>
Date: Tue, 23 Jul 2024 17:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E8=AE=A2=E9=98=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-mall-uniapp-master/.env.development     |  4 ++--
 .../pages/order/confirm.vue                   | 21 +++++++++++++------
 .../platform/provider/wechat/miniProgram.js   |  9 ++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/yudao-mall-uniapp-master/.env.development b/yudao-mall-uniapp-master/.env.development
index f3113de..7854d99 100644
--- a/yudao-mall-uniapp-master/.env.development
+++ b/yudao-mall-uniapp-master/.env.development
@@ -1,5 +1,5 @@
  # SHOPRO_DEV_BASE_URL = https://yanghaodong.51vip.biz
- SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080
+#  SHOPRO_DEV_BASE_URL = http://192.168.1.114:48080
 
  # 线上地址
- # SHOPRO_DEV_BASE_URL = https://zda.huamar.com
\ No newline at end of file
+ SHOPRO_DEV_BASE_URL = https://zda.huamar.com
\ No newline at end of file
diff --git a/yudao-mall-uniapp-master/pages/order/confirm.vue b/yudao-mall-uniapp-master/pages/order/confirm.vue
index 908cc97..9b2fbcf 100644
--- a/yudao-mall-uniapp-master/pages/order/confirm.vue
+++ b/yudao-mall-uniapp-master/pages/order/confirm.vue
@@ -186,8 +186,8 @@
       items: [], // 商品项列表
       price: {}, // 价格信息
     },
-	deliType:2,
-	pickUpInfo:{},//门店信息
+	  deliType:2,
+	  pickUpInfo:{},//门店信息
     addressInfo: {}, // 选择的收货地址
     showCoupon: false, // 是否展示优惠劵
     couponInfo: [], // 优惠劵列表
@@ -230,9 +230,18 @@
 
   // 提交订单
   function onConfirm() {
-    if (!state.addressInfo.id) {
-      sheep.$helper.toast('请选择收货地址');
-      return;
+    console.log(state.deliType, '11111111111111111');
+
+    if (state.deliType == 1) {
+      if (!state.addressInfo.id) {
+        sheep.$helper.toast('请选择收货地址');
+        return;
+     }
+    }else{
+      if (!state.pickUpInfo.id) {
+        sheep.$helper.toast('请选择自提门店');
+        return;
+      }
     }
     submitOrder();
   }
@@ -250,7 +259,7 @@
       items: state.orderPayload.items,
       couponId: state.orderPayload.couponId,
       addressId: state.deliType === 1 ? state.addressInfo.id: null,
-	  pickUpStoreId:state.deliType === 2 ? state.pickUpInfo.id : null,
+	    pickUpStoreId:state.deliType === 2 ? state.pickUpInfo.id : null,
       deliveryType: state.deliType, // TODO 芋艿：需要支持【门店自提】
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
       combinationActivityId: state.orderPayload.combinationActivityId,
diff --git a/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js b/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js
index a5b64b0..754b37e 100644
--- a/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js
+++ b/yudao-mall-uniapp-master/sheep/platform/provider/wechat/miniProgram.js
@@ -164,10 +164,11 @@ const checkUpdate = async (silence = true) => {
 
 // 获取订阅消息模板
 async function getSubscribeTemplate() {
-  const { error, data } = await third.wechat.subscribeTemplate();
-  if (error === 0) {
-    subscribeEventList = data;
-  }
+  // const { error, data } = await third.wechat.subscribeTemplate();
+  // if (error === 0) {
+  //   subscribeEventList = data;
+  // }
+  console.log('获取订阅消息模板');
 }
 
 // 订阅消息