From db430a0061ea0beab57bcc3e0c959d75301cf058 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 29 May 2023 21:49:25 +0800
Subject: [PATCH] 自提购买的优化

---
 packageC/pages/presell/cart/cart2.js         | 2 +-
 packageE/pages/cart/cart2/cart2.js           | 2 +-
 packageE/pages/cart/cart2_inte/cart2_inte.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js
index bd07a8e..098213e 100644
--- a/packageC/pages/presell/cart/cart2.js
+++ b/packageC/pages/presell/cart/cart2.js
@@ -1116,7 +1116,7 @@ Page({
         //------------立即购买-------------
         if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
 
-            if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
+            if( [0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
                 ff = false;
                 getApp().my_warnning("请选择收货地址", 0, th);
                 th.data.is_summit_ing = 0;
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 532e9bc..1185fa2 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -3815,7 +3815,7 @@ Page({
     var ff = true;
     //------------立即购买-------------
     if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
-      if ( [0,2].indexOf(th.data.bn_exp_typ) == -1 && th.data.user_addr == null) {
+      if ( [0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
         ff = false;
         getApp().my_warnning("请选择收货地址", 0, th);
         th.data.is_summit_ing = 0;
diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js
index 0205213..2d32fac 100644
--- a/packageE/pages/cart/cart2_inte/cart2_inte.js
+++ b/packageE/pages/cart/cart2_inte/cart2_inte.js
@@ -639,6 +639,7 @@ Page({
   //---------计算立即购买----------
   calculatePrice2:async function () {
     var th = this, good = this.data.bn_goods;
+    if(!good) {return false }
 
     this.setData({submit:1})
     wx.showLoading({ title: "处理中.", mask:true })
@@ -1080,7 +1081,7 @@ Page({
     //------------立即购买-------------
     if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) {
 
-      if (th.data.bn_exp_type == 0 && th.data.user_addr == null) {
+      if ([0,2].indexOf(th.data.bn_exp_type)>-1 && th.data.user_addr == null) {
         ff = false; getApp().my_warnning("请选择收货地址", 0, th);
         th.data.is_summit_ing = 0;
       }
--
libgit2 0.21.4