diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index a6ef4e5..ea36031 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -234,7 +234,6 @@ Page({
     				}
     				t.data.data.gg = gg;
 
-
     				//--看一下有没有开启等级卡---
     				if (ee.data.rank_switch) {
     					//---回调卡的列表---
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 2cdda41..f0bbcb8 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -1053,7 +1053,7 @@ Page({
                                         }
 
                                         //-- 如果有一件代发的商品或者不是同城配送的配送 --
-                                        if(!narr[hi].show_same_city || narr[hi].whsle_id>0){
+                                        if(narr[hi].is_same_city!=1 || narr[hi].whsle_id>0){
                                             th.setData({show_same_city:0})
                                         }