diff --git a/H5B854518.wgt b/H5B854518.wgt
index 725bacd..d2749f0 100644
Binary files a/H5B854518.wgt and b/H5B854518.wgt differ
diff --git a/get_version_new.php b/get_version_new.php
index 6758806..8c33900 100755
--- a/get_version_new.php
+++ b/get_version_new.php
@@ -2,7 +2,7 @@
 $data['version'] = 16;
 $data['ios_must_update'] = 0;	//是否强制更新,0不强制,1强制
 $data['must_update'] = 1;	//是否强制更新,0不强制,1强制
-$data['apk_version'] = '2.2.5';
+$data['apk_version'] = '2.2.6';
 $data['apk_down_url'] = 'http://www.zgqlg.com.cn/H5B854518.wgt';
 //$data['ios_version'] = '1.0.0';
 $data['ios_appid'] = '1355322179';
diff --git a/hyhproject/common/model/Carts.php b/hyhproject/common/model/Carts.php
index 9b76c1c..1126fae 100755
--- a/hyhproject/common/model/Carts.php
+++ b/hyhproject/common/model/Carts.php
@@ -18,7 +18,7 @@ class Carts extends Base{
 		//goods_specs表的规格ID
 		$goodsSpecId = (int)input('post.goodsSpecId');
 		$type = (int)input('post.type');
-		$goodsType = (int)input('post.from',3);
+		$goodsType = (int)input('post.from',2);
 		//mark 添加验证
 		//$m = new \addons\hyhsale\model\Hyhsale();
 		// if($type == 0 && model('\addons\hyhsale\model\Hyhsale')->getEffectiveGoods(['goodsId'=>$goodsId,'specsId'=>$goodsSpecId])){
diff --git a/hyhproject/common/model/Shopping.php b/hyhproject/common/model/Shopping.php
index 1d90e83..279fbdf 100755
--- a/hyhproject/common/model/Shopping.php
+++ b/hyhproject/common/model/Shopping.php
@@ -71,8 +71,11 @@ class Shopping extends Base{
                 return WSTReturn('',1,$rs);
             }
             $goods_field = 'g.goodsImg,g.shopPrice,g.goodsId,g.saleTime,g.discountRate';
-            foreach ($rs['Rows'] as &$v) {
+            foreach ($rs['Rows'] as $k=>&$v) {
                 $v['goods'] = $this->getShopGoods($v['shopId'],$goodsSize,$goods_field,3);
+                if(sizeof($v['goods'])==0){
+                    unset($rs['Rows'][$k]);
+                }
                 foreach ($v['goods'] as &$val) {
                     $val['goodsImg'] = WSTImg($val['goodsImg'],3);
                 }