索引优化&添加

优化索引的显示；
订阅请求日志加入订阅链接状态索引；

app/Http/Controllers/AdminController.php

@@ -1014,6 +1014,7 @@ class AdminController extends Controller
     {
         $user_id = $request->get('user_id');
         $username = $request->get('username');
+        $status = $request->get('status');
 
         $query = UserSubscribe::with(['User']);
 
@@ -1027,6 +1028,10 @@ class AdminController extends Controller
             });
         }
 
+        if ($status != '') {
+            $query->where('status', intval($status));
+        }
+
         $view['subscribeList'] = $query->orderBy('id', 'desc')->paginate(20)->appends($request->except('page'));
 
         return Response::view('admin.subscribeLog', $view);

resources/views/admin/orderList.blade.php

@@ -22,28 +22,28 @@
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="is_expire" id="is_expire" onchange="doSearch()">
-                                    <option value="" @if(Request::get('is_expire') == '') selected @endif>过期</option>
+                                    <option value="" @if(Request::get('is_expire') == '') disabled selected hidden @endif>过期</option>
                                     <option value="0" @if(Request::get('is_expire') == '0') selected @endif>否</option>
                                     <option value="1" @if(Request::get('is_expire') == '1') selected @endif>是</option>
                                 </select>
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="is_coupon" id="is_coupon" onchange="doSearch()">
-                                    <option value="" @if(Request::get('is_coupon') == '') selected @endif>使用优惠券</option>
+                                    <option value="" @if(Request::get('is_coupon') == '') disabled selected hidden @endif>使用优惠券</option>
                                     <option value="0" @if(Request::get('is_coupon') == '0') selected @endif>否</option>
                                     <option value="1" @if(Request::get('is_coupon') == '1') selected @endif>是</option>
                                 </select>
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="pay_way" id="pay_way" onchange="doSearch()">
-                                    <option value="" @if(Request::get('pay_way') == '') selected @endif>支付方式</option>
+                                    <option value="" @if(Request::get('pay_way') == '') disabled selected hidden @endif>支付方式</option>
                                     <option value="1" @if(Request::get('pay_way') == '1') selected @endif>余额支付</option>
                                     <option value="2" @if(Request::get('pay_way') == '2') selected @endif>有赞云支付</option>
                                 </select>
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="status" id="status" onchange="doSearch()">
-                                    <option value="" @if(Request::get('status') == '') selected @endif>订单状态</option>
+                                    <option value="" @if(Request::get('status') == '') disabled selected hidden @endif>订单状态</option>
                                     <option value="-1" @if(Request::get('status') == '-1') selected @endif>已关闭</option>
                                     <option value="0" @if(Request::get('status') == '0') selected @endif>待支付</option>
                                     <option value="1" @if(Request::get('status') == '1') selected @endif>已支付待确认</option>

resources/views/admin/subscribeLog.blade.php

@@ -26,6 +26,13 @@
                             <div class="col-md-2 col-sm-2">
                                 <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
+                            <div class="col-md-2 col-sm-2">
+                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+                                    <option value="" @if(Request::get('status') == '')  disabled selected hidden @endif>状态</option>
+                                    <option value="0" @if(Request::get('status') == '0') selected @endif>禁用</option>
+                                    <option value="1" @if(Request::get('status') == '1') selected @endif>正常</option>
+                                </select>
+                            </div>
                             <div class="col-md-2 col-sm-2">
                                 <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
                                 <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
@@ -101,8 +108,9 @@
         function doSearch() {
             var user_id = $("#user_id").val();
             var username = $("#username").val();
+            var status = $("#status option:checked").val();
 
-            window.location.href = '{{url('admin/subscribeLog')}}' + '?user_id=' + user_id + '&username=' + username;
+            window.location.href = '{{url('admin/subscribeLog')}}' + '?user_id=' + user_id + '&username=' + username + '&status=' + status;
         }
 
         // 重置

resources/views/admin/userList.blade.php

@@ -43,7 +43,7 @@
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="pay_way" id="pay_way" onChange="doSearch()">
-                                    <option value="" @if(Request::get('pay_way') == '') selected @endif>付费方式</option>
+                                    <option value="" @if(Request::get('pay_way') == '') disabled selected hidden @endif>付费方式</option>
                                     <option value="0" @if(Request::get('pay_way') == '0') selected @endif>免费</option>
                                     <option value="1" @if(Request::get('pay_way') == '1') selected @endif>月付</option>
                                     <option value="2" @if(Request::get('pay_way') == '2') selected @endif>季付</option>
@@ -53,7 +53,7 @@
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
-                                    <option value="" @if(Request::get('status') == '') selected @endif>账号状态</option>
+                                    <option value="" @if(Request::get('status') == '') disabled selected hidden @endif>账号状态</option>
                                     <option value="-1" @if(Request::get('status') == '-1') selected @endif>禁用</option>
                                     <option value="0" @if(Request::get('status') == '0') selected @endif>未激活</option>
                                     <option value="1" @if(Request::get('status') == '1') selected @endif>正常</option>
@@ -61,7 +61,7 @@
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="enable" id="enable" onChange="doSearch()">
-                                    <option value="" @if(Request::get('enable') == '') selected @endif>代理状态</option>
+                                    <option value="" @if(Request::get('enable') == '') disabled selected hidden @endif>代理状态</option>
                                     <option value="1" @if(Request::get('enable') == '1') selected @endif>启用</option>
                                     <option value="0" @if(Request::get('enable') == '0') selected @endif>禁用</option>
                                 </select>

resources/views/admin/userRebateList.blade.php

@@ -27,8 +27,8 @@
                                 <input type="text" class="col-md-4 form-control input-sm" name="ref_username" value="{{Request::get('ref_username')}}" id="ref_username" placeholder="邀请人" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
 							<div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch() pla">
-                                    <option value="" @if(Request::get('status') == '')  disabled selected @endif>状态</option>
+                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+                                    <option value="" @if(Request::get('status') == '')  disabled selected hidden @endif>状态</option>
                                     <option value="0" @if(Request::get('status') == '0') selected @endif>未提现</option>
                                     <option value="1" @if(Request::get('status') == '1') selected @endif>申请中</option>
                                     <option value="2" @if(Request::get('status') == '2') selected @endif>已提现</option>