彭俊 6 سال پیش
والد
کامیت
421a6a9139
47فایلهای تغییر یافته به همراه2727 افزوده شده و 529 حذف شده
  1. 184 0
      app/Http/Controllers/Admin/BaseNoteListController.php
  2. 17 7
      app/Http/Controllers/Admin/BasketNoteListController.php
  3. 17 7
      app/Http/Controllers/Admin/SoccerNoteListController.php
  4. 465 39
      app/Http/Controllers/Admin/SportsBaseController.php
  5. 186 47
      app/Http/Controllers/Admin/SportsBasketController.php
  6. 10 16
      app/Http/Controllers/Admin/SportsSoccerController.php
  7. 178 39
      app/Http/Controllers/Admin/SportsTennisController.php
  8. 10 1
      app/Http/Controllers/Admin/SportsbkController.php
  9. 6 1
      app/Http/Controllers/Admin/SportsfootController.php
  10. 184 0
      app/Http/Controllers/Admin/TennisNoteListController.php
  11. 46 46
      app/Http/Controllers/Admin/UserController.php
  12. 3 3
      app/Models/Account.php
  13. 9 1
      app/Models/BaseLeague.php
  14. 51 0
      app/Models/BaseOdds.php
  15. 15 0
      app/Models/BaseOddsRecord.php
  16. 1 1
      app/Models/BasketLeague.php
  17. 28 9
      app/Models/BasketOdds.php
  18. 15 0
      app/Models/BasketOddsRecord.php
  19. 12 0
      app/Models/SoccerOdds.php
  20. 56 9
      app/Models/SportsBase.php
  21. 12 2
      app/Models/SportsBasket.php
  22. 12 4
      app/Models/SportsNoteList.php
  23. 6 5
      app/Models/SportsTennis.php
  24. 28 9
      app/Models/TennisOdds.php
  25. 15 0
      app/Models/TennisOddsRecord.php
  26. 4 0
      resources/lang/zh-cn/sportsnotelist.php
  27. 141 0
      resources/lang/zh-cn/sportsoddscode.php
  28. 9 136
      resources/lang/zh-cn/sportssoccer.php
  29. 16 0
      resources/lang/zh-cn/sportstennis.php
  30. 20 20
      resources/views/admin/sportsbk/addoutcome.blade.php
  31. 1 1
      resources/views/admin/sportsfoot/addoutcome.blade.php
  32. 113 19
      resources/views/sports/base_form.blade.php
  33. 74 7
      resources/views/sports/base_match.blade.php
  34. 168 0
      resources/views/sports/base_odds.blade.php
  35. 150 0
      resources/views/sports/base_odds_form.blade.php
  36. 109 1
      resources/views/sports/basket_form.blade.php
  37. 45 2
      resources/views/sports/basket_match.blade.php
  38. 36 3
      resources/views/sports/basket_odds.blade.php
  39. 32 18
      resources/views/sports/basket_odds_form.blade.php
  40. 6 31
      resources/views/sports/soccer_match.blade.php
  41. 4 4
      resources/views/sports/soccer_odds.blade.php
  42. 1 1
      resources/views/sports/soccer_odds_form.blade.php
  43. 9 9
      resources/views/sports/sports_notelist.blade.php
  44. 111 3
      resources/views/sports/tennis_form.blade.php
  45. 43 6
      resources/views/sports/tennis_match.blade.php
  46. 36 3
      resources/views/sports/tennis_odds.blade.php
  47. 33 19
      resources/views/sports/tennis_odds_form.blade.php

+ 184 - 0
app/Http/Controllers/Admin/BaseNoteListController.php

@@ -0,0 +1,184 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/9
+ * Time: 9:11
+ */
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Illuminate\Support\Facades\DB;
+use App\Models;
+use Request;
+
+/**
+ *
+ */
+class BaseNoteListController extends Controller
+{
+
+    public function notelist(Req $req)
+    {
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
+        $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/BaseNoteList/info');
+        $dt->setLang('sportsnotelist');
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 70));
+        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
+        $dt->addColsFields('game', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('game_no', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('prize_note', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        //$dt->addColsFields('prize', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        //$arr[] = 'view';
+        if (checkRriv('/admin/BaseNoteList/edit')) {
+            $arr[] = 'edit';
+        }
+        $dt->setToolBar($arr, array('width' => 80));
+        $dt->enableCheckBox();
+        return view('sports/sports_notelist', $dt->render($request));
+    }
+
+    function info()
+    {
+        $type = 'bq';
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
+//        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+        $where = array();
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('money_buy.money_time', '>', $star_time);
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }else{
+                $where[] = array('money_buy.money_time', '>', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }
+        }
+        $newapp = new \App\Models\SportsNoteList();
+        $data = $newapp->getinfo($list, $page, $where,$type);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+    }
+
+    /**
+     *修改订单
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        $lange = trans('sportssoccer');
+        $data = \App\Models\SportsNoteList::where('id',$id)->first();
+        $data->order_time = $data->order_id.'     '.$data->money_time;
+        //for($i=0;$i<count($data);$i++){
+        $codes = json_decode($data->codes, true);
+        $data->content = '';
+        for($j=0;$j<count($codes);$j++){
+            $odds_only = $data->odds_only;
+            $res = DB::table('st_bq_odds_record')->where('odds_only',$odds_only)->first();
+            $result = DB::table('st_odds_code')->where('odds_code',$res['odds_code'])->first();
+            //$result = \App\Models\Matchcode::where('odds_code',$res->odds_code)->first();
+            $game = DB::table('st_game_type')->where('game_code',$data->game_name)->first();
+            $data->content = $data->content.$result['odds_name'].  '¥'.$codes[$j]['bet_amount'];
+            $data->game = $game->game_name;
+        }
+        //}
+
+        if (!$req->isMethod('post')) {
+
+
+            $data = $data->toArray();
+
+            return view('sports/sports_notelist_form', $data);
+        } else {
+            $model = new \App\Models\SportsNoteList();
+            $model->id = $req->input('id');
+            $model = $model::find($model->id);
+            $model->water_status = $req->input('water_status');
+            $model->settle_status = $req->input('settle_status');
+            $model->game_status = $req->input('game_status');
+            //$model->utime = date('Y-m-d H:i:s',time());
+
+            $model->save();
+            return responseToJson(1);
+        }
+
+    }
+
+    /**
+     *订单审核
+     */
+    public function orderstatus(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+
+
+    /**
+     *删除订单
+     */
+    public function delete(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+}

+ 17 - 7
app/Http/Controllers/Admin/BasketNoteListController.php

@@ -23,7 +23,8 @@ class BasketNoteListController extends Controller
     {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
-        $request['money_time'] = isset($req->money_time) ? trim($req->money_time) : null;
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BasketNoteList/info');
         $dt->setLang('sportsnotelist');
@@ -56,14 +57,23 @@ class BasketNoteListController extends Controller
         $type = 'lq';
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
-        //  $money_time = Request::has('money_time') ? Request::get('money_time') : '';
+        $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 //        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        //$where[] = array('money_buy.game_name', '=', $type);
-//        if (!empty($money_time)) {
-//            $where[] = array('money_buy.money_time', 'like', '%' .$money_time . '%');
-//            //$where[] = array('money_buy.money_time', 'like', '%2019-04-12%');
-//        }
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('money_buy.money_time', '>', $star_time);
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }else{
+                $where[] = array('money_buy.money_time', '>', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }
+        }
         $newapp = new \App\Models\SportsNoteList();
         $data = $newapp->getinfo($list, $page, $where,$type);
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);

+ 17 - 7
app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -23,7 +23,8 @@ class SoccerNoteListController extends Controller
     {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
-        $request['money_time'] = isset($req->money_time) ? trim($req->money_time) : null;
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerNoteList/info');
         $dt->setLang('sportsnotelist');
@@ -56,14 +57,23 @@ class SoccerNoteListController extends Controller
         $type = 'zq';
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
-      //  $money_time = Request::has('money_time') ? Request::get('money_time') : '';
+        $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
 //        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        //$where[] = array('money_buy.game_name', '=', $type);
-//        if (!empty($money_time)) {
-//            $where[] = array('money_buy.money_time', 'like', '%' .$money_time . '%');
-//            //$where[] = array('money_buy.money_time', 'like', '%2019-04-12%');
-//        }
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('money_buy.money_time', '>', $star_time);
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }else{
+                $where[] = array('money_buy.money_time', '>', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }
+        }
         $newapp = new \App\Models\SportsNoteList();
         $data = $newapp->getinfo($list, $page, $where,$type);
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);

+ 465 - 39
app/Http/Controllers/Admin/SportsBaseController.php

@@ -13,64 +13,129 @@ use Request;
  */
 class SportsBaseController extends Controller {
 
-    public function score(Request $req) {
-        $request['id'] = isset($req->id) ? trim($req->id) : null;
+    public function score(Req $req) {
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+        $request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
+        $request['status'] = isset($req->status) ? trim($req->status) : '-1';
+        $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
+        $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsBase/info');
         $dt->setLang('sportsbase');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
-        $dt->addColsFields('home_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
-        $dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
-        $dt->addColsFields('match_date');
-        $dt->addColsFields('match_time');
-        $dt->addColsFields('status', array('templet' => '#status', 'sort' => false, 'width' => 150,'align' => 'left'));
-        $arr[] = 'view';
+        $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
+        $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 260));
+//        $dt->addColsFields('home_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 130));
+//        $dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 130));
+        $dt->addColsFields('match_date', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
+        $dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 130));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+        //$arr[] = 'view';
+        if (checkRriv('/admin/SportsBase/edit')) {
+            $arr[] = 'edit';
+        }
+        if (checkRriv('/admin/SportsBase/odds')) {
+            $arr[] = 'odds';
+        }
+        $dt->setToolBar($arr, array('width' => 200));
         $dt->enableCheckBox();
         return view('sports/base_match', $dt->render($request));
     }
 
-    function info() {
-        $db = new \App\Models\SportsBase();
-        $data = $db->getInfos();
-        return \App\Lib\DataTable\DataTable::init()->toJson($data);
-    }
-
-    //进行中/已结束
-    function UserStart(Req $req) {
-        $id = $req->id;
-        $status = is_numeric($req->status) ? intval($req->status) : '';
-        if (empty($id) || !is_numeric($status)) {
-            return responseToJson(-2020100102);
-        }
-        $u_db = new \App\Models\SportsBase;
-        $data = array(
-            'status' => $status,
-        );
-        $res = $u_db->updateInfos($data, $id);
-        return responseToJson($res);
+    function info(Req $req) {
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+        $home_team = Request::has('home_team') ? Request::get('home_team') : '';
+        $match_date = Request::has('match_date') ? Request::get('match_date') : '';
+        //$match_date = $req->input('match_date');
+//        if(!empty($match_date)){
+//            return 2;
+//        }
+        $status = Request::has('status') ? Request::get('status') : '';
+        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+        $where = array();
+        $orwhere = array();
+        if (!empty($name_chinese) && $name_chinese!=-1) {
+            $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+        }
+        if (!empty($home_team)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_bq_competition.home_team', 'like', '%' . $home_team . '%');
+                $orwhere[] = array('st_bq_competition.guest_team', 'like', '%' . $home_team . '%');
+            } else {
+                $where[] = array('st_bq_competition.home_team', '=', $home_team);
+                $orwhere[] = array('st_bq_competition.guest_team', '=', $home_team);
+            }
+        }
+        if (!empty($match_date)) {
+//            $where[] = array('st_bq_competition.match_date', '=', '2019-04-13');
+            $where[] = array('st_bq_competition.match_date', '=', $match_date);
+        }
+        if ($status != -1) {
+            $where[] = array('st_bq_competition.status', '=', $status);
+        }
+        $newapp = new \App\Models\SportsBase();
+        $data = $newapp->getinfo($list, $page, $where,$orwhere);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
     }
-
+    /**
+     *获取所有足球联赛信息
+     */
     function getParent() {
-        $data = \App\Models\BaseLeague::select('id','name_chinese')->get();
+        $data = \App\Models\BaseLeague::select('id','lg_id','name_chinese')->get();
         if (!$data) {
             return;
         }
         return $data->toArray();
     }
