diff --git a/app/Http/Controllers/Admin/ShopController.php b/app/Http/Controllers/Admin/ShopController.php index f0e31091..f4a22f9e 100644 --- a/app/Http/Controllers/Admin/ShopController.php +++ b/app/Http/Controllers/Admin/ShopController.php @@ -65,7 +65,8 @@ class ShopController extends Controller } try { - $data = $request->except('_token', 'logo'); + $data = $request->except('_token', 'logo', 'traffic', 'traffic_unit'); + $data['traffic'] = $request->input('traffic') * $request->input('traffic_unit') ?? 1; $data['logo'] = $logo ?? null; $data['is_hot'] = $request->input('is_hot') ? 1 : 0; $data['status'] = $request->input('status') ? 1 : 0; diff --git a/sql/2.5.0.sql b/database/update/2.5.0.sql similarity index 100% rename from sql/2.5.0.sql rename to database/update/2.5.0.sql diff --git a/public/assets/images/logo64.png b/public/assets/images/logo64.png index dda45229..6a5f4f84 100644 Binary files a/public/assets/images/logo64.png and b/public/assets/images/logo64.png differ diff --git a/public/favicon.ico b/public/favicon.ico index ebe99c8c..e21f73d6 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.php b/public/index.php index 4584cbcd..2b5641b4 100644 --- a/public/index.php +++ b/public/index.php @@ -1,12 +1,10 @@ */ - define('LARAVEL_START', microtime(true)); /* diff --git a/resources/views/admin/shop/info.blade.php b/resources/views/admin/shop/info.blade.php index f64e44b1..134bc8ab 100644 --- a/resources/views/admin/shop/info.blade.php +++ b/resources/views/admin/shop/info.blade.php @@ -93,7 +93,12 @@