彭俊 hace 6 años
padre
commit
7bbd49e505

+ 5 - 0
app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -32,6 +32,7 @@ class SoccerStringNoteListController extends Controller
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['match_id'] = isset($req->match_id) ? trim($req->match_id) : '';
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
+
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerStringNoteList/info');
         $dt->setLang('sportsnotelist');
@@ -67,6 +68,7 @@ class SoccerStringNoteListController extends Controller
         $status = Request::has('status') ? Request::get('status') : '';
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+
         $where = array();
         if (!empty($account)) {
             if (empty($sureblur) || $sureblur == 'off') {
@@ -100,6 +102,8 @@ class SoccerStringNoteListController extends Controller
                 for($i=0;$i<count($csorder);$i++){
                     $ids[] = $csorder[$i]['order_id'];
                 }
+            }else{
+                return \App\Lib\DataTable\DataTable::init()->toJson([]);
             }
         }
         
@@ -130,6 +134,7 @@ class SoccerStringNoteListController extends Controller
         $newapp = new \App\Models\MoneyBuyStr();
         $data = $newapp->getinfo($list, $page, $where,$ids);
 
+
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
 

+ 2 - 1
app/Models/MoneyBuyStr.php

@@ -42,7 +42,8 @@ class MoneyBuyStr extends BaseModel {
                 ->wherein('money_buy_str.order_id',$ids)
                 ->orderby('money_buy_str.money_time','desc')
                 ->paginate ($list);
-        }else{
+        }
+        else{
             $data = $this
                 ->join('money_details','money_details.info_identity','=','money_buy_str.info_identity')
                 ->select('money_buy_str.id','money_buy_str.account_name','money_buy_str.account_identity','money_buy_str.order_id','money_buy_str.str_type','money_buy_str.money','money_buy_str.prize_money','money_buy_str.status','money_buy_str.money_time','money_buy_str.settle_status','money_buy_str.game_status','money_buy_str.gain_money','money_details.money_cash','money_buy_str.batch_id')

+ 4 - 0
resources/views/admin/Sportsbq/outcome.blade.php

@@ -30,6 +30,10 @@
         <span><a href="/admin/SoccerNoteList/notelist?type=bq&match_id=@{{d.match_id}}"> 单式</a></span>
     </script>
 
+    <script type="text/html" id="csnum">
+        <span><a href="/admin/SoccerStringNoteList/notelist?match_id=@{{d.match_id}}"> 串式</a></span>
+    </script>
+
     <script type="text/html" id="statusmatch">
     @{{#if(d.status==0){ }}
         <span>未开始</span>

+ 4 - 0
resources/views/admin/Sportswq/outcome.blade.php

@@ -23,6 +23,10 @@
         <span><a href="/admin/SoccerNoteList/notelist?type=wq&match_id=@{{d.match_id}}">单式</a></span>
     </script>
 
+    <script type="text/html" id="csnum">
+        <span><a href="/admin/SoccerStringNoteList/notelist?match_id=@{{d.match_id}}">串式</a></span>
+    </script>
+
     <script type="text/html" id="statusmatch">
     @{{#if(d.status==0){ }}
         <span>未开始</span>

+ 4 - 0
resources/views/admin/sportsbk/outcome.blade.php

@@ -134,6 +134,10 @@
         <span><a href="/admin/SoccerNoteList/notelist?type=lq&match_id=@{{d.match_id}}"> 单式</a></span>
     </script>
 
+    <script type="text/html" id="csnum">
+        <span><a href="/admin/SoccerStringNoteList/notelist?match_id=@{{d.match_id}}"> 串式</a></span>
+    </script>
+
     <script type="text/html" id="matchstatus">
       @{{#if(d.status==0){ }}
         <span>未开始</span>

+ 1 - 1
resources/views/admin/user/index.blade.php

@@ -186,7 +186,7 @@
 							</div>
 						</div>
 					
-						 <div class="layui-inline" style="width: 25%">
+						 <div class="layui-inline" style="width: 30%">
 							<div class="layui-input-inline"  style="width: 200px">
 								<select name="select_type" id="form_select_type" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
 									<option value="">{{ trans('user.select_option') }}</option>