From 2d19864f47fffc0349086b1f8e605a76c13138e0 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 29 Oct 2019 22:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A9=E5=A8=81=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- H5B854518.wgt | Bin 7870418 -> 7870363 bytes get_version_new.php | 2 +- hyhproject/common/model/Carts.php | 2 +- hyhproject/common/model/Shopping.php | 5 ++++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/H5B854518.wgt b/H5B854518.wgt index 725bacd2818bf9c98db8eb5a3cf1c97bbbd71a5a..d2749f08cf65c244d0e8120c89f57f21c92a628c 100644 GIT binary patch delta 14435 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 delta 14322 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['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); }