From 03aa71bdbd63dca6dd4333a858567b3379ee6614 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 29 Oct 2019 21:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A9=E8=B4=AD=E5=90=A7=E7=82=B9=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E7=82=B9=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=86=85?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=94=E7=94=A8=E5=8A=A9=E8=B4=AD=E5=90=A7?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- H5B854518.wgt | Bin 7870419 -> 7870418 bytes get_version_new.php | 2 +- hyhproject/common/model/Shops.php | 6 ++++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/H5B854518.wgt b/H5B854518.wgt index c7a07470c79351704413d5a25c27569640ea5374..725bacd2818bf9c98db8eb5a3cf1c97bbbd71a5a 100644 GIT binary patch delta 17582 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 delta 17593 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 diff --git a/get_version_new.php b/get_version_new.php index e8efde0..6758806 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.4'; +$data['apk_version'] = '2.2.5'; $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/Shops.php b/hyhproject/common/model/Shops.php index ec4edf3..9dbac13 100755 --- a/hyhproject/common/model/Shops.php +++ b/hyhproject/common/model/Shops.php @@ -453,11 +453,13 @@ class Shops extends Base{ */ public function getShopIndexGoodsList($shopId=0,$field='*',$order='goodsId DESC', $from=0){ $shopId = empty($shopId) ? (int)input('post.shopId') : $shopId; - $from = empty($from) ? (int)input('post.from_id', 0) : $from; + $from = empty($from) ? input('post.from_id', 0) : $from; $m = new TM(); $m->setTable('goods'); $where = ['shopId'=>$shopId,'isSale'=>1,'goodsStatus'=>1,'dataFlag'=>1]; - if($from==3){$where['discountRate'] = [">=", dataConf('discountRateGtToHelpShopping')];} + if((int)$from == 3){ + $where['discountRate'] = [">=", dataConf('discountRateGtToHelpShopping')]; + } $rs = $m->getSelect($where,$field,$order); foreach ($rs['Rows'] as &$v) { $v['goodsImg'] = WSTImg($v['goodsImg'],3);