update

fecshop · Sep 21, 2016 · a9583d6 · a9583d6
1 parent 3a49f74
commit a9583d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/helpers/CFunc.php b/helpers/CFunc.php
@@ -62,13 +62,17 @@ public static function is_time($time)
 	# $array为要排序的数组
 	# $keys为要用来排序的键名,二维数组的key
 	# $type默认为升序排序 
-	public static function array_sort($array,$keys,$type='asc'){  
+	public static function array_sort($array,$keys,$dir='asc',$isFloat=true){  
 
 		$keysvalue = $new_array = array();  
 		foreach ($array as $k=>$v){  
-			$keysvalue[$k] = $v[$keys];  
+			if($isFloat){
+				$keysvalue[$k] = (float)$v[$keys];
+			}else{
+				$keysvalue[$k] = $v[$keys];
+			}  
 		}  
-		if($type == 'asc'){  
+		if($dir == 'asc'){  
 			asort($keysvalue);  
 		}else{  
 			arsort($keysvalue);  

diff --git a/helpers/CImage.php b/helpers/CImage.php
@@ -75,16 +75,20 @@ class CImage
 	 */
 
 	public static function saveResizeMiddleWaterImg($imgPath,$newPath,$resize,$waterMark=''){
-
+		//exit;
 		$image = static::getImagine()->open($imgPath);
 		$sourceBox 	= $image->getSize();
 		$imgWidth 	= $sourceBox->getWidth();
 		$imgHeight 	= $sourceBox->getHeight();
 		if(is_array($resize)){
 			list($resizeWidth,$resizeHeight) = $resize;
 		}else{
-			$resizeWidth = $resizeHeight = $resize;
+			$resizeWidth = $resize;
+			$resizeHeight = $resizeWidth * $imgHeight / $imgWidth;
 		}
+		//echo 22;
+		//echo $resizeWidth.' && '.$resizeHeight;
+		//exit;
 		if(!$resizeWidth && !$resizeHeight){
 			return false;
 		}