diff --git a/H5B854518.wgt b/H5B854518.wgt index d2749f0..65ee16a 100644 Binary files a/H5B854518.wgt and b/H5B854518.wgt differ diff --git a/get_version_new.php b/get_version_new.php index 8c33900..eb3ac00 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.6'; +$data['apk_version'] = '2.2.7'; $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 1126fae..fdb1a50 100755 --- a/hyhproject/common/model/Carts.php +++ b/hyhproject/common/model/Carts.php @@ -19,6 +19,7 @@ class Carts extends Base{ $goodsSpecId = (int)input('post.goodsSpecId'); $type = (int)input('post.type'); $goodsType = (int)input('post.from',2); + if($goodsType<=0)$goodsType=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 279fbdf..3449c05 100755 --- a/hyhproject/common/model/Shopping.php +++ b/hyhproject/common/model/Shopping.php @@ -201,7 +201,6 @@ class Shopping extends Base{ public function getGoods(){ $page = (int)input('page',1); $type = (int)input('type',1);//1逛商都2助微吧 - $scale = 0; if(1 == $type){ $scale = dataConf('discountRateGtToShopping'); }elseif(2 == $type){