彭俊 6 жил өмнө
parent
commit
7e23ff6673

+ 2 - 1
app/Http/Controllers/Admin/BqChampionsLeagueController.php

@@ -84,7 +84,8 @@ class BqChampionsLeagueController extends Controller
 
         $newapp = new \App\Models\BaseLeague();
         $data = $newapp->get_league_gj_info($list, $page, $where);
-        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+        $allcount = \App\Models\BaseLeague::where($where)->distinct('name_chinese')->count();
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $allcount);
     }
 
     /**

+ 2 - 1
app/Http/Controllers/Admin/LqChampionsLeagueController.php

@@ -84,7 +84,8 @@ class LqChampionsLeagueController extends Controller
 
         $newapp = new \App\Models\BasketLeague();
         $data = $newapp->get_league_gj_info($list, $page, $where);
-        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+        $allcount = \App\Models\BasketLeague::where($where)->distinct('name_chinese')->count();
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $allcount);
     }
 
     /**

+ 2 - 1
app/Http/Controllers/Admin/WqChampionsLeagueController.php

@@ -85,7 +85,8 @@ class WqChampionsLeagueController extends Controller
 
         $newapp = new \App\Models\TennisLeague();
         $data = $newapp->get_league_gj_info($list, $page, $where);
-        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+        $allcount = \App\Models\TennisLeague::where($where)->distinct('name_chinese')->count();
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $allcount);
     }
 
     /**

+ 8 - 2
app/Http/Controllers/Admin/ZqChampionsLeagueController.php

@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request as Req;
 use Request;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Class ZqChampionsLeagueController
@@ -81,10 +82,15 @@ class ZqChampionsLeagueController extends Controller
         if($status != 0){
             $where[] = array('st_zq_league.status', '=', $status);
         }
-
+        // if(is_array ($where) && count ($where) > 0){
+        //     $where[] = array('st_zq_odds.type', 1);
+        // }
+        
         $newapp = new \App\Models\SoccerLeague();
         $data = $newapp->get_league_gj_info($list, $page, $where);
-        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+        $allcount = \App\Models\SoccerLeague::where($where)->distinct('name_chinese')->count();
+
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $allcount);
     }
 
     /**

+ 0 - 1
app/Http/Controllers/Api/WriteSportsController.php

@@ -338,7 +338,6 @@ class WriteSportsController extends BaseController{
                                 $up_match['match_date'] = $data['match_date'];
                                 $up_match['match_time'] = $data['match_time'];
                                 $up_match['us_time'] = $data['us_time'];
-
                             }
 
                             //如果是网球 追加rule 字段

+ 2 - 2
app/Models/SoccerLeague.php

@@ -114,8 +114,8 @@ class SoccerLeague extends BaseModel {
             $data = $this
                 ->join('st_zq_odds','st_zq_odds.lg_id','=','st_zq_league.id')
                 ->select('st_zq_league.id','st_zq_league.name_chinese','st_zq_league.area_id','st_zq_league.country_id','st_zq_league.status','st_zq_league.utime')
-                ->orderby('st_zq_league.utime','desc')
                 ->where($where)
+                ->orderby('st_zq_league.utime','desc')
                 ->distinct('st_zq_league.name_chinese')
                 ->paginate ($list);
         }else{
@@ -123,8 +123,8 @@ class SoccerLeague extends BaseModel {
                 ->join('st_zq_odds','st_zq_odds.lg_id','=','st_zq_league.id')
                 ->select('st_zq_league.id','st_zq_league.name_chinese','st_zq_league.area_id','st_zq_league.country_id','st_zq_league.status','st_zq_league.utime')
                 ->where('st_zq_odds.type',1)
-                ->distinct('st_zq_league.name_chinese')
                 ->orderby('st_zq_league.utime','desc')
+                ->distinct('st_zq_league.name_chinese')
                 ->paginate ($list);
         }
         if (!$data) {

+ 0 - 1
resources/views/sports/soccer_league.blade.php

@@ -254,7 +254,6 @@
         }
     </script>
     @include('vip.datatable')
-    <!-- <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script> -->
     <script>
         var id;
         var aa;