修改是否现货的判断条件

core/CoreApp/models/Model_ck.php

@@ -456,9 +456,23 @@ class Model_ck extends Lin_Model
 		$sfxh = 0;
 		if($hz != '')
 		{
-			$num = explode('|',trim($whlabel,'|'));
-		    $bh = substr_count($whlabel,$hz);
-		    if($bh == count($num))
+			// 老版本的是否现货
+			// $num = explode('|',trim($whlabel,'|'));
+		    // $bh = substr_count($whlabel,$hz);
+		    // if($bh == count($num))
+		    // {
+			//     $sfxh = 1;//有现货
+		    // }
+			//新版的
+			$num = 0;
+			$wh_list = explode('|',trim($whlabel,'|'));
+			foreach ($wh_list as $v){
+				$tmp_arr = explode('-',trim($v,'-'));
+				$num = $num + $tmp_arr[1];
+			}
+
+			$bh = substr_count($whlabel,$hz);
+		    if($bh == $num)
 		    {
 			    $sfxh = 1;//有现货
 		    }