Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/library/Our/ImageConst.php

@@ -104,5 +104,7 @@ class ImageConst{
     const storeQualificationImg = 188;
     const storeCollectionImg = 112;
     const homeIndexHotGoodsImageSize =250;
-
+    const goodsStoreImg = 100; //商品详情页的店铺头像
+    const goodsGroupImg = 182;//商品/组合详情页的其他搭配图片
+    const groupGoodsImg = 160; //组合详情页的搭配商品
 }

application/library/Our/ImageUtil.php

@@ -126,10 +126,17 @@ class ImageUtil {
             //$goodsImg .= '?x-oss-process=image/resize,m_pad,h_226,w_334';
         }
         $goodsImg =  \Our\Common::getStaticFile($goodsImg,$directory);
-        $goodsImg .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}";
+        if($width > 0) {
+            $goodsImg .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}";
+        }
         return $goodsImg;
     }
-
+    public function getGoodsImgWithUrl($goodsImgUrl,$width=\Our\ImageConst::goodsListImgSize, $height = 0) {
+        $width = $width * \Our\ImageConst::sizeScale;
+        $height ? $height = $height * \Our\ImageConst::sizeScale : $height = $width;
+        $goodsImgUrl .= "?x-oss-process=image/resize,m_fill,h_{$height},w_{$width}";
+        return $goodsImgUrl;
+    }
     public static function getTopClassAdvImageUrl($gcId){
         $fileName = \Our\ImageConst::topClassAdvImagePrefis.$gcId.\Our\NameConst::jpgSuffix;
         $gcImageUrl = \Our\Common::getStaticFile($fileName,\Our\ImageConst::defaultPath);

application/models/Business/Goods/GoodsCommonService.php

@@ -524,7 +524,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
 
         $commonInstance = \DAO\GoodsCommonModel::getInstance();
         $count = \Our\RedisHelper::cachedFunction(\Redis\Db4\GoodsCommonRedisModel::getInstance(),array(&$commonInstance, 'getCount'),array(array('store_id'=>$storeId)),\Our\ApiConst::oneDaySecond);
-        return array('storeId'=>$storeId,'storeName'=>$storeInfo['store_name'],'storeLabel'=>$label,'goodsTotal'=>$count,'isQuality'=>$storeInfo['store_zhping'],'freeShippingPrice'=>$storeInfo['free_shipping_price'],'shareDesc'=>$storeInfo['store_share_desc']);
+        return array('storeId'=>$storeId,'storeName'=>$storeInfo['store_name'],'storeLabel'=>\DAO\StoreModel::getInstance()->getStoreLabelSrc($storeInfo['store_label'],\Our\ImageConst::goodsStoreImg),'goodsTotal'=>$count,'isQuality'=>$storeInfo['store_zhping'],'freeShippingPrice'=>$storeInfo['free_shipping_price'],'shareDesc'=>$storeInfo['store_share_desc']);
     }
 
     /**

application/models/Business/Goods/GroupSaleService.php

@@ -50,6 +50,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         $data['goods'] = [];
         if($data['goodsList'] && is_array($data['goodsList'])){
             foreach ($data['goodsList'] as $v){
+                $v['goodsImage'] = \Our\ImageUtil::getGoodsImgWithUrl($v['goodsImage'],\Our\ImageConst::groupGoodsImg);
                 unset($v['goods_id']);
                 unset($v['goodsStorage']);
                 unset($v['goodsAttr']);
@@ -227,7 +228,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
         if($groupList){
             foreach ($groupList as $k=>$v){
                 $v['groupId'] = $v['blId'];
-                $v['image'] = ImageUtil::getGoodsImgUrl($v['image']);
+                $v['image'] = ImageUtil::getGoodsImgUrl($v['image'],\our\ImageConst::goodsGroupImg);
                 unset($v['goodsList']);
                 unset($v['bl_title']);
                 unset($v['store_id']);
@@ -295,7 +296,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
             foreach ($group as $k=>$v){
                 if($v['bl_quota_starttime']<TIMESTAMP&&$v['endTime']>=TIMESTAMP){
                     $v['groupId'] = $v['blId'];
-                    $v['image'] = ImageUtil::getGoodsImgUrl($v['image']);
+                    $v['image'] = ImageUtil::getGoodsImgUrl($v['image'],\Our\ImageConst::goodsGroupImg);
                     unset($v['goodsList']);
                     unset($v['bl_title']);
                     unset($v['store_id']);
@@ -469,7 +470,7 @@ class GroupSaleServiceModel extends \Business\AbstractModel {
                                 $goods_temp = array_merge($goods,$goodsArray[$goods['goods_id']]);
                                 $blSumPrice += $goods_temp['goodsPrice']*$goods_temp['num'];
                                 $goods_temp['goodsAttr']  = $goodsDao->getFormatGoodsAttr($goods_temp['goods_spec']);
-                                $goods_temp['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($goods_temp['goods_image']);
+                                $goods_temp['goodsImage'] = \Our\ImageUtil::getGoodsImgUrl($goods_temp['goods_image'], 0);
                                 //unset($goods_temp['goods_spec']);
                                 //unset($goods_temp['goods_image']);
                                 //unset($goods_temp['bl_id']);