diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index ca144a0..58a5660 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -1020,35 +1020,55 @@ Page({
       success: function (t) {
         console.log(t);
         if (t.data.code == 0) {
+
+          var p_fail=0;
+
           if (t.data.data.is_on_sale != 1) {
+            p_fail=1;
             wx.showModal({
               title: '商品已经下架',
               showCancel: !1,
               complete: function () {
-                wx.navigateBack();
+                let pages = getCurrentPages();
+                if (pages[pages.length - 2]) {
+                  wx.navigateBack();
+                } else {
+                  getApp().goto('/pages/index/index/index')
+                }
               }
             });
+
           }
 
           var timestamp = Date.parse(new Date());
           timestamp = timestamp / 1000;
-          if (t.data.data.on_time > timestamp) {
+          if (t.data.data.on_time > timestamp && !p_fail) {
             wx.showModal({
               title: '商品还未上架',
               showCancel: !1,
               complete: function () {
-                wx.navigateBack();
+                let pages = getCurrentPages();
+                if (pages[pages.length - 2]) {
+                  wx.navigateBack();
+                } else {
+                  getApp().goto('/pages/index/index/index')
+                }
               }
             });
           }
 
-          if (t.data.data.down_time > 0) {
+          if (t.data.data.down_time > 0 && !p_fail) {
             if (t.data.data.down_time < timestamp) {
               wx.showModal({
                 title: '商品已经到期下架',
                 showCancel: !1,
                 complete: function () {
-                  wx.navigateBack();
+                  let pages = getCurrentPages();
+                  if (pages[pages.length - 2]) {
+                    wx.navigateBack();
+                  } else {
+                    getApp().goto('/pages/index/index/index')
+                  }
                 }
               });
             }
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index a17f0d3..7c75c38 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -761,34 +761,54 @@ Page({
         success: function (t) {
           console.log(t);
           if (t.data.code == 0) {
+
+            var p_fail=0;
+
             if (t.data.data.is_on_sale != 1) {
+
+              p_fail=1;
               wx.showModal({
                 title: '商品已经下架',
                 showCancel: !1,
                 complete: function () {
-                  wx.navigateBack();
+                       let pages = getCurrentPages();
+                        if (pages[pages.length - 2]) {
+                          wx.navigateBack();
+                        } else {
+                          getApp().goto('/pages/index/index/index')
+                        }
                 }
               });
             }
             var timestamp = Date.parse(new Date());
             timestamp = timestamp / 1000;
-            if (t.data.data.on_time > timestamp) {
+            if (t.data.data.on_time > timestamp && !p_fail) {
               wx.showModal({
                 title: '商品还未上架',
                 showCancel: !1,
                 complete: function () {
-                  wx.navigateBack();
+                  let pages = getCurrentPages();
+                  if (pages[pages.length - 2]) {
+                    wx.navigateBack();
+                  } else {
+                    getApp().goto('/pages/index/index/index')
+                  }
                 }
               });
             }
 
-            if (t.data.data.down_time > 0) {
+            if (t.data.data.down_time > 0 && !p_fail) {
               if (t.data.data.down_time < timestamp) {
                 wx.showModal({
                   title: '商品已经到期下架',
                   showCancel: !1,
                   complete: function () {
-                    wx.navigateBack();
+                    let pages = getCurrentPages();
+                    if (pages[pages.length - 2]) {
+                      wx.navigateBack();
+                    } else {
+                      getApp().goto('/pages/index/index/index')
+                    }
                   }
                 });
               }
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 12ecfd5..6e9b777 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1020,32 +1020,47 @@ Page({
                     t.data.data.prom_type = 0
                   }
                 }
-                if (t.data.data.is_on_sale != 1) {
+
+                var p_fail=0;
+
+                if (t.data.data.is_on_sale != 1 ) {
+                  p_fail=1;
                   wx.showModal({
                     title: '商品已经下架',
                     showCancel: !1,
                     complete: function () {
-                      wx.navigateBack();
+                      let pages = getCurrentPages();
+                        if (pages[pages.length - 2]) {
+                          wx.navigateBack();
+                        } else {
+                          getApp().goto('/pages/index/index/index')
+                        }
                     }
                   });
+
                 }
 
                 ee.init(gid);
 
                 var timestamp = Date.parse(new Date());
                 timestamp = timestamp / 1000;
-                if (t.data.data.on_time > timestamp) {
+                if (t.data.data.on_time > timestamp && !p_fail) {
                   wx.showModal({
                     title: '商品还未上架',
                     showCancel: !1,
                     complete: function () {
-                      wx.navigateBack();
+                      let pages = getCurrentPages();
+                      if (pages[pages.length - 2]) {
+                        wx.navigateBack();
+                      } else {
+                        getApp().goto('/pages/index/index/index')
+                      }
                     }
                   });
                 }
 
-                if (t.data.data.down_time > 0) {
-                  if (t.data.data.down_time < timestamp) {
+                if (t.data.data.down_time > 0 && !p_fail) {
+                  if (t.data.data.down_time < timestamp ) {
                     wx.showModal({
                       title: '商品已经到期下架',
                       showCancel: !1,
@@ -3927,7 +3942,10 @@ Page({
               //------------处理门店---------------
               deal_pickup(e) {
                 var th = this;
-                if (!th.data.sele_g) return false
+                if (!th.data.sele_g){
+                    wx.hideLoading();
+                    return false
+                }
 
                 var g_distr_type = th.data.sele_g.distr_type;
                 wx.hideLoading();
@@ -4127,7 +4145,10 @@ Page({
               deal_pickup_dline(e) {
                 var pkno = [],
                   th = this;
-                if (!th.data.sele_g) return false;
+                if (!th.data.sele_g){
+                    wx.hideLoading();
+                    return false;
+                }
 
                 if (this.data.def_pick_store) {
                   pkno.push(this.data.def_pick_store.pickup_no);
@@ -8120,6 +8141,9 @@ Page({
                               if (this.check_prom_custom(1) !== 3) {
                                 return false;
                               }
+
+                              if(!this.data.sele_g) return  false;
+
                               var per_price = this.data.sele_g.shop_price
                               if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) {
                                 per_price = this.data.sele_g[this.data.card_field];