diff --git a/H5B854518.wgt b/H5B854518.wgt
index c7a0747..725bacd 100644
Binary files a/H5B854518.wgt and b/H5B854518.wgt differ
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);