小图逻辑优化

biz/merchant/services/AdminService.php

@@ -45,7 +45,7 @@ class AdminService extends BaseService
 		$imgPrefix = Yii::$app->params['imgUrl'];
 		foreach ($admin as $key => $val) {
 			//$admin[$key]['avatarUrl'] = $imgPrefix . $val['avatar'];
-			business::
+			$val = business::formatAvatar($val);
 		}
 	}
 	

common/components/business.php

@@ -33,7 +33,7 @@ class business
 		return $object;
 	}
 	
-	//对商品表shopImg字段的转化 shish 2019.12.2
+	//对商品图片转化 shish 2019.12.2
 	public static function formatGoodsImg($info)
 	{
 		$shopImg = isset($info['shopImg']) ? $info['shopImg'] : [];
@@ -42,7 +42,7 @@ class business
 		if (empty($shopImg)) {
 			$info['originImgList'] = [];
 			$info['imgList'] = [];
-			$info['imgMiddleList'] = [];
+			$info['imgSmallList'] = [];
 			return $info;
 		}
 		$arr = json_decode($shopImg, true);
@@ -50,22 +50,22 @@ class business
 		if (is_array($arr) == false) {
 			$info['originImgList'] = [];
 			$info['imgList'] = [];
-			$info['imgMiddleList'] = [];
+			$info['imgSmallList'] = [];
 			return $info;
 		}
 		$imgList = [];
-		$imgMiddleList = [];
+		$imgSmallList = [];
 		$prefixImgUrl = Yii::$app->params['imgUrl'];
 		foreach ($arr as $imgUrl) {
-			$middleImg = self::getMiddleImg($imgUrl);
+			$smallImg = self::getSmallImg($imgUrl);
 			$normal = $prefixImgUrl . $imgUrl;
-			$middle = $prefixImgUrl . $middleImg;
+			$small = $prefixImgUrl . $smallImg;
 			$imgList[] = $normal;
-			$imgMiddleList[] = $middle;
+			$imgSmallList[] = $small;
 		}
 		$info['originImgList'] = $arr;
 		$info['imgList'] = $imgList;
-		$info['imgMiddleList'] = $imgMiddleList;
+		$info['imgSmallList'] = $imgSmallList;
 		return $info;
 	}
 	
@@ -77,13 +77,13 @@ class business
 			$info['img'] = '';
 		}
 		$prefixImgUrl = Yii::$app->params['imgUrl'];
-		$middleImg = self::getMiddleImg($imgUrl);
-		$middle = $prefixImgUrl . $middleImg;
-		$info['img'] = $middle;
+		$smallImg = self::getSmallImg($imgUrl);
+		$small = $prefixImgUrl . $smallImg;
+		$info['img'] = $small;
 		return $info;
 	}
 	
-	//对图库图片的转化
+	//图库图片的转化
 	public static function formatPic($info)
 	{
 		$imgUrl = isset($info['img']) ? $info['img'] : '';
@@ -91,12 +91,13 @@ class business
 			$info['imgUrl'] = '';
 		}
 		$prefixImgUrl = Yii::$app->params['imgUrl'];
-		$middleImg = self::getMiddleImg($imgUrl);
-		$middle = $prefixImgUrl . $middleImg;
-		$info['imgUrl'] = $middle;
+		$smallImg = self::getSmallImg($imgUrl);
+		$small = $prefixImgUrl . $smallImg;
+		$info['imgUrl'] = $small;
 		return $info;
 	}
-	
+
+	//分类图的处理
 	public static function formatCategoryImg($info)
 	{
 		$imgUrl = isset($info['img']) ? $info['img'] : '';
@@ -104,26 +105,37 @@ class business
 			$info['imgUrl'] = '';
 		}
 		$prefixImgUrl = Yii::$app->params['imgUrl'];
-		$middleImg = self::getMiddleImg($imgUrl);
-		$middle = $prefixImgUrl . $middleImg;
-		$info['imgUrl'] = $middle;
+		$smallImg = self::getSmallImg($imgUrl);
+		$small = $prefixImgUrl . $smallImg;
+		$info['imgUrl'] = $small;
 		return $info;
 	}
-
+	
 	//头像处理 shish 2019.12.20
 	public static function formatAvatar($info)
 	{
-	
+		$imgUrl = isset($info['avatar']) ? $info['avatar'] : '';
+		if (empty($imgUrl)) {
+			$info['avatarUrl'] = '';
+			$info['avatarSmallUrl'] = '';
+			return $info;
+		}
+		$prefixImgUrl = Yii::$app->params['imgUrl'];
+		$smallImg = self::getSmallImg($imgUrl);
+		$small = $prefixImgUrl . $smallImg;
+		$info['avatarSmallUrl'] = $small;
+		$info['avatarUrl'] = $prefixImgUrl . $imgUrl;
+		return $info;
 	}
-	
-	//取中图 shish 2019.12.4
-	public static function getMiddleImg($imgUrl)
+
+	//取小图，尺寸 200px shish 2019.12.4
+	public static function getSmallImg($imgUrl)
 	{
 		$pos = strrpos($imgUrl, '.');
 		$pre = substr($imgUrl, 0, $pos);
 		$ext = substr($imgUrl, ($pos + 1));
-		$middleImg = $pre . '_200.' . $ext;
-		return $middleImg;
+		$smallImg = $pre . '_small.' . $ext;
+		return $smallImg;
 	}
-	
+
 }