Merge remote-tracking branch 'origin/master'

src/api/assistingAgriculture/shop.js

@@ -40,3 +40,27 @@ export function znsgyOrderCreate(data) {
     data,
   });
 }
+// 筑农首页-查询用户默认收货地址
+export function useraddrDefaultUserAddr(data) {
+  return request({
+    url: `/sgyrdd/useraddr/defaultUserAddr`,
+    method: 'GET',
+    data,
+  });
+}
+// 筑农首页-修改临时订单
+export function previewOrderBasketUpdate(data) {
+  return request({
+    url: `/sgyrdd/previewOrder/basket/update`,
+    method: 'POST',
+    data,
+  });
+}
+// 筑农首页-3、订单详情
+export function sgyOrderOrderInfo(data) {
+  return request({
+    url: `/sgyrdd/sgyOrder/orderInfo`,
+    method: 'GET',
+    data,
+  });
+}

src/pages/shop/confirmOrder.vue

@@ -231,6 +231,10 @@ function groupBuyConfirmFn(prodId, skuId) {
         res.data.orderItems[0].pic = imgUrl + res.data.orderItems[0].pic;
         orderInfo.value = res.data;
         resolve(res.data.shopId);
+      }else {
+        wx.showToast({
+          title:res.msg
+        })
       }
     });
   });