Merge branch 'develop' of https://github.com/hui-ho/WebStack-Laravel

ygrdsj · May 2, 2019 · 28c825d · 28c825d
2 parents 9054f2e + e8ecbf9
commit 28c825d
Show file tree

Hide file tree

Showing 102 changed files with 1,062 additions and 4 deletions.
diff --git a/app/Admin/Controllers/SiteController.php b/app/Admin/Controllers/SiteController.php
@@ -130,8 +130,9 @@ protected function form()
             ->attribute('autocomplete', 'off')
             ->rules('required|max:50');
         $form->image('thumb', '图标')
+            ->crop(120, 120)
             ->uniqueName()
-            ->rules('required|max:200');
+            ->rules('required');
         $form->text('describe', '描述')
             ->attribute('autocomplete', 'off')
             ->rules('required|max:300');

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         "caouecs/laravel-lang": "~3.0",
         "encore/laravel-admin": "^1.6",
         "fideloper/proxy": "~3.3",
+        "intervention/image": "^2.4",
         "james.xue/login-captcha": "^1.1",
         "jxlwqq/material-ui": "^1.0",
         "laravel-admin-ext/grid-lightbox": "^1.0",

diff --git a/composer.lock b/composer.lock