修改自提以及订阅逻辑

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

@@ -186,8 +186,8 @@
       items: [], // 商品项列表
       price: {}, // 价格信息
     },
-	deliType:2,
+	  deliType:2,
-	pickUpInfo:{},//门店信息
+	  pickUpInfo:{},//门店信息
     addressInfo: {}, // 选择的收货地址
     showCoupon: false, // 是否展示优惠劵
     couponInfo: [], // 优惠劵列表
@@ -230,9 +230,18 @@
 
   // 提交订单
   function onConfirm() {
-    if (!state.addressInfo.id) {
+    console.log(state.deliType, '11111111111111111');
-      sheep.$helper.toast('请选择收货地址');
+
-      return;
+    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,

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();
+  // const { error, data } = await third.wechat.subscribeTemplate();
-  if (error === 0) {
+  // if (error === 0) {
-    subscribeEventList = data;
+  //   subscribeEventList = data;
-  }
+  // }
+  console.log('获取订阅消息模板');
 }
 
 // 订阅消息