修正成功订单计算规则

app/Http/Controllers/Admin/LogsController.php

@@ -52,7 +52,11 @@ class LogsController extends Controller
 
         foreach (['is_expire', 'pay_way', 'status'] as $field) {
             $request->whenFilled($field, function ($value) use ($query, $field) {
-                $query->where($field, $value);
+                if (is_array($value)) {
+                    $query->whereIn($field, $value);
+                } else {
+                    $query->where($field, $value);
+                }
             });
         }
 

app/Http/Controllers/AdminController.php

@@ -54,8 +54,8 @@ class AdminController extends Controller
             'todayOrder' => Order::whereDate('created_at', date('Y-m-d'))->count(),
             'totalOnlinePayOrder' => Order::where('pay_type', '<>', 0)->count(),
             'todayOnlinePayOrder' => Order::where('pay_type', '<>', 0)->whereDate('created_at', date('Y-m-d'))->count(),
-            'totalSuccessOrder' => Order::whereStatus(2)->count(),
-            'todaySuccessOrder' => Order::whereStatus(2)->whereDate('created_at', date('Y-m-d'))->count(),
+            'totalSuccessOrder' => Order::whereIn('status', [2, 3])->count(),
+            'todaySuccessOrder' => Order::whereIn('status', [2, 3])->whereDate('created_at', date('Y-m-d'))->count(),
         ]);
     }
 

resources/views/admin/index.blade.php

@@ -228,7 +228,7 @@
                     </a>
                 </div>
                 <div class="col-xl-3 col-md-6 info-panel">
-                    <a href="{{route('admin.order', ['status'=>2])}}" class="card card-shadow">
+                    <a href="{{route('admin.order', ['status'=>[1, 2]])}}" class="card card-shadow">
                         <div class="card-block bg-white">
                             <button type="button" class="btn btn-floating btn-sm btn-success">
                                 <i class="icon md-ticket-star"></i>
@@ -303,8 +303,8 @@
     <script src="/assets/global/vendor/matchheight/jquery.matchHeight-min.js"></script>
     <script src="/assets/global/js/Plugin/matchheight.js"></script>
     <script>
-        $(function() {
-            $('.card').matchHeight();
-        });
+      $(function() {
+        $('.card').matchHeight();
+      });
     </script>
 @endsection

resources/views/admin/logs/order.blade.php

@@ -1,6 +1,7 @@
 @extends('admin.layouts')
 @section('css')
     <link href="/assets/global/vendor/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
