修改自提以及订阅逻辑

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
+ SHOPRO_DEV_BASE_URL = https://zda.huamar.com

yudao-mall-uniapp-master/pages/order/confirm.vue

@@ -230,10 +230,19 @@
 
   // 提交订单
   function onConfirm() {
+    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();
   }
   //是否自提

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('获取订阅消息模板');
 }
 
 // 订阅消息