-
+    /**
+     *获取所有国家信息
+     */
+    function getCountry() {
+        $data = \App\Models\Country::select('country_id','name_chinese')->get();
+        if (!$data) {
+            return;
+        }
+        for($i=0;$i<count($data);$i++){
+            $data[$i]->home_country_name = $data[$i]->name_chinese;
+            $data[$i]->home_country_id = $data[$i]->country_id;
+            $data[$i]->guest_country_name = $data[$i]->name_chinese;
+            $data[$i]->guest_country_id = $data[$i]->country_id;
+        }
+        return $data->toArray();
+    }
+    /**
+     *获取国家的球队信息
+     */
+    function getteam() {
+        $countryid = $_GET["countryid"];
+        $gametype = \App\Models\StGameType::where('game_code','bq')->first();
+        $res = \App\Models\Team::where('country_id',$countryid)->where('game_type_id',$gametype->id)->get();
+        return json_encode($res);
+    }
+    /**
+     *添加赛事
+     */
     function add(Req $req) {
         if (!$req->isMethod('post')) {
-            $data = $this->getParent();
+            $parents = $this->getParent();
+            $country = $this->getCountry();
+            $countrys = $this->getCountry();
             $lange = trans('menu');
-            foreach ($data as $k => $v) {
-                $arr = trim($data[$k]['name_chinese']);
+            foreach ($parents as $k => $v) {
+                $arr = trim($parents[$k]['name_chinese']);
                 if (isset($lange[$arr])) {
-                    $data[$k]['name']=$lange[$arr];
+                    $parents[$k]['name']=$lange[$arr];
                 }
             }
-            return view('sports.base_form', array('parents' => $data));
+            $data['parents'] = $parents;
+            $data['country'] = $country;
+            $data['countrys'] = $countrys;
+            return view('sports.base_form', $data);
         } else {
             $model = new \App\Models\SportsBase();
             $model->home_team = $req->input('home_team');
@@ -78,13 +143,374 @@ class SportsBaseController extends Controller {
             $model->lg_id = $req->input('parent_id');
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
-            //$model->match_score = $req->input('match_score');
             $model->status = $req->input('status');
+            $model->match_id = time() ;
+            $model->ctime = date('Y-m-d H:i:s',time());
+            $model->utime = date('Y-m-d H:i:s',time());
+            $model->tag = mt_rand(0,100) ;
+            $model->source = 'user-defined';
+
+            $model->save();
+            return responseToJson(1);
+
+        }
+    }
+
+    function view(Req $req) {
+        return $this->edit($req);
+    }
+
+    /**
+     *修改赛事
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        if (!$req->isMethod('post')) {
+            $country = $this->getCountry();
+            $countrys = $this->getCountry();
+            $data = \App\Models\SportsBase::where('id', $id)->first();
+            if (!$data) {
+                return -2;
+            }
+            $name_chinese = \App\Models\BaseLeague::where('lg_id', $data->lg_id)->first();
+//            $home_team = \App\Models\Team::where('team_name_cn', $data->home_team)->first();
+//            $guest_team = \App\Models\Team::where('team_name_cn', $data->guest_team)->first();
+//            $home_country = \App\Models\Country::where('country_id', $home_team->country_id)->first();
+//            $guest_country = \App\Models\Country::where('country_id', $guest_team->country_id)->first();
+            $data->name_chinese = $name_chinese->name_chinese;
+//            $data->home_country_id = $home_country->country_id;
+//            $data->guest_country_id = $guest_country->country_id;
+            $data = $data->toArray();
+            $data['parents'] = $this->getParent();
+            $data['country'] = $country;
+            $data['countrys'] = $countrys;
 
+
+            //$lange = trans('menu');
+            foreach ($data['parents'] as $k => $v) {
+                $arr = trim($data['parents'][$k]['name_chinese']);
+                if (isset($lange[$arr])) {
+                    $data['parents'][$k]['name_chinese']=$lange[$arr];
+                }
+            }
+
+            return view('sports.base_form', $data);
+        } else {
+            $model = new \App\Models\SportsBase();
+            $model->id = $req->input('id');
+            $model = $model::find($model->id);
+            $model->home_team = $req->input('home_team');
+            $model->guest_team = $req->input('guest_team');
+//            if(gettype($req->input('parent_id'))=='integer'){
+//                $model->lg_id = $req->input('parent_id');
+//            }else{
+//                $model->name_chinese = $req->input('parent_id');
+//                $res = \App\Models\SportsLeague::where('name_chinese',$model->name_chinese)->first();
+//                $model->lg_id = $res->lg_id;
+//            }
+            $model->lg_id = $req->input('parent_id');
+            $model->match_date = $req->input('match_date');
+            $model->match_time = $req->input('match_time');
+            $model->status = $req->input('status');
+            $model->ctime = date('Y-m-d H:i:s',time());
+            $model->utime = date('Y-m-d H:i:s',time());
             $model->save();
             return responseToJson(1);
+        }
+    }
+    /**
+     *删除赛事
+     */
+    public function delete(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsBase::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+
+    function odds(Req $req)
+    {
+        $cp_id = $req->id;
+        $request['status'] = isset($req->status) ? trim($req->status) : '-1';
+        $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
+        $request['id'] = isset($req->id) ? trim($req->id) : null;
+        $newapp = \App\Models\SportsBase::where('id',$request['id'])->first();
+        // $match_id = $newapp->match_id;
+        if(empty($newapp)){
+            $match_id = $req->input('cp_id');
+        }else{
+            $match_id = $newapp->match_id;
+        }
+        $request['match_id'] = isset($match_id) ? trim($match_id) : null;
+        $data = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
+        $request['pcode'] = $data;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/SportsBase/oddsinfo?match_id='.$match_id.'');
+        $dt->setLang('sportssoccer');
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
+        $dt->addColsFields('odds_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('condition', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('odds', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+//        $dt->addColsFields('p_id', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('p_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('max', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        if (checkRriv('/admin/SportsBase/oddsedit?id='.$cp_id.'')) {
+            $arr[] = 'oddsedit';
+        }
+        $dt->setToolBar($arr, array('width' => 150));
+        $dt->enableCheckBox();
+
+        return view('sports/base_odds', $dt->render($request));
+    }
+
+    function oddsinfo(Req $req){
+        $lange = trans('sportsoddscode');
+        $match_id = $req->match_id;
+        $p_code = Request::has('p_code') ? Request::get('p_code') : '';
+        $status = Request::has('status') ? Request::get('status') : '';
+        $where = array();
+        if (!empty($p_code) && $p_code!=-1) {
+            $where[] = array('st_bq_odds.p_code', '=', $p_code);
+        }
+        if (!empty($status) && $status != -1) {
+            $where[] = array('st_bq_odds.status', '=', $status);
+        }
+
+        if (intval($match_id) < 1) {
+            return -1;
+        }
+        $new = new \App\Models\BaseOdds();
+        $data = $new->getodds($match_id,$where);
+
+        foreach ($data as $k => $v) {
+            $odds_code = trim($data[$k]['odds_code']);
+            $p_code = trim($data[$k]['p_code']);
+            if (isset($lange[$odds_code])) {
+                $data[$k]['odds_code']=$lange[$odds_code];
+            }
+            if (isset($lange[$p_code])) {
+                $data[$k]['p_code']=$lange[$p_code];
+            }
+        };
+
+        return \App\Lib\DataTable\DataTable::init()->toJson($data);
+    }
+    /**
+     *根据选择的父级赔率代码获取对应的子级赔率代码
+     */
+    function getoddscode() {
+        $p_code = $_GET["pcode"];
+        $res = \App\Models\Matchcode::where('odds_code',$p_code)->first();
+        $codedata = \App\Models\Matchcode::where('p_id',$res->id)->get();
+        return json_encode($codedata);
+    }
+    /**
+     *添加赔率
+     */
+    function addodds(Req $req) {
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
+        for($i=0;$i<count($pcodedata);$i++){
+            $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
+        }
+
+        if (!$req->isMethod('post')) {
+            $cp_id = $_SERVER['QUERY_STRING'];  //获取url中的参数--赛事id
+            $data = ["match_id"=>$cp_id];
+            $data['pcode'] = $pcodedata;
+            return view('sports.base_odds_form',$data);
+        } else {
+            $model = new \App\Models\BaseOdds();
+            $date = new \App\Models\BaseOddsRecord();
+            $model->match_id = $req->input('match_id');
+            $model->odds_code = $req->input('code');
+            $model->status = $req->input('status');
+            $model->p_code = $req->input('pcode');
+            $res = \App\Models\Matchcode::where('odds_code',$model->p_code)->first();
+            $model->p_id = $res->id;
+            $result = \App\Models\BaseOdds::where('odds_code',$model->odds_code)->where('p_id',$model->p_id)->orderby('utime','desc')->first();
+            if(!empty($result)){
+                $sort = $result->sort;
+                $model->sort = $sort+1;
+            }else{
+                $model->sort = 0;
+            }
+            $model->odds = $req->input('odds');
+            $model->condition = $req->input('condition');
+            $model->max = $req->input('max');
+            $model->min = $req->input('min');
+            $model->ctime = date('Y-m-d H:i:s',time());
+            $model->utime = date('Y-m-d H:i:s',time());
+            $model->sole = md5($model->match_id.$model->odds_code.$model->sort.$model->p_id.$model->ctime);
+            $model->source = 'user-defined';
+            $lg_id = \App\Models\SportsBase::where('match_id',$model->match_id)->first();
+            if(!empty($lg_id)){
+                $model->lg_id = $lg_id->lg_id;
+            }
+            $model->expire_time = $req->input('expire_time');
+            $model->odds_only = md5($model->match_id.$model->odds_code.$model->ctime);
+
+            $date->match_id = $model->match_id;
+            $date->odds_code = $model->odds_code;
+            $date->status = $model->status;
+            $date->p_code = $model->p_code;
+            $date->p_id = $model->p_id;
+            $record = \App\Models\BaseOddsRecord::where('odds_code',$date->odds_code)->where('p_id',$date->p_id)->orderby('utime','desc')->first();
+            if(!empty($record)){
+                $sort = $record->sort;
+                $date->sort = $sort+1;
+            }else{
+                $date->sort = 0;
+            }
+            $date->odds = $model->odds;
+            $date->condition = $model->condition;
+            $date->max = $model->max;
+            $date->min = $model->min;
+            $date->ctime = $model->ctime;
+            $date->utime = $model->utime;
+            $date->source = $model->source;
+            $date->lg_id = $model->lg_id;
+            $date->odds_only = $model->odds_only;
+
+            $model->save();
+            $date->save();
+            return responseToJson(1);
+        }
+    }
+    /**
+     *修改赔率
+     */
+    function oddsedit(Req $req) {
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','bq')->get();
+        for($i=0;$i<count($pcodedata);$i++){
+            $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
+        }
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        if (!$req->isMethod('post')) {
+
+            $data = \App\Models\BaseOdds::where('id', $id)->first();
+            if (!$data) {
+                return -2;
+            }
+            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','bq')->first();
+            $data->odds_name = $res->odds_name;
+
+            $expire_time = $data->expire_time; //2019-04-15 21:10:00
+            $str1 = str_replace(" ","T",$expire_time);
+            $data->expire_time = $str1;
+
+            $odds_code = trim($data->odds_code);
+            $p_code = trim($data->p_code);
+            if (isset($lange[$odds_code])) {
+                $data->odds_code_cn=$lange[$odds_code];
+            }
+            if (isset($lange[$p_code])) {
+                $data->p_code_cn=$lange[$p_code];
+            }
+            $data = $data->toArray();
+
+            $data['pcode'] = $pcodedata;
+            //$data['code'] = $codedata;
+
+            return view('sports.base_odds_form', $data);
+        } else {
+            $model = new \App\Models\BaseOdds();
+            $data = new \App\Models\BaseOddsRecord();
+            $model->id = $req->input('id');
+            $model = $model::find($model->id);
+            $model->odds_code = $req->input('code');
+            $model->status = $req->input('status');
+            $model->p_code = $req->input('pcode');
+            $model->odds = $req->input('odds');
+            $model->condition = $req->input('condition');
+            $model->max = $req->input('max');
+            $model->min = $req->input('min');
+            $model->ctime = date('Y-m-d H:i:s',time());
+            $model->utime = date('Y-m-d H:i:s',time());
+            $model->expire_time = $req->input('expire_time');
+            $model->odds_only = md5($model->match_id.$model->odds_code.$model->ctime);
+
+            $result = \App\Models\BaseOdds::where('id',$model->id)->first();
+            $data->match_id = $result->match_id;
+            $data->odds_code = $model->odds_code;
+            $data->status = $model->status;
+            $data->p_code = $model->p_code;
+            $data->p_id = $model->p_id;
+            $record = \App\Models\BaseOddsRecord::where('match_id',$data->match_id)->where('odds_code',$data->odds_code)->where('p_id',$data->p_id)->orderby('utime','desc')->first();
+            if(!empty($record)){
+                $sort = $record->sort;
+                $data->sort = $sort+1;
+            }else{
+                $data->sort = 0;
+            }
+            $data->odds = $model->odds;
+            $data->condition = $model->condition;
+            $data->max = $model->max;
+            $data->min = $model->min;
+            $data->ctime = $model->ctime;
+            $data->utime = $model->utime;
+            $data->source = $result->source;
+            $data->lg_id = $result->lg_id;
+            $data->odds_only = $result->odds_only;
+
+            $model->save();
+            $data->save();
+            return responseToJson(1);
+        }
+
+    }
+    /**
+     *删除赔率
+     */
+    public function oddsdelete(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
 
+        $rows = \App\Models\BaseOdds::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
         }
+        return responseToJson(1, trans('menu.delete_success')); //id����
 
     }
 }

+ 186 - 47
app/Http/Controllers/Admin/SportsBasketController.php

@@ -14,8 +14,13 @@ use Request;
 class SportsBasketController extends Controller {
 
 	public function score(Req $req) {
-		$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
+		$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+		$request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
+		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
+		$request['league'] = $data;
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/SportsBasket/info');
 		$dt->setLang('sportsbase');
@@ -40,25 +45,46 @@ class SportsBasketController extends Controller {
 		return view('sports/basket_match', $dt->render($request));
 	}
 
-	function info() {
-		$lange = trans('sportssoccer');
+	function info(Req $req) {
 		$page = Request::has('page') ? Request::get('page') : '';
 		$list = Request::has('limit') ? Request::get('limit') : 10;
 		$name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
+		$match_date = Request::has('match_date') ? Request::get('match_date') : '';
+		//$match_date = $req->input('match_date');
+//        if(!empty($match_date)){
+//            return 2;
+//        }
+		$status = Request::has('status') ? Request::get('status') : '';
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$where = array();
-		if (!empty($name_chinese)) {
+		$orwhere = array();
+		if (!empty($name_chinese) && $name_chinese!=-1) {
+			$where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+		}
+		if (!empty($home_team)) {
 			if (empty($sureblur) || $sureblur == 'off') {
-				$where[] = array('st_lq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+				$where[] = array('st_lq_competition.home_team', 'like', '%' . $home_team . '%');
+				$orwhere[] = array('st_lq_competition.guest_team', 'like', '%' . $home_team . '%');
 			} else {
-				$where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+				$where[] = array('st_lq_competition.home_team', '=', $home_team);
+				$orwhere[] = array('st_lq_competition.guest_team', '=', $home_team);
 			}
 		}
+		if (!empty($match_date)) {
+//            $where[] = array('st_lq_competition.match_date', '=', '2019-04-13');
+			$where[] = array('st_lq_competition.match_date', '=', $match_date);
+		}
+		if ($status != -1) {
+			$where[] = array('st_lq_competition.status', '=', $status);
+		}
 		$newapp = new \App\Models\SportsBasket();
-		$data = $newapp->getinfo($list, $page, $where);
+		$data = $newapp->getinfo($list, $page, $where,$orwhere);
 		return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}
-
+	/**
+	 *获取所有篮球联赛信息
+	 */
 	function getParent() {
 		$data = \App\Models\BasketLeague::select('id','lg_id','name_chinese')->get();
 		if (!$data) {
@@ -66,20 +92,50 @@ class SportsBasketController extends Controller {
 		}
 		return $data->toArray();
 	}
+	/**
+	 *获取所有国家信息
+	 */
+	function getCountry() {
+		$data = \App\Models\Country::select('country_id','name_chinese')->get();
+		if (!$data) {
+			return;
+		}
+		for($i=0;$i<count($data);$i++){
+			$data[$i]->home_country_name = $data[$i]->name_chinese;
+			$data[$i]->home_country_id = $data[$i]->country_id;
+			$data[$i]->guest_country_name = $data[$i]->name_chinese;
+			$data[$i]->guest_country_id = $data[$i]->country_id;
+		}
+		return $data->toArray();
+	}
+	/**
+	 *获取国家的球队信息
+	 */
+	function getteam() {
+		$countryid = $_GET["countryid"];
+		$gametype = \App\Models\StGameType::where('game_code','zq')->first();
+		$res = \App\Models\Team::where('country_id',$countryid)->where('game_type_id',$gametype->id)->get();
+		return json_encode($res);
+	}
 	/**
 	 *添加赛事
 	 */
 	function add(Req $req) {
 		if (!$req->isMethod('post')) {
-			$data = $this->getParent();
+			$parents = $this->getParent();
+			$country = $this->getCountry();
+			$countrys = $this->getCountry();
 			$lange = trans('menu');
-			foreach ($data as $k => $v) {
-				$arr = trim($data[$k]['name_chinese']);
+			foreach ($parents as $k => $v) {
+				$arr = trim($parents[$k]['name_chinese']);
 				if (isset($lange[$arr])) {
-					$data[$k]['name']=$lange[$arr];
+					$parents[$k]['name']=$lange[$arr];
 				}
 			}
-			return view('sports.basket_form', array('parents' => $data));
+			$data['parents'] = $parents;
+			$data['country'] = $country;
+			$data['countrys'] = $countrys;
+			return view('sports.basket_form', $data);
 		} else {
 			$model = new \App\Models\SportsBasket();
 			$model->home_team = $req->input('home_team');
@@ -113,16 +169,24 @@ class SportsBasketController extends Controller {
 			return -1;
 		}
 		if (!$req->isMethod('post')) {
-
+			$country = $this->getCountry();
+			$countrys = $this->getCountry();
 			$data = \App\Models\SportsBasket::where('id', $id)->first();
 			if (!$data) {
 				return -2;
 			}
 			$name_chinese = \App\Models\BasketLeague::where('lg_id', $data->lg_id)->first();
+//            $home_team = \App\Models\Team::where('team_name_cn', $data->home_team)->first();
+//            $guest_team = \App\Models\Team::where('team_name_cn', $data->guest_team)->first();
+//            $home_country = \App\Models\Country::where('country_id', $home_team->country_id)->first();
+//            $guest_country = \App\Models\Country::where('country_id', $guest_team->country_id)->first();
 			$data->name_chinese = $name_chinese->name_chinese;
-			$data->league_id = $name_chinese->lg_id;
+//            $data->home_country_id = $home_country->country_id;
+//            $data->guest_country_id = $guest_country->country_id;
 			$data = $data->toArray();
 			$data['parents'] = $this->getParent();
+			$data['country'] = $country;
+			$data['countrys'] = $countrys;
 
 
 			//$lange = trans('menu');
@@ -188,23 +252,33 @@ class SportsBasketController extends Controller {
 	function odds(Req $req)
 	{
 		$cp_id = $req->id;
+		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
 		$request['id'] = isset($req->id) ? trim($req->id) : null;
-		$newapp = new \App\Models\SportsBasket();
-		$match_id = $newapp->getmatchid($request['id']);
+		$newapp = \App\Models\SportsBasket::where('id',$request['id'])->first();
+		// $match_id = $newapp->match_id;
+		if(empty($newapp)){
+			$match_id = $req->input('cp_id');
+		}else{
+			$match_id = $newapp->match_id;
+		}
 		$request['match_id'] = isset($match_id) ? trim($match_id) : null;
+		$data = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
+		$request['pcode'] = $data;
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/SportsBasket/oddsinfo?match_id='.$match_id.'');
 		$dt->setLang('sportssoccer');
 		$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
 		$dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
-		$dt->addColsFields('odds_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+		$dt->addColsFields('odds_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
 		$dt->addColsFields('condition', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
 		$dt->addColsFields('odds', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
 //        $dt->addColsFields('p_id', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
-		$dt->addColsFields('p_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
+		$dt->addColsFields('p_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
 		$dt->addColsFields('max', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		$dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		$dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+		$dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		if (checkRriv('/admin/SportsBasket/oddsedit?id='.$cp_id.'')) {
 			$arr[] = 'oddsedit';
 		}
@@ -215,24 +289,34 @@ class SportsBasketController extends Controller {
 	}
 
 	function oddsinfo(Req $req){
-		$lange = trans('sportssoccer');
+		$lange = trans('sportsoddscode');
 		$match_id = $req->match_id;
+		$p_code = Request::has('p_code') ? Request::get('p_code') : '';
+		$status = Request::has('status') ? Request::get('status') : '';
+		$where = array();
+		if (!empty($p_code) && $p_code!=-1) {
+			$where[] = array('st_lq_odds.p_code', '=', $p_code);
+		}
+		if (!empty($status) && $status != -1) {
+			$where[] = array('st_lq_odds.status', '=', $status);
+		}
+
 		if (intval($match_id) < 1) {
 			return -1;
 		}
 		$new = new \App\Models\BasketOdds();
-		$data = $new->getodds($match_id);
+		$data = $new->getodds($match_id,$where);
 
-		foreach ($data as $k => $v) {
-			$odds_code = trim($data[$k]['odds_code']);
-			$p_code = trim($data[$k]['p_code']);
-			if (isset($lange[$odds_code])) {
-				$data[$k]['odds_code']=$lange[$odds_code];
-			}
-			if (isset($lange[$p_code])) {
-				$data[$k]['p_code']=$lange[$p_code];
-			}
-		};
+//		foreach ($data as $k => $v) {
+//			$odds_code = trim($data[$k]['odds_code']);
+//			$p_code = trim($data[$k]['p_code']);
+//			if (isset($lange[$odds_code])) {
+//				$data[$k]['odds_code']=$lange[$odds_code];
+//			}
+//			if (isset($lange[$p_code])) {
+//				$data[$k]['p_code']=$lange[$p_code];
+//			}
+//		};
 
 		return \App\Lib\DataTable\DataTable::init()->toJson($data);
 	}
@@ -241,16 +325,15 @@ class SportsBasketController extends Controller {
 	 */
 	function getoddscode() {
 		$p_code = $_GET["pcode"];
-		$res = \App\Models\BasketGame::where('odds_code',$p_code)->first();
-		$codedata = \App\Models\BasketGame::where('pid',$res->id)->get();
+		$res = \App\Models\Matchcode::where('odds_code',$p_code)->first();
+		$codedata = \App\Models\Matchcode::where('p_id',$res->id)->get();
 		return json_encode($codedata);
 	}
 	/**
 	 *添加赔率
 	 */
 	function addodds(Req $req) {
-		//$lange = trans('sportssoccer');
-		$pcodedata = \App\Models\BasketGame::where('pid','0')->get();
+		$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
 		for($i=0;$i<count($pcodedata);$i++){
 			$pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
 		}
@@ -262,13 +345,12 @@ class SportsBasketController extends Controller {
 			return view('sports.basket_odds_form',$data);
 		} else {
 			$model = new \App\Models\BasketOdds();
-			$id = $req->input('match_id');
-			$rew = \App\Models\SportsBasket::where('id',$id)->first();
-			$model->match_id = $rew->match_id;
+			$date = new \App\Models\BasketOddsRecord();
+			$model->match_id = $req->input('match_id');
 			$model->odds_code = $req->input('code');
 			$model->status = $req->input('status');
 			$model->p_code = $req->input('pcode');
-			$res = \App\Models\BasketGame::where('odds_code',$model->p_code)->first();
+			$res = \App\Models\Matchcode::where('odds_code',$model->p_code)->first();
 			$model->p_id = $res->id;
 			$result = \App\Models\BasketOdds::where('odds_code',$model->odds_code)->where('p_id',$model->p_id)->orderby('utime','desc')->first();
 			if(!empty($result)){
@@ -289,7 +371,33 @@ class SportsBasketController extends Controller {
 			if(!empty($lg_id)){
 				$model->lg_id = $lg_id->lg_id;
 			}
+			$model->expire_time = $req->input('expire_time');
+			$model->odds_only = md5($model->match_id.$model->odds_code.$model->ctime);
+
+			$date->match_id = $model->match_id;
+			$date->odds_code = $model->odds_code;
+			$date->status = $model->status;
+			$date->p_code = $model->p_code;
+			$date->p_id = $model->p_id;
+			$record = \App\Models\BasketOddsRecord::where('odds_code',$date->odds_code)->where('p_id',$date->p_id)->orderby('utime','desc')->first();
+			if(!empty($record)){
+				$sort = $record->sort;
+				$date->sort = $sort+1;
+			}else{
+				$date->sort = 0;
+			}
+			$date->odds = $model->odds;
+			$date->condition = $model->condition;
+			$date->max = $model->max;
+			$date->min = $model->min;
+			$date->ctime = $model->ctime;
+			$date->utime = $model->utime;
+			$date->source = $model->source;
+			$date->lg_id = $model->lg_id;
+			$date->odds_only = $model->odds_only;
+
 			$model->save();
+			$date->save();
 			return responseToJson(1);
 		}
 	}
@@ -297,9 +405,7 @@ class SportsBasketController extends Controller {
 	 *修改赔率
 	 */
 	function oddsedit(Req $req) {
-		$lange = trans('sportssoccer');
-		$pcodedata = \App\Models\BasketGame::where('pid','0')->get();
-		//$codedata = \App\Models\SoccerGame::where('pid','!=','0')->get();
+		$pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','lq')->get();
 		for($i=0;$i<count($pcodedata);$i++){
 			$pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
 		}
@@ -313,23 +419,30 @@ class SportsBasketController extends Controller {
 			if (!$data) {
 				return -2;
 			}
+			$res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','lq')->first();
+			$data->odds_name = $res->odds_name;
 
-			$odds_code = trim($data['odds_code']);
-			$p_code = trim($data['p_code']);
+			$expire_time = $data->expire_time; //2019-04-15 21:10:00
+			$str1 = str_replace(" ","T",$expire_time);
+			$data->expire_time = $str1;
+
+			$odds_code = trim($data->odds_code);
+			$p_code = trim($data->p_code);
 			if (isset($lange[$odds_code])) {
-				$data['odds_code_cn']=$lange[$odds_code];
+				$data->odds_code_cn=$lange[$odds_code];
 			}
 			if (isset($lange[$p_code])) {
-				$data['p_code_cn']=$lange[$p_code];
+				$data->p_code_cn=$lange[$p_code];
 			}
 			$data = $data->toArray();
 
 			$data['pcode'] = $pcodedata;
 			//$data['code'] = $codedata;
 
-			return view('sports.soccer_odds_form', $data);
+			return view('sports.basket_odds_form', $data);
 		} else {
 			$model = new \App\Models\BasketOdds();
+			$data = new \App\Models\BasketOddsRecord();
 			$model->id = $req->input('id');
 			$model = $model::find($model->id);
 			$model->odds_code = $req->input('code');
@@ -341,8 +454,34 @@ class SportsBasketController extends Controller {
 			$model->min = $req->input('min');
 			$model->ctime = date('Y-m-d H:i:s',time());
 			$model->utime = date('Y-m-d H:i:s',time());
+			$model->expire_time = $req->input('expire_time');
+			$model->odds_only = md5($model->match_id.$model->odds_code.$model->ctime);
+
+			$result = \App\Models\BasketOdds::where('id',$model->id)->first();
+			$data->match_id = $result->match_id;
+			$data->odds_code = $model->odds_code;
+			$data->status = $model->status;
+			$data->p_code = $model->p_code;
+			$data->p_id = $model->p_id;
+			$record = \App\Models\BasketOddsRecord::where('match_id',$data->match_id)->where('odds_code',$data->odds_code)->where('p_id',$data->p_id)->orderby('utime','desc')->first();
+			if(!empty($record)){
+				$sort = $record->sort;
+				$data->sort = $sort+1;
+			}else{
+				$data->sort = 0;
+			}
+			$data->odds = $model->odds;
+			$data->condition = $model->condition;
+			$data->max = $model->max;
+			$data->min = $model->min;
+			$data->ctime = $model->ctime;
+			$data->utime = $model->utime;
+			$data->source = $result->source;
+			$data->lg_id = $result->lg_id;
+			$data->odds_only = $result->odds_only;
 
 			$model->save();
+			$data->save();
 			return responseToJson(1);
 		}
 

+ 10 - 16
app/Http/Controllers/Admin/SportsSoccerController.php

@@ -255,8 +255,6 @@ class SportsSoccerController extends Controller {
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
         $request['id'] = isset($req->id) ? trim($req->id) : null;
-//        $newapp = new \App\Models\SportsSoccer();
-//        $match_id = $newapp->getmatchid($request['id']);
         $newapp = \App\Models\SportsSoccer::where('id',$request['id'])->first();
        // $match_id = $newapp->match_id;
         if(empty($newapp)){
@@ -265,21 +263,18 @@ class SportsSoccerController extends Controller {
             $match_id = $newapp->match_id;
         }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
-        //$request['p_code'] = isset($req->p_code) ? trim($req->p_code) : null;
-        //$id = isset($req->id) ? trim($req->id) : null;
-        //$match_id = isset($req->match_id) ? trim($req->match_id) : null;
-        $data = \App\Models\SoccerGame::where('pid','0')->get();
+        $data = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
         $request['pcode'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsSoccer/oddsinfo?match_id='.$match_id.'');
         $dt->setLang('sportssoccer');
         $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
-        $dt->addColsFields('odds_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('odds_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('condition', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('odds', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
 //        $dt->addColsFields('p_id', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('p_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('p_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('max', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
@@ -294,7 +289,7 @@ class SportsSoccerController extends Controller {
     }
 
     function oddsinfo(Req $req){
-        $lange = trans('sportssoccer');
+        $lange = trans('sportsoddscode');
         $match_id = $req->match_id;
         $p_code = Request::has('p_code') ? Request::get('p_code') : '';
         $status = Request::has('status') ? Request::get('status') : '';
@@ -309,8 +304,6 @@ class SportsSoccerController extends Controller {
         if (intval($match_id) < 1) {
             return -1;
         }
-//        $newapp = new \App\Models\SportsSoccer();
-//        $match_id = $newapp->getmatchid($id);
         $new = new \App\Models\SoccerOdds();
         $data = $new->getodds($match_id,$where);
 
@@ -340,8 +333,7 @@ class SportsSoccerController extends Controller {
      *添加赔率
      */
     function addodds(Req $req) {
-        //$lange = trans('sportssoccer');
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type', 'like', '%zq%')->get();
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -358,7 +350,7 @@ class SportsSoccerController extends Controller {
             $model->odds_code = $req->input('code');
             $model->status = $req->input('status');
             $model->p_code = $req->input('pcode');
-            $res = \App\Models\SoccerGame::where('odds_code',$model->p_code)->first();
+            $res = \App\Models\Matchcode::where('odds_code',$model->p_code)->first();
             $model->p_id = $res->id;
             $result = \App\Models\SoccerOdds::where('odds_code',$model->odds_code)->where('p_id',$model->p_id)->orderby('utime','desc')->first();
             if(!empty($result)){
@@ -413,8 +405,7 @@ class SportsSoccerController extends Controller {
      *修改赔率
      */
     function oddsedit(Req $req) {
-        $lange = trans('sportssoccer');
-        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type', 'like', '%zq%')->get();
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','zq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -428,6 +419,9 @@ class SportsSoccerController extends Controller {
             if (!$data) {
                 return -2;
             }
+            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','zq')->first();
+            $data->odds_name = $res->odds_name;
+
             $expire_time = $data->expire_time; //2019-04-15 21:10:00
             $str1 = str_replace(" ","T",$expire_time);
             $data->expire_time = $str1;

+ 178 - 39
app/Http/Controllers/Admin/SportsTennisController.php

@@ -14,11 +14,16 @@ use Request;
 class SportsTennisController extends Controller {
 
     public function score(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+        $request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
+        $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
+        $request['league'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsTennis/info');
-        $dt->setLang('sportsbase');
+        $dt->setLang('sportstennis');
         $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
         $dt->addColsFields('lg_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('name_chinese', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
@@ -40,25 +45,46 @@ class SportsTennisController extends Controller {
         return view('sports/tennis_match', $dt->render($request));
     }
 
-    function info() {
-        $lange = trans('sportssoccer');
+    function info(Req $req) {
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
+        $home_team = Request::has('home_team') ? Request::get('home_team') : '';
+        $match_date = Request::has('match_date') ? Request::get('match_date') : '';
+        //$match_date = $req->input('match_date');
+//        if(!empty($match_date)){
+//            return 2;
+//        }
+        $status = Request::has('status') ? Request::get('status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
-        if (!empty($name_chinese)) {
+        $orwhere = array();
+        if (!empty($name_chinese) && $name_chinese!=-1) {
+            $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+        }
+        if (!empty($home_team)) {
             if (empty($sureblur) || $sureblur == 'off') {
-                $where[] = array('st_wq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+                $where[] = array('st_wq_competition.home_team', 'like', '%' . $home_team . '%');
+                $orwhere[] = array('st_wq_competition.guest_team', 'like', '%' . $home_team . '%');
             } else {
-                $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+                $where[] = array('st_wq_competition.home_team', '=', $home_team);
+                $orwhere[] = array('st_wq_competition.guest_team', '=', $home_team);
             }
         }
+        if (!empty($match_date)) {
+//            $where[] = array('st_wq_competition.match_date', '=', '2019-04-13');
+            $where[] = array('st_wq_competition.match_date', '=', $match_date);
+        }
+        if ($status != -1) {
+            $where[] = array('st_wq_competition.status', '=', $status);
+        }
         $newapp = new \App\Models\SportsTennis();
-        $data = $newapp->getinfo($list, $page, $where);
+        $data = $newapp->getinfo($list, $page, $where,$orwhere);
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
     }
-
+    /**
+     *获取所有足球联赛信息
+     */
     function getParent() {
         $data = \App\Models\TennisLeague::select('id','lg_id','name_chinese')->get();
         if (!$data) {
@@ -66,20 +92,50 @@ class SportsTennisController extends Controller {
         }
         return $data->toArray();
     }
+    /**
+     *获取所有国家信息
+     */
+    function getCountry() {
+        $data = \App\Models\Country::select('country_id','name_chinese')->get();
+        if (!$data) {
+            return;
+        }
+        for($i=0;$i<count($data);$i++){
+            $data[$i]->home_country_name = $data[$i]->name_chinese;
+            $data[$i]->home_country_id = $data[$i]->country_id;
+            $data[$i]->guest_country_name = $data[$i]->name_chinese;
+            $data[$i]->guest_country_id = $data[$i]->country_id;
+        }
+        return $data->toArray();
+    }
+    /**
+     *获取国家的球队信息
+     */
+    function getteam() {
+        $countryid = $_GET["countryid"];
+        $gametype = \App\Models\StGameType::where('game_code','wq')->first();
+        $res = \App\Models\Team::where('country_id',$countryid)->where('game_type_id',$gametype->id)->get();
+        return json_encode($res);
+    }
     /**
      *添加赛事
      */
     function add(Req $req) {
         if (!$req->isMethod('post')) {
-            $data = $this->getParent();
+            $parents = $this->getParent();
+            $country = $this->getCountry();
+            $countrys = $this->getCountry();
             $lange = trans('menu');
-            foreach ($data as $k => $v) {
-                $arr = trim($data[$k]['name_chinese']);
+            foreach ($parents as $k => $v) {
+                $arr = trim($parents[$k]['name_chinese']);
                 if (isset($lange[$arr])) {
-                    $data[$k]['name']=$lange[$arr];
+                    $parents[$k]['name']=$lange[$arr];
                 }
             }
-            return view('sports.tennis_form', array('parents' => $data));
+            $data['parents'] = $parents;
+            $data['country'] = $country;
+            $data['countrys'] = $countrys;
+            return view('sports.Tennis_form', $data);
         } else {
             $model = new \App\Models\SportsTennis();
             $model->home_team = $req->input('home_team');
@@ -113,16 +169,24 @@ class SportsTennisController extends Controller {
             return -1;
         }
         if (!$req->isMethod('post')) {
-
+            $country = $this->getCountry();
+            $countrys = $this->getCountry();
             $data = \App\Models\SportsTennis::where('id', $id)->first();
             if (!$data) {
                 return -2;
             }
             $name_chinese = \App\Models\TennisLeague::where('lg_id', $data->lg_id)->first();
+//            $home_team = \App\Models\Team::where('team_name_cn', $data->home_team)->first();
+//            $guest_team = \App\Models\Team::where('team_name_cn', $data->guest_team)->first();
+//            $home_country = \App\Models\Country::where('country_id', $home_team->country_id)->first();
+//            $guest_country = \App\Models\Country::where('country_id', $guest_team->country_id)->first();
             $data->name_chinese = $name_chinese->name_chinese;
-            $data->league_id = $name_chinese->lg_id;
+//            $data->home_country_id = $home_country->country_id;
+//            $data->guest_country_id = $guest_country->country_id;
             $data = $data->toArray();
             $data['parents'] = $this->getParent();
+            $data['country'] = $country;
+            $data['countrys'] = $countrys;
 
 
             //$lange = trans('menu');
@@ -133,7 +197,7 @@ class SportsTennisController extends Controller {
                 }
             }
 
-            return view('sports.tennis_form', $data);
+            return view('sports.Tennis_form', $data);
         } else {
             $model = new \App\Models\SportsTennis();
             $model->id = $req->input('id');
@@ -188,23 +252,33 @@ class SportsTennisController extends Controller {
     function odds(Req $req)
     {
         $cp_id = $req->id;
+        $request['status'] = isset($req->status) ? trim($req->status) : '-1';
+        $request['p_code'] = isset($req->p_code) ? trim($req->p_code) : '-1';
         $request['id'] = isset($req->id) ? trim($req->id) : null;
-        $newapp = new \App\Models\SportsTennis();
-        $match_id = $newapp->getmatchid($request['id']);
+        $newapp = \App\Models\SportsTennis::where('id',$request['id'])->first();
+        // $match_id = $newapp->match_id;
+        if(empty($newapp)){
+            $match_id = $req->input('cp_id');
+        }else{
+            $match_id = $newapp->match_id;
+        }
         $request['match_id'] = isset($match_id) ? trim($match_id) : null;
+        $data = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
+        $request['pcode'] = $data;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SportsTennis/oddsinfo?match_id='.$match_id.'');
         $dt->setLang('sportssoccer');
         $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 100));
-        $dt->addColsFields('odds_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('odds_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('condition', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('odds', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
 //        $dt->addColsFields('p_id', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('p_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('p_code_cn', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('max', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         if (checkRriv('/admin/SportsTennis/oddsedit?id='.$cp_id.'')) {
             $arr[] = 'oddsedit';
         }
@@ -215,13 +289,23 @@ class SportsTennisController extends Controller {
     }
 
     function oddsinfo(Req $req){
-        $lange = trans('sportssoccer');
+        $lange = trans('sportsoddscode');
         $match_id = $req->match_id;
+        $p_code = Request::has('p_code') ? Request::get('p_code') : '';
+        $status = Request::has('status') ? Request::get('status') : '';
+        $where = array();
+        if (!empty($p_code) && $p_code!=-1) {
+            $where[] = array('st_wq_odds.p_code', '=', $p_code);
+        }
+        if (!empty($status) && $status != -1) {
+            $where[] = array('st_wq_odds.status', '=', $status);
+        }
+
         if (intval($match_id) < 1) {
             return -1;
         }
         $new = new \App\Models\TennisOdds();
-        $data = $new->getodds($match_id);
+        $data = $new->getodds($match_id,$where);
 
         foreach ($data as $k => $v) {
             $odds_code = trim($data[$k]['odds_code']);
@@ -241,16 +325,15 @@ class SportsTennisController extends Controller {
      */
     function getoddscode() {
         $p_code = $_GET["pcode"];
-        $res = \App\Models\TennisGame::where('odds_code',$p_code)->first();
-        $codedata = \App\Models\TennisGame::where('pid',$res->id)->get();
+        $res = \App\Models\Matchcode::where('odds_code',$p_code)->first();
+        $codedata = \App\Models\Matchcode::where('p_id',$res->id)->get();
         return json_encode($codedata);
     }
     /**
      *添加赔率
      */
     function addodds(Req $req) {
-        //$lange = trans('sportssoccer');
-        $pcodedata = \App\Models\TennisGame::where('pid','0')->get();
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -262,13 +345,12 @@ class SportsTennisController extends Controller {
             return view('sports.tennis_odds_form',$data);
         } else {
             $model = new \App\Models\TennisOdds();
-            $id = $req->input('match_id');
-            $rew = \App\Models\SportsTennis::where('id',$id)->first();
-            $model->match_id = $rew->match_id;
+            $date = new \App\Models\TennisOddsRecord();
+            $model->match_id = $req->input('match_id');
             $model->odds_code = $req->input('code');
             $model->status = $req->input('status');
             $model->p_code = $req->input('pcode');
-            $res = \App\Models\TennisGame::where('odds_code',$model->p_code)->first();
+            $res = \App\Models\Matchcode::where('odds_code',$model->p_code)->first();
             $model->p_id = $res->id;
             $result = \App\Models\TennisOdds::where('odds_code',$model->odds_code)->where('p_id',$model->p_id)->orderby('utime','desc')->first();
             if(!empty($result)){
@@ -289,7 +371,33 @@ class SportsTennisController extends Controller {
             if(!empty($lg_id)){
                 $model->lg_id = $lg_id->lg_id;
             }
+            $model->expire_time = $req->input('expire_time');
+            $model->odds_only = md5($model->match_id.$model->odds_code.$model->ctime);
+
+            $date->match_id = $model->match_id;
+            $date->odds_code = $model->odds_code;
+            $date->status = $model->status;
+            $date->p_code = $model->p_code;
+            $date->p_id = $model->p_id;
+            $record = \App\Models\TennisOddsRecord::where('odds_code',$date->odds_code)->where('p_id',$date->p_id)->orderby('utime','desc')->first();
+            if(!empty($record)){
+                $sort = $record->sort;
+                $date->sort = $sort+1;
+            }else{
+                $date->sort = 0;
+            }
+            $date->odds = $model->odds;
+            $date->condition = $model->condition;
+            $date->max = $model->max;
+            $date->min = $model->min;
+            $date->ctime = $model->ctime;
+            $date->utime = $model->utime;
+            $date->source = $model->source;
+            $date->lg_id = $model->lg_id;
+            $date->odds_only = $model->odds_only;
+
             $model->save();
+            $date->save();
             return responseToJson(1);
         }
     }
@@ -297,9 +405,7 @@ class SportsTennisController extends Controller {
      *修改赔率
      */
     function oddsedit(Req $req) {
-        $lange = trans('sportssoccer');
-        $pcodedata = \App\Models\TennisGame::where('pid','0')->get();
-        //$codedata = \App\Models\SoccerGame::where('pid','!=','0')->get();
+        $pcodedata = \App\Models\Matchcode::where('p_id','0')->where('game_type','wq')->get();
         for($i=0;$i<count($pcodedata);$i++){
             $pcodedata[$i]->p_code = $pcodedata[$i]->odds_code;
         }
@@ -313,23 +419,30 @@ class SportsTennisController extends Controller {
             if (!$data) {
                 return -2;
             }
+            $res = \App\Models\Matchcode::where('odds_code', $data->odds_code)->where('game_type','wq')->first();
+            $data->odds_name = $res->odds_name;
 
-            $odds_code = trim($data['odds_code']);
-            $p_code = trim($data['p_code']);
+            $expire_time = $data->expire_time; //2019-04-15 21:10:00
+            $str1 = str_replace(" ","T",$expire_time);
+            $data->expire_time = $str1;
+
+            $odds_code = trim($data->odds_code);
+            $p_code = trim($data->p_code);
             if (isset($lange[$odds_code])) {
-                $data['odds_code_cn']=$lange[$odds_code];
+                $data->odds_code_cn=$lange[$odds_code];
             }
             if (isset($lange[$p_code])) {
-                $data['p_code_cn']=$lange[$p_code];
+                $data->p_code_cn=$lange[$p_code];
             }
             $data = $data->toArray();
 
             $data['pcode'] = $pcodedata;
             //$data['code'] = $codedata;
 
-            return view('sports.soccer_odds_form', $data);
+            return view('sports.tennis_odds_form', $data);
         } else {
             $model = new \App\Models\TennisOdds();
+            $data = new \App\Models\TennisOddsRecord();
             $model->id = $req->input('id');
             $model = $model::find($model->id);
             $model->odds_code = $req->input('code');
@@ -341,8 +454,34 @@ class SportsTennisController extends Controller {
             $model->min = $req->input('min');
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
+            $model->expire_time = $req->input('expire_time');
+            $model->odds_only = md5($model->match_id.$model->odds_code.$model->ctime);
+
+            $result = \App\Models\TennisOdds::where('id',$model->id)->first();
+            $data->match_id = $result->match_id;
+            $data->odds_code = $model->odds_code;
+            $data->status = $model->status;
+            $data->p_code = $model->p_code;
+            $data->p_id = $model->p_id;
+            $record = \App\Models\TennisOddsRecord::where('match_id',$data->match_id)->where('odds_code',$data->odds_code)->where('p_id',$data->p_id)->orderby('utime','desc')->first();
+            if(!empty($record)){
+                $sort = $record->sort;
+                $data->sort = $sort+1;
+            }else{
+                $data->sort = 0;
+            }
+            $data->odds = $model->odds;
+            $data->condition = $model->condition;
+            $data->max = $model->max;
+            $data->min = $model->min;
+            $data->ctime = $model->ctime;
+            $data->utime = $model->utime;
+            $data->source = $result->source;
+            $data->lg_id = $result->lg_id;
+            $data->odds_only = $result->odds_only;
 
             $model->save();
+            $data->save();
             return responseToJson(1);
         }
 

+ 10 - 1
app/Http/Controllers/Admin/SportsbkController.php

@@ -65,13 +65,22 @@ class SportsbkController extends Controller {
 		}
 		$newapp = new \App\Models\Stlqresult();
 		$data = $newapp->resultbklist($list, $page, $where, $orwhere);
+		
 		return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}
 
+	function saislist(){
+		$lgid = $_POST['lgid'];//赛事id
+		$newstzqcompetition = new \App\Models\SportsBasket();
+		$league_data = $newstzqcompetition->allcompetition($lgid);//赛事id
+
+		return $league_data;
+	}
+
 	function addoutcome(Req $req) {
 		if (!$req->isMethod('post')) {
             $lange = trans('menu');
-			$newapp = new \App\Models\SoccerLeague();
+			$newapp = new \App\Models\BasketLeague();
 			$league_data = $newapp->allleague();//联赛id
 			return view('admin.sportsbk/addoutcome',['data'=>$league_data]);
 		}else{

+ 6 - 1
app/Http/Controllers/Admin/SportsfootController.php

@@ -20,7 +20,7 @@ class SportsfootController extends Controller {
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
 		$request['source'] = isset($req->source) ? $req->source : null;
-		$request['name_chinese'] = isset($req->name_chinese) ? $req->name_chinese : '';
+		$request['name_chinese'] = isset($req->name_chinese) ? $req->name_chinese : null;
 		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
         $newapp = new \App\Models\SoccerLeague();
@@ -196,6 +196,11 @@ class SportsfootController extends Controller {
 		}
 		return responseToJson(1); 
 	}
+
+	//
+	function notelist(){
+		return view('admin.sportsfoot/notelist');
+	}
 	
 	
 	

+ 184 - 0
app/Http/Controllers/Admin/TennisNoteListController.php

@@ -0,0 +1,184 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/9
+ * Time: 9:11
+ */
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Illuminate\Support\Facades\DB;
+use App\Models;
+use Request;
+
+/**
+ *
+ */
+class TennisNoteListController extends Controller
+{
+
+    public function notelist(Req $req)
+    {
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
+        $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/TennisNoteList/info');
+        $dt->setLang('sportsnotelist');
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 70));
+        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
+        $dt->addColsFields('game', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('game_no', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('prize_note', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        //$dt->addColsFields('prize', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        //$arr[] = 'view';
+        if (checkRriv('/admin/TennisNoteList/edit')) {
+            $arr[] = 'edit';
+        }
+        $dt->setToolBar($arr, array('width' => 80));
+        $dt->enableCheckBox();
+        return view('sports/sports_notelist', $dt->render($request));
+    }
+
+    function info()
+    {
+        $type = 'wq';
+        $page = Request::has('page') ? Request::get('page') : '';
+        $list = Request::has('limit') ? Request::get('limit') : 10;
+        $star_time = Request::get('star_time') ? Request::get('star_time').' 00:00:00' : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time').' 23:59:59' : '';
+//        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+        $where = array();
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('money_buy.money_time', '>', $star_time);
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }else{
+                $where[] = array('money_buy.money_time', '>', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('money_buy.money_time', '<', $end_time);
+            }
+        }
+        $newapp = new \App\Models\SportsNoteList();
+        $data = $newapp->getinfo($list, $page, $where,$type);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+    }
+
+    /**
+     *修改订单
+     */
+    function edit(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
+        }
+        $lange = trans('sportssoccer');
+        $data = \App\Models\SportsNoteList::where('id',$id)->first();
+        $data->order_time = $data->order_id.'     '.$data->money_time;
+        //for($i=0;$i<count($data);$i++){
+        $codes = json_decode($data->codes, true);
+        $data->content = '';
+        for($j=0;$j<count($codes);$j++){
+            $odds_only = $data->odds_only;
+            $res = DB::table('st_wq_odds_record')->where('odds_only',$odds_only)->first();
+            $result = DB::table('st_odds_code')->where('odds_code',$res['odds_code'])->first();
+            //$result = \App\Models\Matchcode::where('odds_code',$res->odds_code)->first();
+            $game = DB::table('st_game_type')->where('game_code',$data->game_name)->first();
+            $data->content = $data->content.$result['odds_name'].  '¥'.$codes[$j]['bet_amount'];
+            $data->game = $game->game_name;
+        }
+        //}
+
+        if (!$req->isMethod('post')) {
+
+
+            $data = $data->toArray();
+
+            return view('sports/sports_notelist_form', $data);
+        } else {
+            $model = new \App\Models\SportsNoteList();
+            $model->id = $req->input('id');
+            $model = $model::find($model->id);
+            $model->water_status = $req->input('water_status');
+            $model->settle_status = $req->input('settle_status');
+            $model->game_status = $req->input('game_status');
+            //$model->utime = date('Y-m-d H:i:s',time());
+
+            $model->save();
+            return responseToJson(1);
+        }
+
+    }
+
+    /**
+     *订单审核
+     */
+    public function orderstatus(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+
+
+    /**
+     *删除订单
+     */
+    public function delete(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+}

+ 46 - 46
app/Http/Controllers/Admin/UserController.php

@@ -296,52 +296,52 @@ class UserController extends Controller
             // $data['data'][$k]['email'] = emailHide($v['email']);
         };
         $letime = time()-60*30;
-        foreach ($data['data'] as $k => $v) {
-            $findId[] = $v['agent_identity'];
-            $data['data'][$k]['online'] = ($v['statuss'] == 0) ? '离线' : '在线';
-            if($v['statuss']){
-                $linetime = \App\Models\Account_Token::where('effective_time','>=',$letime)->where('account_identity',$v['identity'])->first();
-                if($linetime){}else{
-                    \App\Models\Account_detailed::where('account_identity',$v['identity'])->update(['statuss'=>'0']);
-                    if(!empty($statuss) && $statuss==1){
-                        unset($data['data'][$k]);
-                        continue;
-                    }
-                    $data['data'][$k]['online'] = '离线';
-                    $data['data'][$k]['statuss'] = '0';
-                }
-            }
-            $data['data'][$k]['invite'] = ($v['invite']=='null' || empty($v['invite']))?'':$v['invite'];
-            $data['data'][$k]['agent_id'] = '无上级';
-            $data['data'][$k]['register_ip'] = str_replace(',','/',$v['register_ip']);
-            $data['data'][$k]['last_ip'] = str_replace(',','/',$v['last_ip']);
-            $has_root == 1 ? $data['data'][$k]['phone'] = phoneHide($v['phone']) : null;
-            $has_roots == 1 ? $data['data'][$k]['email'] = emailHide($v['email']) : null;
-
-            $show_name == 1 ? $data['data'][$k]['account'] = userHide($v['account']) : null;
-            $data['data'][$k]['grade_name'] = $gradelist[$v['grade']]??'';
-            // if($v['grade'] >=0){
-            //     $data['data'][$k]['grade_name'] = $gradelist[$v['grade']]??'';
-            // }elseif($v['grade'] ==-1){
-            //     $data['data'][$k]['grade_name'] = '申请vip审核中';
-            // }elseif($v['grade'] ==-2){
-            //     $data['data'][$k]['grade_name'] = 'vip0';
-            // }
-
-        }
-
-        if (!empty($findId)){
-            $db = new \App\Models\Agent_detailed;
-            $asd = $db->findId($findId);
-
-            foreach ($data['data'] as $k => $v) {
-                foreach ($asd as $val) {
-                    if ($v['agent_identity'] == $val['agent_identity']) {
-                        $data['data'][$k]['agent_id'] = $val['id'];
-                    }
-                }
-            }
-        }
+        // foreach ($data['data'] as $k => $v) {
+        //     $findId[] = $v['agent_identity'];
+        //     $data['data'][$k]['online'] = ($v['statuss'] == 0) ? '离线' : '在线';
+        //     if($v['statuss']){
+        //         $linetime = \App\Models\Account_Token::where('effective_time','>=',$letime)->where('account_identity',$v['identity'])->first();
+        //         if($linetime){}else{
+        //             \App\Models\Account_detailed::where('account_identity',$v['identity'])->update(['statuss'=>'0']);
+        //             if(!empty($statuss) && $statuss==1){
+        //                 unset($data['data'][$k]);
+        //                 continue;
+        //             }
+        //             $data['data'][$k]['online'] = '离线';
+        //             $data['data'][$k]['statuss'] = '0';
+        //         }
+        //     }
+        //     $data['data'][$k]['invite'] = ($v['invite']=='null' || empty($v['invite']))?'':$v['invite'];
+        //     $data['data'][$k]['agent_id'] = '无上级';
+        //     $data['data'][$k]['register_ip'] = str_replace(',','/',$v['register_ip']);
+        //     $data['data'][$k]['last_ip'] = str_replace(',','/',$v['last_ip']);
+        //     $has_root == 1 ? $data['data'][$k]['phone'] = phoneHide($v['phone']) : null;
+        //     $has_roots == 1 ? $data['data'][$k]['email'] = emailHide($v['email']) : null;
+
+        //     $show_name == 1 ? $data['data'][$k]['account'] = userHide($v['account']) : null;
+        //     $data['data'][$k]['grade_name'] = $gradelist[$v['grade']]??'';
+        //     // if($v['grade'] >=0){
+        //     //     $data['data'][$k]['grade_name'] = $gradelist[$v['grade']]??'';
+        //     // }elseif($v['grade'] ==-1){
+        //     //     $data['data'][$k]['grade_name'] = '申请vip审核中';
+        //     // }elseif($v['grade'] ==-2){
+        //     //     $data['data'][$k]['grade_name'] = 'vip0';
+        //     // }
+
+        // }
+
+        // if (!empty($findId)){
+        //     $db = new \App\Models\Agent_detailed;
+        //     $asd = $db->findId($findId);
+
+        //     foreach ($data['data'] as $k => $v) {
+        //         foreach ($asd as $val) {
+        //             if ($v['agent_identity'] == $val['agent_identity']) {
+        //                 $data['data'][$k]['agent_id'] = $val['id'];
+        //             }
+        //         }
+        //     }
+        // }
 
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }

+ 3 - 3
app/Models/Account.php

@@ -23,15 +23,15 @@ class Account extends BaseModel
         $tnum = ($tflag == -1) ? '' : ',tc.take_num';
         $rjoin = ($rflag == -1) ? '' : ' LEFT JOIN (SELECT account_identity,count("id") AS recharge_num FROM money_details a ' . $rechargestatus . ' GROUP BY a.account_identity) AS mc ON mc.account_identity=account.identity ';
         $tjoin = ($tflag == -1) ? '' : ' LEFT JOIN (SELECT account_identity,count(id) AS take_num FROM money_details d ' . $takestatus . ' GROUP BY d.account_identity) AS tc ON tc.account_identity=account.identity ';
-        $agent_join = " LEFT JOIN nagent_detailed c ON b.parent_id=c.agent_identity";
+        // $agent_join = " LEFT JOIN nagent_detailed c ON b.parent_id=c.agent_identity";
 
-        $sql = "SELECT account.id, account.identity,account, b.grade,c.agent_identity,c.agent_user as agent_name, b.cash, b.name, b.register_time, b.qq,b.wechat,b.register_ip, b.last_ip, b.phone, b.email, b.statuss,open_invitation,b.register_url,b.last_url,c.invite,to_char(last_time,'yyyy-mm-dd hh24:mi:ss') as last_time,account.status,b.statuss,b.parent_id" . $rnum . $tnum . " FROM account LEFT JOIN account_detailed b ON account.identity=b.account_identity" . $rjoin . $tjoin . $agent_join . " WHERE account.status<>4 " . $where . " ORDER BY " . $field . ' ' . $ads;
+        $sql = "SELECT account.id, account.identity,account, b.grade, b.cash, b.name, b.register_time, b.qq,b.wechat,b.register_ip, b.last_ip, b.phone, b.email, b.statuss,open_invitation,b.register_url,b.last_url,to_char(last_time,'yyyy-mm-dd hh24:mi:ss') as last_time,account.status,b.statuss,b.parent_id" . $rnum . $tnum . " FROM account LEFT JOIN account_detailed b ON account.identity=b.account_identity" . $rjoin . $tjoin . " WHERE account.status<>4 " . $where . " ORDER BY " . $field . ' ' . $ads;
         if (!empty($list)) {
             $offset = $list * ($page - 1);
             $sql .= ' LIMIT ' . $list . ' OFFSET ' . $offset;
         }
 
-        $countsql = "SELECT count(account.identity) FROM account INNER JOIN account_detailed b ON account.identity=b.account_identity " . $rjoin . $tjoin . $agent_join . " WHERE status<>4 " . $where;
+        $countsql = "SELECT count(account.identity) FROM account INNER JOIN account_detailed b ON account.identity=b.account_identity " . $rjoin . $tjoin . " WHERE status<>4 " . $where;
 
 
         Log::info ($sql);

+ 9 - 1
app/Models/BaseLeague.php

@@ -10,7 +10,15 @@ use Illuminate\Support\Facades\DB;
 class BaseLeague extends BaseModel {
     protected $table = "st_bq_league";
 
-
+    //所有赛事
+    function allleague()
+    {
+        $data = $this->select('lg_id','name_chinese')->get();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
 
 
 }

+ 51 - 0
app/Models/BaseOdds.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/1
+ * Time: 10:12
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class BaseOdds extends BaseModel
+{
+    protected $table = "st_bq_odds";
+    public $timestamps = false;
+
+    function getodds($match_id,$where = ''){
+        //$data=$this->where($where)->where('expire_time','<',date('Y-m-d H:i:s',time()))->get();
+        $data=$this->where('match_id',$match_id)->where($where)->get()->toArray();
+        $num=$this->where('match_id',$match_id)->where('sort',0)->get()->toArray();
+        $sort = array_column($data,'sort');
+        array_multisort($sort,SORT_DESC,$data);
+        $data = array_slice($data,0,count($num));
+
+        if(!$data < 0){
+            return -2021052003;
+        }
+
+        for($i=0;$i<count($data);$i++){
+            if($data[$i]['status']==0){
+                $data[$i]['status'] = '启用';
+            }else if($data[$i]['status']==1){
+                $data[$i]['status'] = '停用';
+            }else if($data[$i]['status']==-1){
+                $data[$i]['status'] = '禁用';
+            }
+            $odds_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['odds_code'])->first();
+            if(!empty($odds_name)){
+                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
+            }else{
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
+            $p_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['p_code'])->first();
+            if(!empty($p_name)){
+                $data[$i]['p_code_cn'] = $p_name->odds_name;
+            }else{
+                $data[$i]['p_code_cn'] = $data[$i]['p_code'];
+            }
+        }
+        return $data;
+
+    }
+}

+ 15 - 0
app/Models/BaseOddsRecord.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/1
+ * Time: 10:12
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class BaseOddsRecord extends BaseModel
+{
+    protected $table = "st_bq_odds_record";
+    public $timestamps = false;
+
+}

+ 1 - 1
app/Models/BasketLeague.php

@@ -15,7 +15,7 @@ class BasketLeague extends BaseModel {
     //所有联赛
     function allleague()
     {
-        $data = $this->select('id','name_chinese')->get();
+        $data = $this->select('lg_id','name_chinese')->get();
         if (!$data) {
             return -5040000102; //无相关信息
         }

+ 28 - 9
app/Models/BasketOdds.php

@@ -12,21 +12,40 @@ class BasketOdds extends BaseModel
     protected $table = "st_lq_odds";
     public $timestamps = false;
 
-    function getodds($match_id){
-        $data=$this->where('match_id',$match_id)->get();
+    function getodds($match_id,$where = ''){
+        //$data=$this->where($where)->where('expire_time','<',date('Y-m-d H:i:s',time()))->get();
+        $data=$this->where('match_id',$match_id)->where($where)->get()->toArray();
+        $num=$this->where('match_id',$match_id)->where('sort',0)->get()->toArray();
+        $sort = array_column($data,'sort');
+        array_multisort($sort,SORT_DESC,$data);
+        $data = array_slice($data,0,count($num));
+
         if(!$data < 0){
             return -2021052003;
         }
+
         for($i=0;$i<count($data);$i++){
-            if($data[$i]->status==0){
-                $data[$i]->status = '启用';
-            }else if($data[$i]->status==1){
-                $data[$i]->status = '停用';
-            }else if($data[$i]->status==-1){
-                $data[$i]->status = '禁用';
+            if($data[$i]['status']==0){
+                $data[$i]['status'] = '启用';
+            }else if($data[$i]['status']==1){
+                $data[$i]['status'] = '停用';
+            }else if($data[$i]['status']==-1){
+                $data[$i]['status'] = '禁用';
+            }
+            $odds_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['odds_code'])->first();
+            if(!empty($odds_name)){
+                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
+            }else{
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
+            $p_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['p_code'])->first();
+            if(!empty($p_name)){
+                $data[$i]['p_code_cn'] = $p_name->odds_name;
+            }else{
+                $data[$i]['p_code_cn'] = $data[$i]['p_code'];
             }
         }
-        return $data->toArray();
+        return $data;
 
     }
 }

+ 15 - 0
app/Models/BasketOddsRecord.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/1
+ * Time: 10:12
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class BasketOddsRecord extends BaseModel
+{
+    protected $table = "st_lq_odds_record";
+    public $timestamps = false;
+
+}

+ 12 - 0
app/Models/SoccerOdds.php

@@ -32,6 +32,18 @@ class SoccerOdds extends BaseModel
             }else if($data[$i]['status']==-1){
                 $data[$i]['status'] = '禁用';
             }
+            $odds_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['odds_code'])->first();
+            if(!empty($odds_name)){
+                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
+            }else{
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
+            $p_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['p_code'])->first();
+            if(!empty($p_name)){
+                $data[$i]['p_code_cn'] = $p_name->odds_name;
+            }else{
+                $data[$i]['p_code_cn'] = $data[$i]['p_code'];
+            }
         }
         return $data;
 

+ 56 - 9
app/Models/SportsBase.php

@@ -11,15 +11,54 @@ class SportsBase extends BaseModel {
     protected $table = "st_bq_competition";
     public $timestamps = false;
 
-    function getInfos(){
-        $data = DB::table('st_bq_competition')
-            ->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.id')
-            ->select('st_bq_competition.id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time')
-            ->orderby('match_date','desc')
-            ->orderby('match_time','desc')
-            ->get();
-        if(!$data){
-            return -6010000122;
+    function getinfo($list = 10, $page, $where = '',$orwhere = '')
+    {
+        if (is_array ($where) && count ($where) > 0) {
+            $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.lg_id')
+                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status')
+                ->orderby('st_bq_competition.match_date','desc')
+                ->orderby('st_bq_competition.match_time','desc')
+                ->where($where)
+                ->orwhere($orwhere)
+                ->paginate ($list);
+        } else {
+            $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.lg_id')
+                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status')
+                ->orderby('st_bq_competition.match_date','desc')
+                ->orderby('st_bq_competition.match_time','desc')
+                ->paginate ($list);
+        }
+        if (!$data < 0) {
+            return -2021052003; //
+        }
+        for($i=0;$i<count($data);$i++){
+            if($data[$i]->match_date < date('Y-m-d',time())){
+                $data[$i]->status = '2';
+                $this->where('id', $data[$i]->id)->update(['status' => 2]);
+            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time)+5400 <= strtotime(date('H:i:s',time()))){
+                $data[$i]->status = '2';
+                $this->where('id', $data[$i]->id)->update(['status' => 2]);
+            }
+            else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) < strtotime(date('H:i:s',time())) && strtotime(date('H:i:s',time())) < strtotime($data[$i]->match_time)+5400){
+                $data[$i]->status = '1';
+                $this->where('id', $data[$i]->id)->update(['status' => 1]);
+            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) > strtotime(date('H:i:s',time()))){
+                $data[$i]->status = '0';
+                $this->where('id', $data[$i]->id)->update(['status' => 0]);
+            }
+            else if($data[$i]->match_date > date('Y-m-d',time())){
+                $data[$i]->status = '0';
+                $this->where('id', $data[$i]->id)->update(['status' => 0]);
+            }
+
+            if($data[$i]->status==0){
+                $data[$i]->status = '未开始';
+            }else if($data[$i]->status==1){
+                $data[$i]->status = '正在进行';
+            }else if($data[$i]->status==2){
+                $data[$i]->status = '已结束';
+            }
+            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
         }
         return $data->toArray();
 
@@ -34,5 +73,13 @@ class SportsBase extends BaseModel {
         return 1;
     }
 
+    function getmatchid($id){
+        $res=$this->where('id',$id)->first();
+        if(!$res){
+            return -2021052003;
+        }
+        return $res->match_id;
+    }
+
 
 }

+ 12 - 2
app/Models/SportsBasket.php

@@ -11,7 +11,7 @@ class SportsBasket extends BaseModel {
     protected $table = "st_lq_competition";
     public $timestamps = false;
 
-    function getinfo($list = 10, $page, $where = '')
+    function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_lq_league','st_lq_competition.lg_id','=','st_lq_league.lg_id')
@@ -19,6 +19,7 @@ class SportsBasket extends BaseModel {
                 ->orderby('st_lq_competition.match_date','desc')
                 ->orderby('st_lq_competition.match_time','desc')
                 ->where($where)
+                ->orwhere($orwhere)
                 ->paginate ($list);
         } else {
             $data = $this->join('st_lq_league','st_lq_competition.lg_id','=','st_lq_league.lg_id')
@@ -74,12 +75,21 @@ class SportsBasket extends BaseModel {
 
     function getmatchid($id){
         $res=$this->where('id',$id)->first();
-        if(!$res<0){
+        if(!$res){
             return -2021052003;
         }
         return $res->match_id;
     }
 
+    //篮球赛事联赛查询
+    function allcompetition($lg_id){
+        $data = $this->where('lg_id',$lg_id)->select('lg_id','home_team')->get();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
+
 
 
 }

+ 12 - 4
app/Models/SportsNoteList.php

@@ -64,10 +64,18 @@ class SportsNoteList extends BaseModel {
             for($j=0;$j<count($codes);$j++){
                 $odds_only = $codes[$j]['odds_only'];
                 $res = DB::table('st_'.$type.'_odds_record')->where('odds_only',$odds_only)->first();
-                $result = DB::table('st_odds_code')->where('odds_code',$res->odds_code)->first();
-                $game = DB::table('st_game_type')->where('game_code',$data[$i]->game_name)->first();
-                $data[$i]->content = $data[$i]->content.$result->odds_name.  '¥'.$codes[$j]['bet_amount'].'<br>';
-                $data[$i]->game = $game->game_name;
+                if(!empty($res)){
+                    $result = DB::table('st_odds_code')->where('odds_code',$res->odds_code)->first();
+                    if(!empty($result)){
+                        $odds_name = $result->odds_name;
+                    }else{
+                        $odds_name = $res->odds_code;
+                    }
+                    $game = DB::table('st_game_type')->where('game_code',$data[$i]->game_name)->first();
+                    $data[$i]->content = $data[$i]->content.$odds_name.  '¥'.$codes[$j]['bet_amount'].'<br>';
+                    $data[$i]->game = $game->game_name;
+                }
+
             }
 
         }

+ 6 - 5
app/Models/SportsTennis.php

@@ -11,7 +11,7 @@ class SportsTennis extends BaseModel {
     protected $table = "st_wq_competition";
     public $timestamps = false;
 
-    function getinfo($list = 10, $page, $where = '')
+    function getinfo($list = 10, $page, $where = '',$orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.lg_id')
@@ -19,6 +19,7 @@ class SportsTennis extends BaseModel {
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
                 ->where($where)
+                ->orwhere($orwhere)
                 ->paginate ($list);
         } else {
             $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.lg_id')
@@ -34,11 +35,11 @@ class SportsTennis extends BaseModel {
             if($data[$i]->match_date < date('Y-m-d',time())){
                 $data[$i]->status = '2';
                 $this->where('id', $data[$i]->id)->update(['status' => 2]);
-            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time)+2400 <= strtotime(date('H:i:s',time()))){
+            }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time)+5400 <= strtotime(date('H:i:s',time()))){
                 $data[$i]->status = '2';
                 $this->where('id', $data[$i]->id)->update(['status' => 2]);
             }
-            else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) < strtotime(date('H:i:s',time())) && strtotime(date('H:i:s',time())) < strtotime($data[$i]->match_time)+2400){
+            else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) < strtotime(date('H:i:s',time())) && strtotime(date('H:i:s',time())) < strtotime($data[$i]->match_time)+5400){
                 $data[$i]->status = '1';
                 $this->where('id', $data[$i]->id)->update(['status' => 1]);
             }else if($data[$i]->match_date == date('Y-m-d',time()) && strtotime($data[$i]->match_time) > strtotime(date('H:i:s',time()))){
@@ -74,12 +75,12 @@ class SportsTennis extends BaseModel {
 
     function getmatchid($id){
         $res=$this->where('id',$id)->first();
-        if(!$res<0){
+        if(!$res){
             return -2021052003;
         }
         return $res->match_id;
     }
-
+    
 
 
 }

+ 28 - 9
app/Models/TennisOdds.php

@@ -12,21 +12,40 @@ class TennisOdds extends BaseModel
     protected $table = "st_wq_odds";
     public $timestamps = false;
 
-    function getodds($match_id){
-        $data=$this->where('match_id',$match_id)->get();
+    function getodds($match_id,$where = ''){
+        //$data=$this->where($where)->where('expire_time','<',date('Y-m-d H:i:s',time()))->get();
+        $data=$this->where('match_id',$match_id)->where($where)->get()->toArray();
+        $num=$this->where('match_id',$match_id)->where('sort',0)->get()->toArray();
+        $sort = array_column($data,'sort');
+        array_multisort($sort,SORT_DESC,$data);
+        $data = array_slice($data,0,count($num));
+
         if(!$data < 0){
             return -2021052003;
         }
+
         for($i=0;$i<count($data);$i++){
-            if($data[$i]->status==0){
-                $data[$i]->status = '启用';
-            }else if($data[$i]->status==1){
-                $data[$i]->status = '停用';
-            }else if($data[$i]->status==-1){
-                $data[$i]->status = '禁用';
+            if($data[$i]['status']==0){
+                $data[$i]['status'] = '启用';
+            }else if($data[$i]['status']==1){
+                $data[$i]['status'] = '停用';
+            }else if($data[$i]['status']==-1){
+                $data[$i]['status'] = '禁用';
+            }
+            $odds_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['odds_code'])->first();
+            if(!empty($odds_name)){
+                $data[$i]['odds_code_cn'] = $odds_name->odds_name;
+            }else{
+                $data[$i]['odds_code_cn'] = $data[$i]['odds_code'];
+            }
+            $p_name = DB::table('st_odds_code')->where('odds_code',$data[$i]['p_code'])->first();
+            if(!empty($p_name)){
+                $data[$i]['p_code_cn'] = $p_name->odds_name;
+            }else{
+                $data[$i]['p_code_cn'] = $data[$i]['p_code'];
             }
         }
-        return $data->toArray();
+        return $data;
 
     }
 }

+ 15 - 0
app/Models/TennisOddsRecord.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/1
+ * Time: 10:12
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class TennisOddsRecord extends BaseModel
+{
+    protected $table = "st_wq_odds_record";
+    public $timestamps = false;
+
+}

+ 4 - 0
resources/lang/zh-cn/sportsnotelist.php

@@ -20,4 +20,8 @@ return array(
     'edit' => '修改',
 
 
+    'star_time' => '开始时间',
+    'end_time' => '结束时间',
+
+
 );

+ 141 - 0
resources/lang/zh-cn/sportsoddscode.php

@@ -0,0 +1,141 @@
+<?php
+return array(
+
+    "concede_size" =>"让球大小",//pid = 1
+    "concede_home"=>"全场|主队|让球",
+    "concede_home_rule"=>"主队全场让球条件",
+    "concede_guest"=>"全场|客队|让球",
+    "concede_guest_rule"=>"客队全场让球条件",
+    "half_concede_home"=>"上半场|主队|让球",
+    "half_concede_home_rule"=>"主队上半场让球条件",
+    "half_concede_guest"=>"上半场|客队|让球",
+    "half_concede_guest_rule"=>"客队上半场让球条件",
+    "size_home"=>"全场|主队|大小",
+    "size_home_rule"=>"主队大小条件",
+    "size_guest"=>"全场|客队|大小",
+    "size_guest_rule"=>"客队大小条件",
+    "half_size_home"=>"上半场|主队|大小",
+    "half_size_home_rule"=>"主队上半场大小条件",
+    "half_size_guest"=>"上半场|客队|大小",
+    "half_size_guest_rule"=>"客队上半场大小条件",
+
+    "capot"=>"独赢",//pid = 2
+    "capot_home"=>"全场|主队|独赢",
+    "capot_guest"=>"全场|客队|独赢",
+    "capot_dogfall"=>"全场|主客平|独赢",
+    "half_capot_home"=>"上半场|主队|独赢",
+    "half_capot_guest"=>"上半场|客队|独赢",
+    "half_capot_dogfall"=>"上半场|主客平|独赢",
+
+    "two_sides"=> "进球数单双",//p_id=> 3
+    "two_sides_single"=> "全场单",
+    "two_sides_double"=> "全场双",
+    "half_two_sides_single"=> "上半场单",
+    "half_two_sides_double"=> "上半场双",
+
+    "total_goal"=>"总进球数",//pid = 4
+    "total_goal_zero"=>"全场|总入球|0-1",
+    "total_goal_two"=>"全场|总入球|2-3",
+    "total_goal_four"=>"全场|总入球|4-6",
+    "total_goal_seven"=>"全场|总入球|7或以上",
+    "half_total_goal_zero"=>"全场|总入球|0",
+    "half_total_goal_one"=>"全场|总入球|1",
+    "half_total_goal_two"=>"全场|总入球|2",
+    "half_total_goal_three"=>"全场|总入球|3或以上",
+
+
+    "half_full"=>"半场/全场",//pid = 5
+    "half_full_home_home"=>"半场/全场 主主",
+    "half_full_home_dogfall"=>"半场/全场 主和",
+    "half_full_home_guest"=>"半场/全场 主客",
+    "half_full_dogfall_home"=>"半场/全场 和主",
+    "half_full_dogfall_dogfall"=>"半场/全场 和和",
+    "half_full_dogfall_guest"=>"半场/全场 和客",
+    "half_full_guest_home"=>"半场/全场 客主",
+    "half_full_guest_dogfall"=>"半场/全场 客和",
+    "half_full_guest_guest"=>"半场/全场 客客",
+
+    "bodan"=>"波胆",//pid = 6
+    "bodanhome_one_zero"=>"全场波胆|主队|1-0",
+    "bodanhome_two_zero"=>"全场波胆|主队|2-0",
+    "bodanhome_two_one"=>"全场波胆|主队|2-1",
+    "bodanhome_three_zero"=>"全场波胆|主队|3-2",
+    "bodanhome_three_one"=>"全场波胆|主队|3-1",
+    "bodanhome_three_two"=>"全场波胆|主队|3-2",
+    "bodanhome_four_zero"=>"全场波胆|主队|4-0",
+    "bodanhome_four_one"=>"全场波胆|主队|4-1",
+    "bodanhome_four_two"=>"全场波胆|主队|4-2",
+    "bodanhome_four_three"=>"全场波胆|主队|4-3",
+    "bodanguest_one_zero"=>"全场波胆|客队|1-0",
+    "bodanguest_two_zero"=>"全场波胆|客队|2-0",
+    "bodanguest_two_one"=>"全场波胆|客队|2-1",
+    "bodanguest_three_zero"=>"全场波胆|客队|3-0",
+    "bodanguest_three_one"=>"全场波胆|客队|3-1",
+    "bodanguest_three_two"=>"全场波胆|客队|3-2",
+    "bodanguest_four_zero"=>"全场波胆|客队|4-0",
+    "bodanguest_four_one"=>"全场波胆|客队|4-1",
+    "bodanguest_four_two"=>"全场波胆|客队|4-2",
+    "bodanguest_four_three"=>"全场波胆|客队|4-3",
+    "bodandogfall_zero_zero"=>"全场波胆|和|0-0",
+    "bodandogfall_one_one"=>"全场波胆|和|1-1",
+    "bodandogfall_two_two"=>"全场波胆|和|2-2",
+    "bodandogfall_three_three"=>"全场波胆|和|3-3",
+    "bodandogfall_four_four"=>"全场波胆|和|4-4",
+    "bodanother"=>"全场波胆|其他",
+
+    "halfbodanhome_one_zero"=>"波胆上半场|主队|1-0",
+    "halfbodanhome_two_zero"=>"波胆上半场|主队|2-0",
+    "halfbodanhome_two_one"=>"波胆上半场|主队|2-1",
+    "halfbodanhome_three_zero"=>"波胆上半场|主队|3-0",
+    "halfbodanhome_three_one"=>"波胆上半场|主队|3-1",
+    "halfbodanhome_three_two"=>"波胆上半场|主队|3-2",
+    "halfbodanguest_one_zero"=>"波胆上半场|客队|1-0",
+    "halfbodanguest_two_zero"=>"波胆上半场|客队|2-0",
+    "halfbodanguest_two_one"=>"波胆上半场|客队|2-1",
+    "halfbodanguest_three_zero"=>"波胆上半场|客队|3-0",
+    "halfbodanguest_three_one"=>"波胆上半场|客队|3-1",
+    "halfbodanguest_three_two"=>"波胆上半场|客队|3-2",
+    "halfbodandogfall_zero_zero"=>"波胆上半场|和|0-0",
+    "halfbodandogfall_one_one"=>"波胆上半场|和|1-1",
+    "halfbodandogfall_two_two"=>"波胆上半场|和|2-2",
+    "halfbodandogfall_three_three"=>"波胆上半场|和|3-3",
+    "halfbodanother"=>"波胆上半场|其他",
+
+    "first_last_ball"=>"最先/最后进球",//pid = 7
+    "first_ball_home"=>"主队|最先进球",
+    "first_ball_guest"=>"客队|最先进球",
+    "last_ball_home"=>"主队|最后进球",
+    "last_ball_guest"=>"客队|最后进球",
+    "not_ball"=>"没有进球",
+
+    "corner_ball" =>"角球",//pid = 9
+    "temaball" =>"球队进球大小",//pid = 11
+    "home_size_small" =>"全场|主队|小",
+    "home_size_big" =>"全场|主队|大",
+    "guest_size_big" =>"全场|客队|大",
+    "guest_size_small" =>"全场|客队|小",
+    "half_home_size_big" =>"上半场|主队|大",
+    "half_home_size_small" =>"上半场|主队|小",
+    "half_guest_size_big" =>"上半场|客队|大",
+    "half_guest_size_small" =>"上半场|客队|小",
+
+    "promotion" =>"会晋级",//pid = 10
+
+    "lq_two_sides"=> "总分单双",//pid = 3
+    "lq_two_sides_single"=> "全场总分单",
+    "lq_two_sides_double"=> "全场总分双",
+    "lq_half_two_sides_single"=> "上半场总分单",
+    "lq_half_two_sides_double"=> "上半场总分双",
+    "lq_one_two_sides_single"=> "第一节总分单",
+    "lq_one_two_sides_double"=> "第一节总分双",
+    "lq_two_two_sides_single"=> "第二节总分单",
+    "lq_two_two_sides_double"=> "第二节总分双",
+    "lq_three_two_sides_single"=> "第三节总分单",
+    "lq_three_two_sides_double"=> "第三节总分双",
+    "lq_four_two_sides_single"=> "第四节总分单",
+    "lq_four_two_sides_double"=> "第四节总分双",
+
+    "Penalty_card"=> "罚牌数",//pid = 12
+
+
+);

+ 9 - 136
resources/lang/zh-cn/sportssoccer.php

@@ -3,9 +3,11 @@ return array(
     'id' => '赔率id',
     'match_id' => '赛事id',
     'odds_code' => '赔率代码',
+    'odds_code_cn' => '赔率代码',
     'odds' => '赔率值',
     'p_id' => '父级赔率id',
     'p_code' => '父级赔率代码',
+    'p_code_cn' => '父级赔率代码',
     'condition' => '赔率条件',
     'max'=>'最大赔率值',
     'min' => '最小赔率值',
@@ -13,142 +15,13 @@ return array(
     'search' => '联赛搜索',
     'expire_time' => '过期时间',
 
+    'team_search' => '球队查询',
+    'team_player_search' => '球员查询',
+    'league_search' => '联赛查询',
+    'date_search' => '日期查询',
+    'match_status_search' => '赛事状态查询',
 
-    "concede_size" =>"让球大小",
-    "concede_home"=>"全场|主队|让球",
-    "concede_home_rule"=>"主队全场让球条件",
-    "concede_guest"=>"全场|客队|让球",
-    "concede_guest_rule"=>"客队全场让球条件",
-    "half_concede_home"=>"上半场|主队|让球",
-    "half_concede_home_rule"=>"主队上半场让球条件",
-    "half_concede_guest"=>"上半场|客队|让球",
-    "half_concede_guest_rule"=>"客队上半场让球条件",
-    "size_home"=>"全场|主队|大小",
-    "size_home_rule"=>"主队大小条件",
-    "size_guest"=>"全场|客队|大小",
-    "size_guest_rule"=>"客队大小条件",
-    "half_size_home"=>"上半场|主队|大小",
-    "half_size_home_rule"=>"主队上半场大小条件",
-    "half_size_guest"=>"上半场|客队|大小",
-    "half_size_guest_rule"=>"客队上半场大小条件",
-
-    "capot"=>"独赢",
-    "capot_home"=>"全场|主队|独赢",
-    "capot_guest"=>"全场|客队|独赢",
-    "capot_dogfall"=>"全场|主客平|独赢",
-    "half_capot_home"=>"上半场|主队|独赢",
-    "half_capot_guest"=>"上半场|客队|独赢",
-    "half_capot_dogfall"=>"上半场|主客平|独赢",
-
-    "odd_even"=>"入球数单双",
-    "odd_even_odd"=>"全场|单",
-    "odd_even_even"=>"全场|双",
-    "half_odd_even_odd"=>"上半场|单",
-    "half_odd_even_even"=>"上半场|双",
-
-    "total_goal"=>"总进球数",
-    "total_goal_zero"=>"全场|总入球|0-1",
-    "total_goal_two"=>"全场|总入球|2-3",
-    "total_goal_four"=>"全场|总入球|4-6",
-    "total_goal_seven"=>"全场|总入球|7或以上",
-    "half_total_goal_zero"=>"全场|总入球|0",
-    "half_total_goal_one"=>"全场|总入球|1",
-    "half_total_goal_two"=>"全场|总入球|2",
-    "half_total_goal_three"=>"全场|总入球|3或以上",
-
-
-    "half_full"=>"半场/全场",
-    "half_full_home_home"=>"半场/全场 主主",
-    "half_full_home_dogfall"=>"半场/全场 主和",
-    "half_full_home_guest"=>"半场/全场 主客",
-    "half_full_dogfall_home"=>"半场/全场 和主",
-    "half_full_dogfall_dogfall"=>"半场/全场 和和",
-    "half_full_dogfall_guest"=>"半场/全场 和客",
-    "half_full_guest_home"=>"半场/全场 客主",
-    "half_full_guest_dogfall"=>"半场/全场 客和",
-    "half_full_guest_guest"=>"半场/全场 客客",
-
-    "bodan"=>"波胆",
-    "bodan_home_one_zero"=>"全场波胆|主队|1-0",
-    "bodan_home_two_zero"=>"全场波胆|主队|2-0",
-    "bodan_home_two_one"=>"全场波胆|主队|2-1",
-    "bodan_home_three_zero"=>"全场波胆|主队|3-2",
-    "bodan_home_three_one"=>"全场波胆|主队|3-1",
-    "bodan_home_three_two"=>"全场波胆|主队|3-2",
-    "bodan_home_four_zero"=>"全场波胆|主队|4-0",
-    "bodan_home_four_one"=>"全场波胆|主队|4-1",
-    "bodan_home_four_two"=>"全场波胆|主队|4-2",
-    "bodan_home_four_three"=>"全场波胆|主队|4-3",
-    "bodan_guest_one_zero"=>"全场波胆|客队|1-0",
-    "bodan_guest_two_zero"=>"全场波胆|客队|2-0",
-    "bodan_guest_two_one"=>"全场波胆|客队|2-1",
-    "bodan_guest_three_zero"=>"全场波胆|客队|3-0",
-    "bodan_guest_three_one"=>"全场波胆|客队|3-1",
-    "bodan_guest_three_two"=>"全场波胆|客队|3-2",
-    "bodan_guest_four_zero"=>"全场波胆|客队|4-0",
-    "bodan_guest_four_one"=>"全场波胆|客队|4-1",
-    "bodan_guest_four_two"=>"全场波胆|客队|4-2",
-    "bodan_guest_four_three"=>"全场波胆|客队|4-3",
-    "bodan_dogfall_zero_zero"=>"全场波胆|和|0-0",
-    "bodan_dogfall_one_one"=>"全场波胆|和|1-1",
-    "bodan_dogfall_two_two"=>"全场波胆|和|2-2",
-    "bodan_dogfall_three_three"=>"全场波胆|和|3-3",
-    "bodan_dogfall_four_four"=>"全场波胆|和|4-4",
-    "bodan_other"=>"全场波胆|其他",
-
-    "half_bodan_home_one_zero"=>"波胆上半场|主队|1-0",
-    "half_bodan_home_two_zero"=>"波胆上半场|主队|2-0",
-    "half_bodan_home_two_one"=>"波胆上半场|主队|2-1",
-    "half_bodan_home_three_zero"=>"波胆上半场|主队|3-0",
-    "half_bodan_home_three_one"=>"波胆上半场|主队|3-1",
-    "half_bodan_home_three_two"=>"波胆上半场|主队|3-2",
-    "half_bodan_guest_one_zero"=>"波胆上半场|客队|1-0",
-    "half_bodan_guest_two_zero"=>"波胆上半场|客队|2-0",
-    "half_bodan_guest_two_one"=>"波胆上半场|客队|2-1",
-    "half_bodan_guest_three_zero"=>"波胆上半场|客队|3-0",
-    "half_bodan_guest_three_one"=>"波胆上半场|客队|3-1",
-    "half_bodan_guest_three_two"=>"波胆上半场|客队|3-2",
-    "half_bodan_dogfall_zero_zero"=>"波胆上半场|和|0-0",
-    "half_bodan_dogfall_one_one"=>"波胆上半场|和|1-1",
-    "half_bodan_dogfall_two_two"=>"波胆上半场|和|2-2",
-    "half_bodan_dogfall_three_three"=>"波胆上半场|和|3-3",
-    "half_bodan_other"=>"波胆上半场|其他",
-
-    "first_last_ball"=>"最先/最后进球",
-    "first_ball_home"=>"主队|最先进球",
-    "first_ball_guest"=>"客队|最先进球",
-    "last_ball_home"=>"主队|最后进球",
-    "last_ball_guest"=>"客队|最后进球",
-    "not_ball"=>"没有进球",
-
-    "corner_ball" =>"角球",
-    "temaball" =>"球队进球大小",
-    "home_size_small" =>"全场主队小",
-    "home_size_big" =>"全场主队大",
-    "guest_size_big" =>"全场客队大",
-    "guest_size_small" =>"全场客队小",
-    "half_home_size_big" =>"上半场主队大",
-    "half_home_size_small" =>"上半场主队小",
-    "half_guest_size_big" =>"上半场客队大",
-    "half_guest_size_small" =>"上半场客队小",
-
-    "promotion" =>"会晋级",
-
-    "two_sides"=> "总分单双",
-    "two_sides_single"=> "全场总分单",
-    "two_sides_double"=> "全场总分双",
-    "half_two_sides_single"=> "上半场总分单",
-    "half_two_sides_double"=> "上半场总分双",
-    "one_two_sides_single"=> "第一节总分单",
-    "one_two_sides_double"=> "第一节总分双",
-    "two_two_sides_single"=> "第二节总分单",
-    "two_two_sides_double"=> "第二节总分双",
-    "three_two_sides_single"=> "第三节总分单",
-    "three_two_sides_double"=> "第三节总分双",
-    "four_two_sides_single"=> "第四节总分单",
-    "four_two_sides_double"=> "第四节总分双",
-
-
-
+    'p_code_search' => '父级赔率代码查询',
+    'odds_status_search' => '赔率状态查询',
 
 );

+ 16 - 0
resources/lang/zh-cn/sportstennis.php

@@ -0,0 +1,16 @@
+<?php
+return array(
+    'id' => '赛事id',
+    'match_id' => '赛事id',
+    'lg_id' => '联赛id',
+    'name_chinese' => '联赛名称',
+    'home_team' => '主队',
+    'guest_team'=>'客队',
+    'home_guest' => '主队员 VS 客队员',
+    'match_date' => '赛事日期',
+    'match_time' => '赛事时间',
+    'status' => '赛事状态',
+    'match_score' => '赛事比分',
+    'search' => '搜索',
+
+);

+ 20 - 20
resources/views/admin/sportsbk/addoutcome.blade.php

@@ -13,19 +13,19 @@
 			<div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.guest_team') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="guest_team"   id="guest_team"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['guest_team'] }} @endisset" class="layui-input">
+                <input type="text" name="guest_team"   id="guest_team"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['guest_team'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.home_rate') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="home_rate"   id="home_rate"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['home_rate'] }} @endisset" class="layui-input">
+                <input type="text" name="home_rate"   id="home_rate"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['home_rate'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.guest_rate') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="guest_rate"   id="guest_rate"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['guest_rate'] }} @endisset" class="layui-input">
+                <input type="text" name="guest_rate"   id="guest_rate"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['guest_rate'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
@@ -37,51 +37,51 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.guest_score') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="guest_score"   id="guest_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['guest_score'] }} @endisset" class="layui-input">
+                <input type="text" name="guest_score"   id="guest_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['guest_score'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.all_goal') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="all_goal"   id="all_goal"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['all_goal'] }} @endisset" class="layui-input">
+                <input type="text" name="all_goal"   id="all_goal"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['all_goal'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.u_home_score') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="u_home_score"   id="u_home_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['u_home_score'] }} @endisset" class="layui-input">
+                <input type="text" name="u_home_score"   id="u_home_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['u_home_score'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.u_guest_score') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="u_guest_score"   id="u_guest_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['u_guest_score'] }} @endisset" class="layui-input">
+                <input type="text" name="u_guest_score"   id="u_guest_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['u_guest_score'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">{{ trans('sportsbk.tag') }}:</label>
                 <div class="layui-input-block">
-                <input type="text" name="tag"   id="tag"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsfoot) {{ $sportsbk['tag'] }} @endisset" class="layui-input">
+                <input type="text" name="tag"   id="tag"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($sportsbk) {{ $sportsbk['tag'] }} @endisset" class="layui-input">
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label">{{ trans('sportsfoot.match_score') }}:</label>
+                <label class="layui-form-label">{{ trans('sportsbk.match_score') }}:</label>
                 <div class="layui-input-block">
-                <textarea  name="match_score"   id="match_score"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($sportsfoot) {{ $sportsfoot['match_score'] }} @endisset </textarea>
+                <textarea  name="match_score"   id="match_score"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($sportsbk) {{ $sportsbk['match_score'] }} @endisset </textarea>
                 </div>
                 <p style="color:red;">请填写如下格式:'2:3'</p>
             </div>
 			<div class="layui-form-item">
-                <label class="layui-form-label">{{ trans('sportsfoot.match_process') }}:</label>
+                <label class="layui-form-label">{{ trans('sportsbk.match_process') }}:</label>
                 <div class="layui-input-block">
-                <textarea  name="match_process"   id="match_process"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($sportsfoot) {{ $sportsfoot['match_process'] }} @endisset </textarea>
+                <textarea  name="match_process"   id="match_process"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($sportsbk) {{ $sportsbk['match_process'] }} @endisset </textarea>
                 </div>
             </div>
             <div class="layui-form-item layui-form">
-                <label class="layui-form-label">{{ trans('sportsfoot.lgid') }}:</label>
+                <label class="layui-form-label">{{ trans('sportsbk.lgid') }}:</label>
                     <div class="layui-input-block">
                     <select name="lg_id"  id="lg_id" lay-filter = 'sect'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
-                        <option value="">{{ trans('sportsfoot.lg_select') }}</option>
+                        <option value="">{{ trans('sportsbk.lg_select') }}</option>
                         @foreach($data as $k=>$v)
                             <option value="{{$v['lg_id']}}">{{$v['name_chinese']}}</option>
                         @endforeach
@@ -89,16 +89,16 @@
                 </div>
             </div>
              <div class="layui-form-item layui-form">
-                <label class="layui-form-label">{{ trans('sportsfoot.smatchid') }}:</label>
+                <label class="layui-form-label">{{ trans('sportsbk.smatchid') }}:</label>
                 <div class="layui-input-block">
                     <select name="match_id" id="match_id" lay-filter='api' lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query>
-                        <option value="">{{ trans('sportsfoot.league_select') }}</option>
+                        <option value="">{{ trans('sportsbk.league_select') }}</option>
                     </select>
                 </div>
             </div>
 
             <div class="layui-form-item">
-              <label class="layui-form-label">{{ trans('sportsfoot.status') }}:</label>
+              <label class="layui-form-label">{{ trans('sportsbk.status') }}:</label>
               <div class="layui-input-block">
                 <input type="radio" name="status" value="1" title="进行中" checked >
                 <input type="radio" name="status" value="2" title="已结束">
@@ -128,13 +128,13 @@
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
-                url: '/admin/Sportsfoot/saislist',
+                url: '/admin/Sportsbk/saislist',
                 data: {lgid:lgid},
                 success: function(data) {
                     if (data != undefined && data != null && data != "") {
                         var html = "<option value=''>请选择所属赛事</option>";
-                        for (var i = 1; i < data.length; i++) {
-                            html += "<option value=" + data[i]["id"] + ">" + data[i]["home_team"] + "</option>";
+                        for (var i = 0; i < data.length; i++) {
+                            html += "<option value=" + data[i]["lg_id"] + ">" + data[i]["home_team"] + "</option>";
                         }
                     $("#match_id").append(html);
                             //重新渲染select

+ 1 - 1
resources/views/admin/sportsfoot/addoutcome.blade.php

@@ -139,7 +139,7 @@
                 success: function(data) {
                     if (data != undefined && data != null && data != "") {
                         var html = "<option value=''>请选择所属赛事</option>";
-                        for (var i = 1; i < data.length; i++) {
+                        for (var i = 0; i < data.length; i++) {
                             html += "<option value=" + data[i]["id"] + ">" + data[i]["home_team"] + "</option>";
                         }
                     $("#match_id").append(html);

+ 113 - 19
resources/views/sports/base_form.blade.php

@@ -8,30 +8,71 @@
                 <input type="text" name="home_team" required  lay-verify="required" placeholder="请输入主队名称" autocomplete="off" value="{{ isset($home_team)?$home_team:'' }}" class="layui-input">
             </div>
         </div>
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">主队国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="home_country" lay-filter = 'home'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($country))--}}
+        {{--@foreach($country as $k=>$v)--}}
+        {{--<option value="{{ $v['home_country_id'] }}"  @if(isset($home_country_id)&&$home_country_id==$v['home_country_id'])  selected @endif>--}}
+        {{--@if(isset($lange[$v['home_country_name']]))  {{$lange[trim($v['home_country_name'])]}} @else {{$v['home_country_name']}}   @endif--}}
+        {{--</option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">主队</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="home_team" id="home_team" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($home_team)?$home_team:'' }}">{{ isset($home_team)?$home_team:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">客队国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="guest_country" lay-filter = 'guest'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($countrys))--}}
+        {{--@foreach($countrys as $k=>$v)--}}
+        {{--<option value="{{ $v['guest_country_id'] }}"  @if(isset($guest_country_id)&&$guest_country_id==$v['guest_country_id'])  selected @endif>--}}
+        {{--@if(isset($lange[$v['guest_country_name']]))  {{$lange[trim($v['guest_country_name'])]}} @else {{$v['guest_country_name']}}   @endif--}}
+        {{--</option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">客队</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="guest_team" id="guest_team" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($guest_team)?$guest_team:'' }}">{{ isset($guest_team)?$guest_team:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+
         <div class="layui-form-item">
             <label class="layui-form-label">客队名称</label>
             <div class="layui-input-block">
-                <input type="text" name="guest_team"   lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
+                <input type="text" name="guest_team" lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
             </div>
         </div>
-        {{--<div class="layui-form-item">--}}
-            {{--<label class="layui-form-label">ICON图标</label>--}}
-            {{--<div class="layui-input-block">--}}
-                {{--<input type="text" name="menu_icon"   lay-verify="" placeholder="请输入ICON图标" autocomplete="off" class="layui-input"  value="{{ isset($icon)?$icon:'' }}" >--}}
-            {{--</div>--}}
-            {{--<div class="layui-form-mid layui-word-aux">专用的图标代码</div>--}}
-        {{--</div>--}}
         <div class="layui-form-item">
-            <label class="layui-form-label">所属菜单</label>
+            <label class="layui-form-label">所属联赛</label>
             <div class="layui-input-block">
                 <select name="parent_id" >
-                    <option value="0">无上级</option>
+                    <option value></option>
                     @if(isset($parents))
                         @foreach($parents as $k=>$v)
-                            <option value="{{ $v['id'] }}"  @if(isset($parent_id)&&$parent_id==$v['id'])  selected @endif>
+                            <option value="{{ $v['lg_id'] }}"  @if(isset($lg_id)&&$lg_id==$v['lg_id'])  selected @endif>
                                 @if(isset($lange[$v['name_chinese']]))  {{$lange[trim($v['name_chinese'])]}} @else {{$v['name_chinese']}}   @endif
                             </option>
-
                         @endforeach
                     @endif
                 </select>
@@ -40,31 +81,40 @@
         <div class="layui-form-item">
             <label class="layui-form-label">赛事日期</label>
             <div class="layui-input-block">
-                <input type="text" name="match_date"   lay-verify="" placeholder="请输入赛事日期" autocomplete="off" class="layui-input"  value="{{ isset($match_date)?$match_date:'' }}" >
+                <input type="date" name="match_date" lay-verify="" autocomplete="off" class="layui-input"  value="{{ isset($match_date)?$match_date:date('Y-m-d',time()) }}" >
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">赛事时间</label>
             <div class="layui-input-block">
-                <input type="text" name="match_time"   lay-verify="" placeholder="请输入赛事时间" autocomplete="off" class="layui-input"  value="{{ isset($match_time)?$match_time:'' }}" >
+                <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" >
             </div>
         </div>
         {{--<div class="layui-form-item">--}}
-            {{--<label class="layui-form-label">赛事比分</label>--}}
-            {{--<div class="layui-input-block">--}}
-                {{--<input type="text" name="match_score"   lay-verify="" placeholder="请输入赛事比分" autocomplete="off" class="layui-input"  value="{{ isset($match_score)?$match_score:'' }}" >--}}
-            {{--</div>--}}
+        {{--<label class="layui-form-label">赛事状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--</div>--}}
         {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">赛事状态</label>
             <div class="layui-input-block">
-                <input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >
+                @if(isset($status))
+                    <input type="radio" name="status" value="0" title="未开始" @if($status=='0') checked @endif >
+                    <input type="radio" name="status" value="1" title="正在进行" @if($status=='1') checked @endif>
+                    <input type="radio" name="status" value="2" title="已结束" @if($status=='2') checked @endif>
+                @else
+                    <input type="radio" name="status" value="0" title="未开始" checked >
+                    <input type="radio" name="status" value="1" title="正在进行">
+                    <input type="radio" name="status" value="2" title="已结束">
+                @endif
             </div>
         </div>
 
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
                     <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
                     <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
@@ -76,7 +126,51 @@
         //Demo
         layui.use(['form'], function(){
             var form = layui.form;
+            form.on('select(home)',function(data){
+                countryid = data.value;
+                //console.log(countryid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsBase/getteam',
+                    data:{countryid:countryid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        //var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["team_name_cn"]+"</option>";
+                        }
+                        $("#home_team").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
 
+            form.on('select(guest)',function(data){
+                countryid = data.value;
+                console.log(countryid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsBase/getteam',
+                    data:{countryid:countryid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        //var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["team_name_cn"]+"</option>";
+                        }
+                        $("#guest_team").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
             //监听提交
             form.on('submit(submitForm)', function(data){
                 return true;

+ 74 - 7
resources/views/sports/base_match.blade.php

@@ -1,6 +1,6 @@
 @extends('vip.layouts')
 @section('seo_title')
-    系统银行卡管理
+    棒球赛事管理
 @endsection
 @section('content')
     <style>
@@ -20,32 +20,81 @@
         .layui-form-item .checkbox {
             width: auto;
         }
+        table{
+            text-align: center;
+        }
+        th div{
+            text-align: center;
+        }
+        input[type=date]::-webkit-inner-spin-button { visibility: hidden; }
     </style>
 
     <script type="text/html" id="status">
-        @if(checkRriv('/admin/BankSet/UserStart'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
+        @if(checkRriv('/admin/SportsBase/score'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
     </script>
 
     <div class="layui-row">
         <div class="layui-col-xs12">
-            <form class="layui-form rewrite" eventType="eventForm"  action="">
+            <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportsbase.search') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.team_search') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="infoname" id="infoname" eventType="event-query"  value="{{ $id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
                         <div class="layui-input-inline checkbox">
-                            <input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>
+                            <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
+                            <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
                         </div>
                     </div>
 
                     <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($league as $k=>$v):
+                                @if($name_chinese==$v['name_chinese']))
+                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                                @else
+                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.match_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsBase/add'))<a href="/admin/SportsBase/add" class="layui-btn layui-btn-sm ">添加</a>@endif
-                        @if(checkRriv('/admin/BankSet/delete'))<a href="javascript:delWin('/admin/BankSet/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        @if(checkRriv('/admin/SportsBase/delete'))<a href="javascript:delWin('/admin/SportsBase/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>
 
                     <!-- &nbsp;&nbsp;&nbsp;&nbsp;<div class="layui-inline"><a href="javascript:openWin('/admin/user/infoAdd','{{ trans('menu.menu_add') }}','700px','500px')" class="layui-btn layui-btn-sm  ">添加</a></div>
@@ -55,6 +104,24 @@
             </form>
         </div>
     </div>
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        $(function () {
+            $('body').on('click', 'a[eventtype="event-delete"]', function () {
+                var span = $(this).prev();
+                var id = span.attr('data-id');
+                // openWin('/admin/system/AddMenu','{{ trans("menu.menu_edit")}}','600px','500px',id);
+            })
+            $('body').on('click','#form_sureblur~.layui-form-switch',function(){
+                var sus = $('#form_sureblur').next().text();
+                if(sus=='精确'){
+                    $('#form_sureblurs').val('on');
+                }else{
+                    $('#form_sureblurs').val('off');
+                }
+            })
+        })
+    </script>
     @push('dataTableJS')
     //var active = {
     //    reload: function(){

+ 168 - 0
resources/views/sports/base_odds.blade.php

@@ -0,0 +1,168 @@
+@extends('vip.layouts')
+@section('seo_title')
+    赔率管理
+@endsection
+@section('content')
+    <style>
+        .layui-laydate-range {
+            width: auto;
+        }
+
+        .layui-form-switch em {
+            width: auto;
+        }
+
+        .layui-form-switch {
+            width: 44px;
+            line-height: 23px;
+        }
+
+        .layui-form-item .checkbox {
+            width: auto;
+        }
+        table{
+            text-align: center;
+        }
+        th div{
+            text-align: center;
+        }
+    </style>
+
+    <script type="text/html" id="status">
+        @if(checkRriv('/admin/SportsBase/odds'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
+    </script>
+
+    <div class="layui-row">
+        <div class="layui-col-xs12">
+            <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
+                        </div>
+                        {{--<div class="layui-input-inline checkbox">--}}
+                        {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
+                        {{--</div>--}}
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.p_code_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="p_code"  id="form_p_code"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($pcode as $k=>$v):
+                                @if($p_code==$v['odds_code']))
+                                <option value="{{$v['odds_code']}}" selected="selected">{{$v['odds_name']}}</option>
+                                @else
+                                    <option value="{{$v['odds_code']}}">{{$v['odds_name']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.odds_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.odds_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>
+                        <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
+                        <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        @if(checkRriv('/admin/SportsBase/addodds'))<a href="/admin/SportsBase/addodds?{{ $match_id }}" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/SportsBase/oddsdelete'))<a href="javascript:delWin('/admin/SportsBase/oddsdelete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                    </div>
+
+                    <!-- &nbsp;&nbsp;&nbsp;&nbsp;<div class="layui-inline"><a href="javascript:openWin('/admin/user/infoAdd','{{ trans('menu.menu_add') }}','700px','500px')" class="layui-btn layui-btn-sm  ">添加</a></div>
+                    <div class="layui-inline"><a href="/admin/menu/add" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div> -->
+
+                </div>
+            </form>
+        </div>
+    </div>
+    @push('dataTableJS')
+    //var active = {
+    //    reload: function(){
+    //      //执行重载
+    //      table.reload('{{ $dataId }}', {
+    //        page: {
+    //          curr: 1 //重新从第 1 页开始
+    //        }
+    //        ,where: {
+    //            infoname:$('#infoname').val(),
+    //        }
+    //      });
+    //    }
+    //  };
+
+    //启用|禁用用户
+    form.on('switch(openStatus)', function(obj){
+    var status = 0;
+    if(obj.elem.checked==true){
+    status = 1;
+    }
+    setcolumn('/admin/BankSet/UserStart',this.name,status,this.value,obj);
+    console.log(this.name);
+    console.log(status);
+    console.log(this.value);
+    console.log(obj);
+    //layer.tips(msg, obj.othis);
+    });
+
+    function setcolumn(url,column,value,id,obj){
+    $.ajax({
+    url: url+'?'+column+'='+value+'&id='+id,
+    dataType: 'json',
+    type: 'get',
+    success:function(data){
+    layer.msg(data.msg);
+    if(data.status!=1){
+    if(value==1){
+    obj.othis[0].setAttribute("class", "layui-unselect layui-form-switch");
+    obj.othis[0].innerHTML='<em>开启</em><i></i>';
+    }else{
+    obj.othis[0].setAttribute("class",'layui-unselect layui-form-switch layui-form-onswitch');
+    obj.othis[0].innerHTML='<em>禁用</em><i></i>';
+    }
+    }
+    }
+    });
+    }
+
+    //$('.lay-btn-diy').on('click', function(){
+    //    var type = $(this).data('type');
+    //    active[type] ? active[type].call(this) : '';
+    //  });
+
+    //重置表单
+    $('.reset').on('click',function(){
+    $('input').val('');
+    $('#infoname').val('');
+    //	  var type = $(this).data('type');
+    //	  active[type] ? active[type].call(this) : '';
+    });
+
+    //刷新表单
+    //    $('.set').on('click',function(){
+    //    var type = $(this).data('type');
+    //    active[type] ? active[type].call(this) : '';
+    //    });
+
+    @endpush
+
+    @include('vip.datatable')
+@endsection

+ 150 - 0
resources/views/sports/base_odds_form.blade.php

@@ -0,0 +1,150 @@
+@extends('vip.layouts')
+@section('content')
+    <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType=eventAjaxForm>
+        {!! csrf_field() !!}
+        <div class="layui-form-item">
+            <label class="layui-form-label">赛事id</label>
+            <div class="layui-input-block">
+                <input type="text" name="match_id" required  lay-verify="id" autocomplete="off" value="{{ isset($match_id)?$match_id:'' }}" class="layui-input" readonly="readonly">
+            </div>
+        </div>
+        <div class="layui-form-item layui-form">
+            <label class="layui-form-label">父级赔率代码</label>
+            <div class="layui-input-block">
+                <select name="pcode" id="pcode" lay-filter = 'sect'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                    <option value></option>
+                    @if(isset($pcode))
+                        @foreach($pcode as $k=>$v)
+                            <option value="{{ $v['p_code'] }}"  @if(isset($p_code)&&$p_code==$v['p_code'])  selected @endif>
+                                @if(isset($lange[$v['odds_name']]))  {{$lange[trim($v['odds_name'])]}} @else {{$v['odds_name']}}   @endif
+                            </option>
+
+                        @endforeach
+                    @endif
+                </select>
+            </div>
+        </div>
+        <div class="layui-form-item layui-form">
+            <label class="layui-form-label">赔率代码</label>
+            <div class="layui-input-block">
+                <select name="code" id="code" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_name)?$odds_name:'' }}</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">赔率条件</label>
+            <div class="layui-input-block">
+                <input type="text" name="condition" lay-verify="" autocomplete="off" placeholder="请输入赔率条件" class="layui-input"  value="{{ isset($condition)?$condition:'' }}" >
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">赔率值</label>
+            <div class="layui-input-block">
+                <input type="text" name="odds" lay-verify="" placeholder="请输入赔率值" autocomplete="off" class="layui-input"  value="{{ isset($odds)?$odds:'' }}" >
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">最大赔率值</label>
+            <div class="layui-input-block">
+                <input type="text" name="max" autocomplete="off" class="layui-input" placeholder="请输入最大赔率值" value="{{ isset($max)?$max:'' }}" >
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">最小赔率值</label>
+            <div class="layui-input-block">
+                <input type="text" name="min" autocomplete="off" class="layui-input" placeholder="请输入最小赔率值" value="{{ isset($min)?$min:'' }}" >
+            </div>
+        </div>
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">赔率状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:启用 1:停用  2:禁用" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        <div class="layui-form-item">
+            <label class="layui-form-label">赔率状态</label>
+            <div class="layui-input-block">
+                @if(isset($status))
+                    <input type="radio" name="status" value="0" title="启用" @if($status=='0') checked @endif >
+                    <input type="radio" name="status" value="1" title="停用" @if($status=='1') checked @endif>
+                    <input type="radio" name="status" value="-1" title="禁用" @if($status=='-1') checked @endif>
+                @else
+                    <input type="radio" name="status" value="0" title="启用" checked >
+                    <input type="radio" name="status" value="1" title="停用">
+                    <input type="radio" name="status" value="-1" title="禁用">
+                @endif
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">赔率过期时间</label>
+            <div class="layui-input-block">
+                <input type="datetime-local" name="expire_time" autocomplete="off" class="layui-input" placeholder="" value="{{ isset($expire_time)?$expire_time:date('Y-m-d',time()).'T'.date('H:i',time())}}" >
+            </div>
+        </div>
+        @if(S('ACTION')!='view')
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
+                    <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
+                    <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                </div>
+            </div>
+        @endif
+    </form>
+
+    <script>
+        function func(){
+
+            alert(1);
+        }
+        function funcc(){
+
+            alert(1);
+        }
+        //Demo
+        function cbFormSuccess(data){
+            layer.msg(data.msg);
+            setTimeout(function(){
+                parent.window.location.reload();
+            },2500);
+        }
+    </script>
+
+    <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+    <script>
+        var lgid;
+        var aa;
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(sect)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsBase/getoddscode',
+                    data:{pcode:lgid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_name"]+"</option>";
+                        }
+                        $("#code").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
+            //监听提交
+            form.on('submit(submitForm)', function(data){
+                return true;
+            });
+        });
+    </script>
+@endsection

+ 109 - 1
resources/views/sports/basket_form.blade.php

@@ -8,6 +8,55 @@
                 <input type="text" name="home_team" required  lay-verify="required" placeholder="请输入主队名称" autocomplete="off" value="{{ isset($home_team)?$home_team:'' }}" class="layui-input">
             </div>
         </div>
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">主队国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="home_country" lay-filter = 'home'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($country))--}}
+        {{--@foreach($country as $k=>$v)--}}
+        {{--<option value="{{ $v['home_country_id'] }}"  @if(isset($home_country_id)&&$home_country_id==$v['home_country_id'])  selected @endif>--}}
+        {{--@if(isset($lange[$v['home_country_name']]))  {{$lange[trim($v['home_country_name'])]}} @else {{$v['home_country_name']}}   @endif--}}
+        {{--</option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">主队</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="home_team" id="home_team" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($home_team)?$home_team:'' }}">{{ isset($home_team)?$home_team:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">客队国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="guest_country" lay-filter = 'guest'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($countrys))--}}
+        {{--@foreach($countrys as $k=>$v)--}}
+        {{--<option value="{{ $v['guest_country_id'] }}"  @if(isset($guest_country_id)&&$guest_country_id==$v['guest_country_id'])  selected @endif>--}}
+        {{--@if(isset($lange[$v['guest_country_name']]))  {{$lange[trim($v['guest_country_name'])]}} @else {{$v['guest_country_name']}}   @endif--}}
+        {{--</option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">客队</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="guest_team" id="guest_team" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($guest_team)?$guest_team:'' }}">{{ isset($guest_team)?$guest_team:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+
         <div class="layui-form-item">
             <label class="layui-form-label">客队名称</label>
             <div class="layui-input-block">
@@ -41,16 +90,31 @@
                 <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" >
             </div>
         </div>
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">赛事状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--</div>--}}
+        {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">赛事状态</label>
             <div class="layui-input-block">
-                <input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >
+                @if(isset($status))
+                    <input type="radio" name="status" value="0" title="未开始" @if($status=='0') checked @endif >
+                    <input type="radio" name="status" value="1" title="正在进行" @if($status=='1') checked @endif>
+                    <input type="radio" name="status" value="2" title="已结束" @if($status=='2') checked @endif>
+                @else
+                    <input type="radio" name="status" value="0" title="未开始" checked >
+                    <input type="radio" name="status" value="1" title="正在进行">
+                    <input type="radio" name="status" value="2" title="已结束">
+                @endif
             </div>
         </div>
 
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
                     <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
                     <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
@@ -62,7 +126,51 @@
         //Demo
         layui.use(['form'], function(){
             var form = layui.form;
+            form.on('select(home)',function(data){
+                countryid = data.value;
+                //console.log(countryid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsBasket/getteam',
+                    data:{countryid:countryid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        //var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["team_name_cn"]+"</option>";
+                        }
+                        $("#home_team").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
 
+            form.on('select(guest)',function(data){
+                countryid = data.value;
+                console.log(countryid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsBasket/getteam',
+                    data:{countryid:countryid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        //var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["team_name_cn"]+"</option>";
+                        }
+                        $("#guest_team").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
             //监听提交
             form.on('submit(submitForm)', function(data){
                 return true;

+ 45 - 2
resources/views/sports/basket_match.blade.php

@@ -26,6 +26,7 @@
         th div{
             text-align: center;
         }
+        input[type=date]::-webkit-inner-spin-button { visibility: hidden; }
     </style>
 
     <script type="text/html" id="status">
@@ -36,10 +37,11 @@
         <div class="layui-col-xs12">
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.search') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.team_search') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -47,12 +49,53 @@
                         </div>
                     </div>
 
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($league as $k=>$v):
+                                @if($name_chinese==$v['name_chinese']))
+                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                                @else
+                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.match_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+
                     {{--//选择日期--}}
                     {{--<div class="layui-input-inline" >--}}
                     {{--<input type="text" name="create_at_end" id="form_create_at_end" lay-verify="" autocomplete="off" class="layui-input test-item">--}}
                     {{--</div>--}}
 
                     <div class="layui-inline">
+                        {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>

+ 36 - 3
resources/views/sports/basket_odds.blade.php

@@ -39,14 +39,47 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
                         </div>
-                        <div class="layui-input-inline checkbox">
-                            <input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>
+                        {{--<div class="layui-input-inline checkbox">--}}
+                        {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
+                        {{--</div>--}}
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.p_code_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="p_code"  id="form_p_code"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($pcode as $k=>$v):
+                                @if($p_code==$v['odds_code']))
+                                <option value="{{$v['odds_code']}}" selected="selected">{{$v['odds_name']}}</option>
+                                @else
+                                    <option value="{{$v['odds_code']}}">{{$v['odds_name']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.odds_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.odds_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
                         </div>
                     </div>
 
                     <div class="layui-inline">
+                        <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>

+ 32 - 18
resources/views/sports/basket_odds_form.blade.php

@@ -11,7 +11,7 @@
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">父级赔率代码</label>
             <div class="layui-input-block">
-                <select name="pcode" id="pcode" lay-filter = 'odds'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                <select name="pcode" id="pcode" lay-filter = 'sect'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
                     <option value></option>
                     @if(isset($pcode))
                         @foreach($pcode as $k=>$v)
@@ -28,7 +28,7 @@
             <label class="layui-form-label">赔率代码</label>
             <div class="layui-input-block">
                 <select name="code" id="code" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
-                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_code_cn)?$odds_code_cn:'' }}</option>
+                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_name)?$odds_name:'' }}</option>
                 </select>
             </div>
         </div>
@@ -45,12 +45,6 @@
                 <input type="text" name="odds" lay-verify="" placeholder="请输入赔率值" autocomplete="off" class="layui-input"  value="{{ isset($odds)?$odds:'' }}" >
             </div>
         </div>
-        {{--<div class="layui-form-item">--}}
-        {{--<label class="layui-form-label">父级赔率id</label>--}}
-        {{--<div class="layui-input-block">--}}
-        {{--<input type="text" name="guest_team" lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >--}}
-        {{--</div>--}}
-        {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">最大赔率值</label>
             <div class="layui-input-block">
@@ -64,15 +58,36 @@
             </div>
         </div>
 
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">赔率状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:启用 1:停用  2:禁用" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--</div>--}}
+        {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">赔率状态</label>
             <div class="layui-input-block">
-                <input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:启用 1:停用  2:禁用" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >
+                @if(isset($status))
+                    <input type="radio" name="status" value="0" title="启用" @if($status=='0') checked @endif >
+                    <input type="radio" name="status" value="1" title="停用" @if($status=='1') checked @endif>
+                    <input type="radio" name="status" value="-1" title="禁用" @if($status=='-1') checked @endif>
+                @else
+                    <input type="radio" name="status" value="0" title="启用" checked >
+                    <input type="radio" name="status" value="1" title="停用">
+                    <input type="radio" name="status" value="-1" title="禁用">
+                @endif
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">赔率过期时间</label>
+            <div class="layui-input-block">
+                <input type="datetime-local" name="expire_time" autocomplete="off" class="layui-input" placeholder="" value="{{ isset($expire_time)?$expire_time:date('Y-m-d',time()).'T'.date('H:i',time())}}" >
             </div>
         </div>
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
                     <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
                     <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
@@ -100,25 +115,25 @@
 
     <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
     <script>
-        var code;
+        var lgid;
+        var aa;
         layui.use(['form'], function(){
             var form = layui.form;
-            form.on('select(odds)',function(data){
-                code = data.value;
-                //console.log(code);
+            form.on('select(sect)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
                 $.ajax({
                     type:'get',
                     url:'/admin/SportsBasket/getoddscode',
-                    data:{pcode:code},
+                    data:{pcode:lgid},
                     dataType:'json',
                     success:function(data){  //请求成功回调函数
-                        console.log(data);
                         var option = '';
                         var dd = '';
                         option += '<option value></option>';
-                        dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
                         for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
-                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_code_cn"]+"</option>";
+                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_name"]+"</option>";
                         }
                         $("#code").html(option);
                         //重新渲染select
@@ -132,5 +147,4 @@
             });
         });
     </script>
-    </script>
 @endsection

+ 6 - 31
resources/views/sports/soccer_match.blade.php

@@ -38,25 +38,8 @@
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
 
-
-                    {{--<div class="layui-inline">--}}
-                        {{--<label class="layui-form-label">联赛</label>--}}
-                        {{--<div class="layui-input-inline" style="width: 200px">--}}
-                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
-                                {{--<option value="-1"></option>--}}
-                                {{--@foreach($league as $k=>$v):--}}
-                                {{--@if($name_chinese==$k['lg_id'])--}}
-                                {{--<option value="{{$k['lg_id']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
-                                {{--@else--}}
-                                    {{--<option value="{{$k['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
-                                {{--@endif--}}
-                                {{--@endforeach--}}
-                            {{--</select>--}}
-                        {{--</div>--}}
-                    {{--</div>--}}
-
                     <div class="layui-inline">
-                        <label class="layui-form-label">球队查询</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.team_search') }}</label>
                         <div class="layui-input-inline">
                             <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
@@ -67,7 +50,7 @@
                     </div>
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">联赛查询</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>
@@ -83,16 +66,14 @@
                     </div>
 
                     <div class="layui-inline">
-                        {{--<label class="layui-form-label">{{ trans('system_user.star_time') }}</label>--}}
-                        <label class="layui-form-label">日期查询</label>
-                        <div class="layui-input-inline" style="width: 140px">
-                            <input type="date" name="match_date" value="{{ $match_date }}"  placeholder=""  lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
-                            <?php //echo date('y-m-d' ,time()) ?>
+                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">赛事状态查询</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">
                             <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>
@@ -107,12 +88,6 @@
                         </div>
                     </div>
 
-
-                    {{--//选择日期--}}
-                    {{--<div class="layui-input-inline" >--}}
-                        {{--<input type="text" name="create_at_end" id="form_create_at_end" lay-verify="" autocomplete="off" class="layui-input test-item">--}}
-                    {{--</div>--}}
-
                     <div class="layui-inline">
                         {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>

+ 4 - 4
resources/views/sports/soccer_odds.blade.php

@@ -47,15 +47,15 @@
                     </div>
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">父级赔率代码查询</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.p_code_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name="p_code"  id="form_p_code"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>
                                 @foreach($pcode as $k=>$v):
                                 @if($p_code==$v['odds_code']))
-                                <option value="{{$v['odds_code']}}" selected="selected">{{$v['odds_code_cn']}}</option>
+                                <option value="{{$v['odds_code']}}" selected="selected">{{$v['odds_name']}}</option>
                                 @else
-                                    <option value="{{$v['odds_code']}}">{{$v['odds_code_cn']}}</option>
+                                    <option value="{{$v['odds_code']}}">{{$v['odds_name']}}</option>
                                 @endif
                                 @endforeach
                             </select>
@@ -63,7 +63,7 @@
                     </div>
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">赔率状态查询</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.odds_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">
                             <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
                                 <option value="-1"></option>

+ 1 - 1
resources/views/sports/soccer_odds_form.blade.php

@@ -28,7 +28,7 @@
             <label class="layui-form-label">赔率代码</label>
             <div class="layui-input-block">
                 <select name="code" id="code" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
-                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_code_cn)?$odds_code_cn:'' }}</option>
+                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_name)?$odds_name:'' }}</option>
                 </select>
             </div>
         </div>

+ 9 - 9
resources/views/sports/sports_notelist.blade.php

@@ -48,17 +48,17 @@
                     {{--</div>--}}
 
                     <div class="layui-inline">
-                        {{--<label class="layui-form-label">{{ trans('system_user.star_time') }}</label>--}}
-                        <label class="layui-form-label">日期查询</label>
-                        <div class="layui-input-inline" style="width: 140px">
-                            <input type="date" name="money_time" value="{{ $money_time }}"  placeholder=""  lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
+                        <label class="layui-form-label">{{ trans('sportsnotelist.star_time') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
-
-                    {{--//选择日期--}}
-                    {{--<div class="layui-input-inline" >--}}
-                    {{--<input type="text" name="create_at_end" id="form_create_at_end" lay-verify="" autocomplete="off" class="layui-input test-item">--}}
-                    {{--</div>--}}
 
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>

+ 111 - 3
resources/views/sports/tennis_form.blade.php

@@ -5,13 +5,62 @@
         <div class="layui-form-item">
             <label class="layui-form-label">主队员名称</label>
             <div class="layui-input-block">
-                <input type="text" name="home_team" required  lay-verify="required" placeholder="请输入主队名称" autocomplete="off" value="{{ isset($home_team)?$home_team:'' }}" class="layui-input">
+                <input type="text" name="home_team" required  lay-verify="required" placeholder="请输入主队选手名称" autocomplete="off" value="{{ isset($home_team)?$home_team:'' }}" class="layui-input">
             </div>
         </div>
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">主队国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="home_country" lay-filter = 'home'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($country))--}}
+        {{--@foreach($country as $k=>$v)--}}
+        {{--<option value="{{ $v['home_country_id'] }}"  @if(isset($home_country_id)&&$home_country_id==$v['home_country_id'])  selected @endif>--}}
+        {{--@if(isset($lange[$v['home_country_name']]))  {{$lange[trim($v['home_country_name'])]}} @else {{$v['home_country_name']}}   @endif--}}
+        {{--</option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">主队</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="home_team" id="home_team" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($home_team)?$home_team:'' }}">{{ isset($home_team)?$home_team:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">客队国家</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="guest_country" lay-filter = 'guest'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value></option>--}}
+        {{--@if(isset($countrys))--}}
+        {{--@foreach($countrys as $k=>$v)--}}
+        {{--<option value="{{ $v['guest_country_id'] }}"  @if(isset($guest_country_id)&&$guest_country_id==$v['guest_country_id'])  selected @endif>--}}
+        {{--@if(isset($lange[$v['guest_country_name']]))  {{$lange[trim($v['guest_country_name'])]}} @else {{$v['guest_country_name']}}   @endif--}}
+        {{--</option>--}}
+        {{--@endforeach--}}
+        {{--@endif--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+        {{--<div class="layui-form-item layui-form">--}}
+        {{--<label class="layui-form-label">客队</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<select name="guest_team" id="guest_team" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+        {{--<option value="{{ isset($guest_team)?$guest_team:'' }}">{{ isset($guest_team)?$guest_team:'' }}</option>--}}
+        {{--</select>--}}
+        {{--</div>--}}
+        {{--</div>--}}
+
+
         <div class="layui-form-item">
             <label class="layui-form-label">客队员名称</label>
             <div class="layui-input-block">
-                <input type="text" name="guest_team" lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
+                <input type="text" name="guest_team" lay-verify="" placeholder="请输入客队选手名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >
             </div>
         </div>
         <div class="layui-form-item">
@@ -41,16 +90,31 @@
                 <input type="time" name="match_time" autocomplete="off" class="layui-input" value="{{ isset($match_time)?$match_time:date('H:i',time()) }}" >
             </div>
         </div>
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">赛事状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--</div>--}}
+        {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">赛事状态</label>
             <div class="layui-input-block">
-                <input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:未开始 1:正在进行  2:已结束" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >
+                @if(isset($status))
+                    <input type="radio" name="status" value="0" title="未开始" @if($status=='0') checked @endif >
+                    <input type="radio" name="status" value="1" title="正在进行" @if($status=='1') checked @endif>
+                    <input type="radio" name="status" value="2" title="已结束" @if($status=='2') checked @endif>
+                @else
+                    <input type="radio" name="status" value="0" title="未开始" checked >
+                    <input type="radio" name="status" value="1" title="正在进行">
+                    <input type="radio" name="status" value="2" title="已结束">
+                @endif
             </div>
         </div>
 
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
                     <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
                     <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
@@ -62,7 +126,51 @@
         //Demo
         layui.use(['form'], function(){
             var form = layui.form;
+            form.on('select(home)',function(data){
+                countryid = data.value;
+                //console.log(countryid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsTennis/getteam',
+                    data:{countryid:countryid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        //var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["team_name_cn"]+"</option>";
+                        }
+                        $("#home_team").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
 
+            form.on('select(guest)',function(data){
+                countryid = data.value;
+                console.log(countryid);
+                $.ajax({
+                    type:'get',
+                    url:'/admin/SportsTennis/getteam',
+                    data:{countryid:countryid},
+                    dataType:'json',
+                    success:function(data){  //请求成功回调函数
+                        var option = '';
+                        //var dd = '';
+                        option += '<option value></option>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
+                            option += "<option value="+data[i]["id"]+">"+data[i]["team_name_cn"]+"</option>";
+                        }
+                        $("#guest_team").html(option);
+                        //重新渲染select
+                        form.render('select');
+                    },
+                });
+            })
             //监听提交
             form.on('submit(submitForm)', function(data){
                 return true;

+ 43 - 6
resources/views/sports/tennis_match.blade.php

@@ -26,6 +26,7 @@
         th div{
             text-align: center;
         }
+        input[type=date]::-webkit-inner-spin-button { visibility: hidden; }
     </style>
 
     <script type="text/html" id="status">
@@ -36,10 +37,11 @@
         <div class="layui-col-xs12">
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.search') }}</label>
+                        <label class="layui-form-label">{{ trans('sportssoccer.team_player_search') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
@@ -47,12 +49,47 @@
                         </div>
                     </div>
 
-                    {{--//选择日期--}}
-                    {{--<div class="layui-input-inline" >--}}
-                    {{--<input type="text" name="create_at_end" id="form_create_at_end" lay-verify="" autocomplete="off" class="layui-input test-item">--}}
-                    {{--</div>--}}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($league as $k=>$v):
+                                @if($name_chinese==$v['name_chinese']))
+                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
+                                @else
+                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.match_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline">
+                        {{--<a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>--}}
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>

+ 36 - 3
resources/views/sports/tennis_odds.blade.php

@@ -39,14 +39,47 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_id') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                            <input type="text" name="cp_id" id="cp_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
                         </div>
-                        <div class="layui-input-inline checkbox">
-                            <input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>
+                        {{--<div class="layui-input-inline checkbox">--}}
+                        {{--<input type="checkbox" name="sureblur" id="sureblur" lay-skin="switch" lay-text="精确|模糊" checked>--}}
+                        {{--</div>--}}
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.p_code_search') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="p_code"  id="form_p_code"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach($pcode as $k=>$v):
+                                @if($p_code==$v['odds_code']))
+                                <option value="{{$v['odds_code']}}" selected="selected">{{$v['odds_name']}}</option>
+                                @else
+                                    <option value="{{$v['odds_code']}}">{{$v['odds_name']}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportssoccer.odds_status_search') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.odds_status.status') as $k=>$v):
+                                @if($status==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
                         </div>
                     </div>
 
                     <div class="layui-inline">
+                        <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;">返回</a>
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                         <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>

+ 33 - 19
resources/views/sports/tennis_odds_form.blade.php

@@ -11,12 +11,12 @@
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">父级赔率代码</label>
             <div class="layui-input-block">
-                <select name="pcode" id="pcode" lay-filter = 'odds'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                <select name="pcode" id="pcode" lay-filter = 'sect'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
                     <option value></option>
                     @if(isset($pcode))
                         @foreach($pcode as $k=>$v)
                             <option value="{{ $v['p_code'] }}"  @if(isset($p_code)&&$p_code==$v['p_code'])  selected @endif>
-                                @if(isset($lange[$v['odds_code_cn']]))  {{$lange[trim($v['odds_code_cn'])]}} @else {{$v['odds_code_cn']}}   @endif
+                                @if(isset($lange[$v['odds_name']]))  {{$lange[trim($v['odds_name'])]}} @else {{$v['odds_name']}}   @endif
                             </option>
 
                         @endforeach
@@ -28,7 +28,7 @@
             <label class="layui-form-label">赔率代码</label>
             <div class="layui-input-block">
                 <select name="code" id="code" lay-filter = 'sect_code'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
-                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_code_cn)?$odds_code_cn:'' }}</option>
+                    <option value="{{ isset($odds_code)?$odds_code:'' }}">{{ isset($odds_name)?$odds_name:'' }}</option>
                 </select>
             </div>
         </div>
@@ -45,12 +45,6 @@
                 <input type="text" name="odds" lay-verify="" placeholder="请输入赔率值" autocomplete="off" class="layui-input"  value="{{ isset($odds)?$odds:'' }}" >
             </div>
         </div>
-        {{--<div class="layui-form-item">--}}
-        {{--<label class="layui-form-label">父级赔率id</label>--}}
-        {{--<div class="layui-input-block">--}}
-        {{--<input type="text" name="guest_team" lay-verify="" placeholder="请输入客队名称" autocomplete="off" class="layui-input"  value="{{ isset($guest_team)?$guest_team:'' }}" >--}}
-        {{--</div>--}}
-        {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">最大赔率值</label>
             <div class="layui-input-block">
@@ -64,15 +58,36 @@
             </div>
         </div>
 
+        {{--<div class="layui-form-item">--}}
+        {{--<label class="layui-form-label">赔率状态</label>--}}
+        {{--<div class="layui-input-block">--}}
+        {{--<input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:启用 1:停用  2:禁用" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >--}}
+        {{--</div>--}}
+        {{--</div>--}}
         <div class="layui-form-item">
             <label class="layui-form-label">赔率状态</label>
             <div class="layui-input-block">
-                <input type="text" name="status"   lay-verify="" placeholder="请输入赛事状态 0:启用 1:停用  2:禁用" autocomplete="off" class="layui-input"  value="{{ isset($status)?$status:'' }}" >
+                @if(isset($status))
+                    <input type="radio" name="status" value="0" title="启用" @if($status=='0') checked @endif >
+                    <input type="radio" name="status" value="1" title="停用" @if($status=='1') checked @endif>
+                    <input type="radio" name="status" value="-1" title="禁用" @if($status=='-1') checked @endif>
+                @else
+                    <input type="radio" name="status" value="0" title="启用" checked >
+                    <input type="radio" name="status" value="1" title="停用">
+                    <input type="radio" name="status" value="-1" title="禁用">
+                @endif
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">赔率过期时间</label>
+            <div class="layui-input-block">
+                <input type="datetime-local" name="expire_time" autocomplete="off" class="layui-input" placeholder="" value="{{ isset($expire_time)?$expire_time:date('Y-m-d',time()).'T'.date('H:i',time())}}" >
             </div>
         </div>
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">
+                    <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;width: 92px; height: 38px;line-height: 38px;font-size: 14px;">返回</a>
                     <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>
                     <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 </div>
@@ -100,25 +115,25 @@
 
     <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
     <script>
-        var code;
+        var lgid;
+        var aa;
         layui.use(['form'], function(){
             var form = layui.form;
-            form.on('select(odds)',function(data){
-                code = data.value;
-                //console.log(code);
+            form.on('select(sect)',function(data){
+                lgid = data.value;
+                //console.log(lgid);
                 $.ajax({
                     type:'get',
                     url:'/admin/SportsTennis/getoddscode',
-                    data:{pcode:code},
+                    data:{pcode:lgid},
                     dataType:'json',
                     success:function(data){  //请求成功回调函数
-                        console.log(data);
                         var option = '';
                         var dd = '';
                         option += '<option value></option>';
-                        dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
+                        //dd += '<dd lay-value class="layui-select-tips">请选择</dd>';
                         for(var i=0;i<data.length;i++){  //循环获取返回值,并组装成html代码
-                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_code_cn"]+"</option>";
+                            option += "<option value="+data[i]["odds_code"]+">"+data[i]["odds_name"]+"</option>";
                         }
                         $("#code").html(option);
                         //重新渲染select
@@ -132,5 +147,4 @@
             });
         });
     </script>
-    </script>
 @endsection