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 @@
- MB +
@@ -204,7 +209,6 @@ $('#period').val('{{$goods->period}}'); $('#days').val('{{$goods->days}}').attr('disabled', true); @endif - $('#traffic').val('{{$goods->traffic}}').attr('disabled', true); $('#invite_num').val('{{$goods->invite_num}}'); $('#limit_num').val('{{$goods->limit_num}}'); @if ($goods->is_hot) @@ -217,6 +221,22 @@ $('#color').asColorPicker('val', '{{$goods->color}}'); $('#description').val('{{$goods->description}}'); $('#info').val('{!! $goods->info !!}'); + const trafficUnit = $('#traffic_unit'); + const traffic = $('#traffic'); + @if($goods->traffic >= 1073741824) + traffic.val('{{$goods->traffic/1073741824}}'); + trafficUnit.selectpicker('val', '1073741824'); + @elseif($goods->traffic >= 1048576) + traffic.val('{{$goods->traffic/1048576}}'); + trafficUnit.selectpicker('val', '1048576'); + @elseif($goods->traffic >= 1024) + traffic.val('{{$goods->traffic/1024}}'); + trafficUnit.selectpicker('val', '1024'); + @else + traffic.val('{{$goods->traffic}}'); + @endif + traffic.attr('disabled', true); + trafficUnit.attr('disabled', true).selectpicker('refresh'); }); @elseif(old('type')) $(document).ready(function() { @@ -232,6 +252,7 @@ $('#days').val('{{old('days',0)}}'); @endif $('#traffic').val('{{old('traffic')}}'); + $('#traffic_unit').selectpicker('val', '{{old('traffic_unit')}}'); $('#invite_num').val('{{old('invite_num')}}'); $('#limit_num').val('{{old('limit_num')}}'); @if (old('is_hot'))