diff --git a/composer.json b/composer.json index 511d1b7..be06bf6 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "php": ">=5.6.4", "intervention/image": "^2.3", "jpush/jpush": "v3.5.*", - "laravel/framework": "5.4.*", + "laravel/framework": "5.5.*", "laravel/tinker": "~1.0", "maatwebsite/excel": "~2.1.0", "overtrue/laravel-wechat": "~3.1", @@ -20,7 +20,7 @@ "require-dev": { "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~5.7" + "phpunit/phpunit": "~6.0" }, "autoload": { "classmap": [ @@ -52,6 +52,10 @@ "post-update-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postUpdate", "php artisan clear-compiled" + ], + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover" ] }, "config": { diff --git a/config/database.php b/config/database.php index 6291687..84c2020 100644 --- a/config/database.php +++ b/config/database.php @@ -50,7 +50,7 @@ return [ 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => env('DB_PREFIX', 'fl_'), - 'strict' => true, + 'strict' => false, 'engine' => null, ], diff --git a/resources/views/wap/index/index.blade.php b/resources/views/wap/index/index.blade.php index 1076a9b..8e845a9 100644 --- a/resources/views/wap/index/index.blade.php +++ b/resources/views/wap/index/index.blade.php @@ -80,4 +80,6 @@ $('#listbu').click(function(){ }); }); + +@include('wap.common.footer') \ No newline at end of file