+    <link href="/assets/global/vendor/bootstrap-select/bootstrap-select.min.css" rel="stylesheet">
     <link href="/assets/global/vendor/bootstrap-datepicker/bootstrap-datepicker.min.css" rel="stylesheet">
     <style>
         .table a {
@@ -36,34 +37,33 @@
                         </div>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
-                        <select class="form-control" id="is_expire" name="is_expire">
-                            <option value="" hidden>是否过期</option>
+                        <select data-plugin="selectpicker" class="form-control show-tick" name="is_expire" id="is_expire" data-style="btn-outline btn-primary" title="是否过期">
                             <option value="0">否</option>
                             <option value="1">是</option>
                         </select>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
-                        <select class="form-control" id="is_coupon" name="is_coupon">
-                            <option value="" hidden>是否使用优惠券</option>
+                        <select data-plugin="selectpicker" class="form-control show-tick" name="is_coupon" id="is_coupon" data-style="btn-outline btn-primary"
+                                title="是否使用优惠券">
                             <option value="0">否</option>
                             <option value="1">是</option>
                         </select>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
-                        <select class="form-control" id="pay_way" name="pay_way">
-                            <option value="" hidden>支付方式</option>
+                        <select data-plugin="selectpicker" class="form-control show-tick" name="pay_way" id="pay_way" data-style="btn-outline byn-primary" title="支付方式">
                             @foreach(config('common.payment.labels') as $key => $value)
-                                <option value="{{$key}}">{{$value}}</option>
+                                <option value="{{$key}}">{{$key.' - '.$value}}</option>
                             @endforeach
                         </select>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">
-                        <select class="form-control" name="status" id="status">
-                            <option value="" hidden>订单状态</option>
+                        <select data-plugin="selectpicker" class="form-control show-tick" name="status[]" id="status" data-style="btn-outline btn-primary" title="订单状态"
+                                multiple>
                             <option value="-1">已关闭</option>
                             <option value="0">待支付</option>
                             <option value="1">已支付待确认</option>
                             <option value="2">已完成</option>
+                            <option value="3">预支付</option>
                         </select>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6 btn-group">
@@ -166,31 +166,33 @@
 @section('javascript')
     <script src="/assets/global/vendor/bootstrap-table/bootstrap-table.min.js"></script>
     <script src="/assets/global/vendor/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
+    <script src="/assets/global/vendor/bootstrap-select/bootstrap-select.min.js"></script>
     <script src="/assets/global/vendor/bootstrap-datepicker/bootstrap-datepicker.min.js"></script>
+    <script src="/assets/global/js/Plugin/bootstrap-select.js"></script>
     <script src="/assets/global/js/Plugin/bootstrap-datepicker.js"></script>
     <script>
-        $(document).ready(function() {
-            $('#is_expire').val({{Request::query('is_expire')}});
-            $('#is_coupon').val({{Request::query('is_coupon')}});
-            $('#pay_way').val({{Request::query('pay_way')}});
-            $('#status').val({{Request::query('status')}});
-            $('select').on('change', function() { this.form.submit(); });
-        });
+      $(document).ready(function() {
+        $('#is_coupon').selectpicker('val', @json(Request::query('is_coupon')));
+        $('#is_expire').selectpicker('val', @json(Request::query('is_expire')));
+        $('#pay_way').selectpicker('val', @json(Request::query('pay_way')));
+        $('#status').selectpicker('val', @json(Request::query('status')));
+        $('select').on('change', function() { this.form.submit(); });
+      });
 
-        // 有效期
-        $('.input-daterange').datepicker({format: 'yyyy-mm-dd'});
+      // 有效期
+      $('.input-daterange').datepicker({format: 'yyyy-mm-dd'});
 
-        @can('admin.order.edit')
-        // 重置流量
-        function changeStatus(id, status) {
-            $.post('{{route('admin.order.edit')}}', {_token: '{{csrf_token()}}', oid: id, status: status}, function(ret) {
-                if (ret.status === 'success') {
-                    swal.fire({title: ret.message, icon: 'success', timer: 1000, showConfirmButton: false}).then(() => window.location.reload());
-                } else {
-                    swal.fire({title: ret.message, icon: 'error'}).then(() => window.location.reload());
-                }
-            });
-        }
+      @can('admin.order.edit')
+      // 重置流量
+      function changeStatus(id, status) {
+        $.post('{{route('admin.order.edit')}}', {_token: '{{csrf_token()}}', oid: id, status: status}, function(ret) {
+          if (ret.status === 'success') {
+            swal.fire({title: ret.message, icon: 'success', timer: 1000, showConfirmButton: false}).then(() => window.location.reload());
+          } else {
+            swal.fire({title: ret.message, icon: 'error'}).then(() => window.location.reload());
+          }
+        });
+      }
         @endcan
     </script>
 @endsection

resources/views/admin/node/cert/info.blade.php

@@ -1,7 +1,4 @@
 @extends('admin.layouts')
-@section('css')
-    <link href="/assets/global/vendor/bootstrap-select/bootstrap-select.min.css" rel="stylesheet">
-@endsection
 @section('content')
     <div class="page-content container">
         <div class="panel">

resources/views/admin/rule/index.blade.php

@@ -19,8 +19,7 @@
             <div class="panel-body">
                 <form class="form-row">
                     <div class="form-group col-xxl-1 col-lg-3 col-md-3 col-4">
-                        <select class="form-control" name="type" data-plugin="selectpicker" data-style="btn-outline btn-primary" onchange="this.form.submit()">
-                            <option value="" hidden>类型</option>
+                        <select class="form-control" name="type" data-plugin="selectpicker" data-style="btn-outline btn-primary" title="类型" onchange="this.form.submit()">
                             <option value="1">正则表达式</option>
                             <option value="2">域名</option>
                             <option value="3">IP</option>

resources/views/user/index.blade.php

@@ -140,8 +140,8 @@
                                             <div class="form-group row">
                                                 <label class="col-md-auto col-form-label" for="subType">{{trans('common.customize')}}</label>
                                                 <div class="col">
-                                                    <select class="form-control" id="subType" name="subType" data-plugin="selectpicker" data-style="btn-outline btn-primary">
-                                                        <option value="" hidden>{{trans('common.all')}}</option>
+                                                    <select class="form-control" id="subType" name="subType" data-plugin="selectpicker" data-style="btn-outline btn-primary"
+                                                            title="{{trans('common.all')}}">
                                                         @if(in_array('ss', $subType, true))
                                                             <option value="1">{{trans('user.subscribe.ss_only')}}</option>
                                                         @endif
@@ -158,8 +158,8 @@
                                         <div class="form-group row">
                                             <label class="col-md-auto col-form-label" for="client">{{trans('user.client').trans('common.customize')}}</label>
                                             <div class="col">
-                                                <select class="form-control" id="client" name="client" data-plugin="selectpicker" data-style="btn-outline btn-primary">
-                                                    <option value="" hidden>{{trans('common.default')}}</option>
+                                                <select class="form-control" id="client" name="client" data-plugin="selectpicker" data-style="btn-primary btn-outline"
+                                                        title="{{trans('common.default')}}">
                                                     <option value="quantumult">Quantumult</option>
                                                     <option value="quantumult%20x">QuantumultX</option>
                                                     <option value="clash">Clash</option>