错误处理

wip

beike/Admin/Http/Controllers/AttributeController.php

@@ -17,12 +17,14 @@ use Beike\Admin\Http\Resources\AttributeValueResource;
 use Beike\Admin\Http\Resources\AutocompleteResource;
 use Beike\Admin\Repositories\AttributeGroupRepo;
 use Beike\Admin\Repositories\AttributeRepo;
+use Exception;
 use Illuminate\Http\Request;
 
 class AttributeController extends Controller
 {
     public function index(Request $request)
     {
+        try {
             $attributes = AttributeRepo::getList();
             $data = [
                 'attribute_list' => $attributes,
@@ -33,77 +35,116 @@ class AttributeController extends Controller
             if ($request->expectsJson()) {
                 return json_success(trans('success'), $data);
             }
+        } catch (Exception $e) {
+            return view('admin::pages.attributes.index', $data)->withErrors(['error' => $e->getMessage()]);
+        }
 
         return view('admin::pages.attributes.index', $data);
     }
 
     public function show(Request $request, int $id)
     {
+        try {
             $data = [
                 'attribute'       => (new AttributeDetailResource(AttributeRepo::find($id)))->jsonSerialize(),
                 'attribute_group' => AttributeGroupRepo::getList(),
             ];
             $data = hook_filter('admin.attribute.show.data', $data);
+        } catch (Exception $e) {
+            return view('admin::pages.attributes.form', $data)->withErrors(['error' => $e->getMessage()]);
+        }
 
         return view('admin::pages.attributes.form', $data);
     }
 
     public function store(Request $request)
     {
+        try {
             $requestData = json_decode($request->getContent(), true);
             $item        = AttributeRepo::create($requestData);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.created_success'), $item);
     }
 
     public function update(Request $request, int $id)
     {
+        try {
             $requestData = json_decode($request->getContent(), true);
             $item        = AttributeRepo::update($id, $requestData);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.updated_success'), $item);
     }
 
     public function storeValue(Request $request, int $id)
     {
+        try {
             $requestData = json_decode($request->getContent(), true);
             $item        = AttributeRepo::createValue(array_merge($requestData, ['attribute_id' => $id]));
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.created_success'), new AttributeValueResource($item));
     }
 
     public function updateValue(Request $request, int $id, int $value_id)
     {
+        try {
             $requestData = json_decode($request->getContent(), true);
             $item        = AttributeRepo::updateValue($value_id, $requestData);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.updated_success'), new AttributeValueResource($item));
     }
 
     public function destroyValue(Request $request, int $id, int $value_id)
     {
+        try {
             AttributeRepo::deleteValue($value_id);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.deleted_success'));
     }
 
     public function destroy(Request $request, int $id)
     {
+        try {
             AttributeRepo::delete($id);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.deleted_success'));
     }
 
     public function autocomplete(Request $request): array
     {
+        try {
             $items = AttributeRepo::autocomplete($request->get('name') ?? '', 0);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.get_success'), AutocompleteResource::collection($items));
     }
 
     public function autocompleteValue(Request $request, int $id): array
     {
+        try {
             $items = AttributeRepo::autocompleteValue($id, $request->get('name') ?? '');
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.get_success'), AutocompleteResource::collection($items));
     }

beike/Admin/Http/Controllers/AttributeGroupController.php

@@ -12,39 +12,56 @@
 namespace Beike\Admin\Http\Controllers;
 
 use Beike\Admin\Repositories\AttributeGroupRepo;
+use Exception;
 use Illuminate\Http\Request;
 
 class AttributeGroupController extends Controller
 {
     public function index()
     {
+        try {
             $data = [
                 'attribute_groups' => AttributeGroupRepo::getList(),
             ];
             $data = hook_filter('admin.attribute_group.index.data', $data);
+        } catch (Exception $e) {
+            return view('admin::pages.attribute_group.index', $data)->withErrors(['error' => $e->getMessage()]);
+        }
 
         return view('admin::pages.attribute_group.index', $data);
     }
 
     public function store(Request $request)
     {
+        try {
             $requestData = json_decode($request->getContent(), true);
             $item = AttributeGroupRepo::create($requestData);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.created_success'), $item);
     }
 
     public function update(Request $request, int $id)
     {
+        try {
             $requestData = json_decode($request->getContent(), true);
             $item        = AttributeGroupRepo::update($id, $requestData);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.updated_success'), $item);
     }
 
     public function destroy(Request $request, int $id)
     {
+        try {
             AttributeGroupRepo::delete($id);
+        } catch (Exception $e) {
+            return json_fail($e->getMessage(), []);
+        }
 
         return json_success(trans('common.deleted_success'));
     }

resources/beike/admin/views/pages/attribute_group/index.blade.php

@@ -143,7 +143,12 @@
             type: 'warning'
           }).then(() => {
             $http.delete('attribute_groups/' + id).then((res) => {
-              this.$message.success(res.message);
+              if (res.status == 'fail') {
+                layer.msg(res.message,()=>{})
+                return;
+              }
+
+              layer.msg(res.message)
               self.attribute_groups.splice(index, 1)
             })
           }).catch(()=>{})

resources/beike/admin/views/pages/attributes/index.blade.php

@@ -166,9 +166,13 @@
             type: 'warning'
           }).then(() => {
             $http.delete(`attributes/${id}`).then((res) => {
-              self.$message.success(res.message);
+              if (res.status == 'fail') {
+                layer.msg(res.message,()=>{})
+                return;
+              }
+
+              layer.msg(res.message)
               window.location.reload();
-              // self.customers.splice(index, 1)
             })
           }).catch(()=>{})
         },