Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-hd/controllers/PxClassController.php

@@ -16,7 +16,10 @@ class PxClassController extends BaseController
 	public function actionList()
 	{
 		$sjId = $this->sjId;
-		$where = ['sjId'=>$sjId];
+		$where = [
+			'sjId' => $sjId,
+			'delStatus' => 0,
+		];
         $respond = PxClassClass::getClassList($where);
         util::success($respond);
 

biz-ghs/merchant/classes/ShopClass.php

@@ -21,12 +21,14 @@ class ShopClass extends BaseClass
     public static function groupBaseInfo($list)
     {
         foreach ($list as $key => $val) {
-            if ($val['img']) {
-                $list[$key]['img'] = json_decode($val['img'], true);
+            if (empty($val['img'])) {
+                $list[$key]['img'] = [];
                 $list[$key]['imgUrl'] = [];
-                foreach ($list[$key]['img'] as $img) {
-                    $list[$key]['imgUrl'][] = imgUtil::groupImg($img);
-                }
+                continue;
+            }
+            $list[$key]['img'] = json_decode($val['img'], true);
+            foreach ($list[$key]['img'] as $img) {
+                $list[$key]['imgUrl'][] = imgUtil::groupImg($img);
             }
         }
         return $list;