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

app-pt/controllers/ShopAdminController.php

@@ -32,7 +32,7 @@ class ShopAdminController extends BaseController
         }
 
         if (getenv('YII_ENV') != 'local' || getenv('YII_ENV') != 'dev') {
-            util::fail('生产环境不能执行删除操作');
+            //util::fail('生产环境不能执行删除操作');
         }
 
         $adminId = $shopAdmin['adminId'] ?? 0;

biz-hd/merchant/classes/ShopClass.php

@@ -40,7 +40,7 @@ class ShopClass extends BaseClass
         if (!empty($exists)) {
             util::fail('门店名称已经存在');
         }
-        $data['img'] = json_encode($data['img']);
+        $data['img'] = isset($data['img']) ? json_encode($data['img']) : json_encode([]);
         $shop = self::add($data);
         return $shop;
     }