追加推送

app/Http/Controllers/Admin/CascadeController.php

@@ -18,6 +18,9 @@ class CascadeController extends Controller {
 	 * @return array JsonString
 	 */
 	public function index(Req $req) {
+        $code = 200;
+        $msg = '失败';
+        $data = '';
         $rank = isset($req->rank) ? $req->rank : 0;
         $id = isset($req->id) ? $req->id : 0;
         $gameType = isset($req->gameType) ? $req->gameType : 0;
@@ -25,21 +28,27 @@ class CascadeController extends Controller {
         $gameTypeModel = new \App\Models\StGameType();
         $getGameTypeSelect = ['id', 'game_name', 'game_code'];
         $getGameTypeWhere['status'] = 1;
+        if (empty($gameType)) {
+            $msg = '运动类型为空';
+            return ['code' => $code, 'msg' => $msg, 'data' => ''];
+        }
         $getGameTypeWhere['id'] = $gameType;
         $getGameType = $gameTypeModel -> getGameType($getGameTypeSelect, $getGameTypeWhere);
         // 获取级联数据
         $cascadeModel = new \App\Models\Cascade();
+        /*$a = $cascadeModel -> getLeague('*', '', $getGameType[0]['game_code']);
+        echo json_encode($a);die;*/
         $result = [];
         switch ($rank) {
             // 级联关系[0洲，1国家，2联赛，3球队]
             case 0:
                 $getResultSelect = ['id', 'title', 'source'];
-                $result = $cascadeModel -> getArea($getResultSelect);
+                $result = $cascadeModel -> allArea($getResultSelect);
                 break;
             case 1:
                 $getResultSelect = ['country_id', 'name_chinese', 'name_english', 'country_ico', 'country_area', 'id', 'source'];
                 $getResultWhere['country_area'] = $id;
-                $result = $cascadeModel -> getCountry($getResultSelect, $getResultWhere, $getGameType[0]['game_code'], $gameType);
+                $result = $cascadeModel -> getCountryByArea($getResultSelect, $getResultWhere, $getGameType[0]['game_code'], $gameType);
                 break;
             case 2:
                 $getResultSelect = ['name_chinese', 'name_english', 'kind', 'league_pic', 'country_id', 'area_id', 'id', 'lg_id'];
@@ -49,11 +58,11 @@ class CascadeController extends Controller {
             case 3:
                 $getResultSelect = ['id', 'home_team', 'guest_team', 'lg_id'];
                 $getResultWhere['lg_id'] = $id;
-                $result = $cascadeModel -> getCompetition($getResultSelect, $getResultWhere, $getGameType[0]['game_code']);
+                $result['competition'] = $cascadeModel -> getCompetition($getResultSelect, $getResultWhere, $getGameType[0]['game_code']);
                 break;
         }
-
-        return json_encode($result);
+        $msg = 'success';
+        return ['code' => $code, 'msg' => $msg, 'data' => $result];
 	}
 }
 

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -28,6 +28,7 @@ class SoccerNoteListController extends Controller
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
         $request['order_id'] = isset($req->order_id) ? trim($req->order_id) :null ;
         $request['match_id'] = isset($req->match_id) ? trim($req->match_id) :null ;
+        $request['type'] = isset($req->type) ? trim($req->type) : 'zq';
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerNoteList/info');
         $dt->setLang('sportsnotelist');
@@ -37,9 +38,9 @@ class SoccerNoteListController extends Controller
         $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        //$dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('account', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         //$dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
@@ -55,7 +56,6 @@ class SoccerNoteListController extends Controller
 
     function info()
     {
-        $type = '1';//单式注单
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
         $account = Request::get('account') ? Request::get('account') : '';
@@ -64,32 +64,36 @@ class SoccerNoteListController extends Controller
         $order_id = Request::get('order_id') ? Request::get('order_id') : '';
         $match_id = Request::get('match_id') ? Request::get('match_id') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+        $type = Request::has('type') ? Request::get('type') : 'zq';
         $where = array();
         if (!empty($account)) {
             if (empty($sureblur) || $sureblur == 'off') {
-                $where[] = array('st_zq_bet.account_name', 'like', '%' . $account . '%');
+                $where[] = array('money_buy.account_name', 'like', '%' . $account . '%');
             } else {
-                $where[] = array('st_zq_bet.account_name', '=', $account);
+                $where[] = array('money_buy.account_name', '=', $account);
             }
         }
         if (!empty($star_time)) {
             if (!empty($end_time)){
-                $where[] = array('st_zq_bet.money_time', '>', $star_time);
-                $where[] = array('st_zq_bet.money_time', '<', $end_time);
+                $where[] = array('money_buy.money_time', '>', $star_time);
+                $where[] = array('money_buy.money_time', '<', $end_time);
             }else{
-                $where[] = array('st_zq_bet.money_time', '>', $star_time);
+                $where[] = array('money_buy.money_time', '>', $star_time);
             }
         }else if(empty($star_time)){
             if (!empty($end_time)){
 
-                $where[] = array('st_zq_bet.money_time', '<', $end_time);
+                $where[] = array('money_buy.money_time', '<', $end_time);
             }
         }
         if (!empty($order_id)){
-            $where[] = array('st_zq_bet.order_id', $order_id);
+            $where[] = array('money_buy.order_id', $order_id);
         }
         if (!empty($match_id)){
-            $where[] = array('st_zq_bet.match_id', $match_id);
+            $where[] = array('money_buy.match_id', $match_id);
+        }
+        if (!empty($type)){
+            $where[] = array('money_buy.game_name', $type);
         }
         $newapp = new \App\Models\SportsNoteList();
         $data = $newapp->getinfo($list, $page, $where,$type);
@@ -97,51 +101,6 @@ class SoccerNoteListController extends Controller
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
 
-    /**
-     *修改订单
-     */
-    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_zq_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);
-        }
-
-    }
 
     /**
      *订单审核
@@ -205,11 +164,11 @@ class SoccerNoteListController extends Controller
      */
     function moneycount()
     {
-        $type = '1';//单式注单
+        //$type = 'zq';//单式注单
         $where = Request::has('where') ? Request::get('where') : '';
         $db = new \App\Models\SportsNoteList;
 
-        $data = $db->MoneyCount($where,$type);
+        $data = $db->MoneyCount($where);
         return responseToJson($data);
     }
 

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -27,152 +27,123 @@ class SoccerStringNoteListController extends Controller
         $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
         $request['order_id'] = isset($req->order_id) ? trim($req->order_id) :null ;
-        $request['match_id'] = isset($req->match_id) ? trim($req->match_id) :null ;
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerStringNoteList/info');
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('order_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
-        $dt->addColsFields('model', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('detail_content', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+        $dt->addColsFields('game_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('detail_content', array('sort' => false, 'width' => 150));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        //$dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
-        $dt->addColsFields('account', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('account', array('templet' => '#userdetail', 'sort' => false, 'width' => 240));
         //$dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('settle_status', array('sort' => false, 'width' => 100));
         //$arr[] = 'view';
-//        if (checkRriv('/admin/SoccerNoteList/edit')) {
-//            $arr[] = 'edit';
+//        if (checkRriv('/admin/SoccerStringNoteList/edit')) {
+//            $arr[] ='edit';
 //        }
-//        $dt->setToolBar($arr, array('width' => 70));
+//        $dt->setToolBar($arr, array('width' => 100));
         $dt->enableCheckBox();
         return view('sports/sports_stringnotelist', $dt->render($request));
     }
 
     function info()
     {
-        $type = '2';//串关注单
         $page = Request::has('page') ? Request::get('page') : '';
         $list = Request::has('limit') ? Request::get('limit') : 10;
         $account = Request::get('account') ? Request::get('account') : '';
         $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' : '';
         $order_id = Request::get('order_id') ? Request::get('order_id') : '';
-        $match_id = Request::get('match_id') ? Request::get('match_id') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
         if (!empty($account)) {
             if (empty($sureblur) || $sureblur == 'off') {
-                $where[] = array('st_zq_bet.account_name', 'like', '%' . $account . '%');
+                $where[] = array('money_buy_str.account_name', 'like', '%' . $account . '%');
             } else {
-                $where[] = array('st_zq_bet.account_name', '=', $account);
+                $where[] = array('money_buy_str.account_name', '=', $account);
             }
         }
         if (!empty($star_time)) {
             if (!empty($end_time)){
-                $where[] = array('st_zq_bet.money_time', '>', $star_time);
-                $where[] = array('st_zq_bet.money_time', '<', $end_time);
+                $where[] = array('money_buy_str.money_time', '>', $star_time);
+                $where[] = array('money_buy_str.money_time', '<', $end_time);
             }else{
-                $where[] = array('st_zq_bet.money_time', '>', $star_time);
+                $where[] = array('money_buy_str.money_time', '>', $star_time);
             }
         }else if(empty($star_time)){
             if (!empty($end_time)){
 
-                $where[] = array('st_zq_bet.money_time', '<', $end_time);
+                $where[] = array('money_buy_str.money_time', '<', $end_time);
             }
         }
         if (!empty($order_id)){
-            $where[] = array('st_zq_bet.order_id', $order_id);
-        }
-        if (!empty($match_id)){
-            $where[] = array('st_zq_bet.match_id', $match_id);
+            $where[] = array('money_buy_str.order_id', $order_id);
         }
-        $newapp = new \App\Models\SportsNoteList();
-        $data = $newapp->getinfo($list, $page, $where,$type);
+        $newapp = new \App\Models\MoneyBuyStr();
+        $data = $newapp->getinfo($list, $page, $where);
 
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
 
     /**
-     *修改订单
+     *串关注单详情
      */
-    function edit(Req $req) {
+    function detail(Req $req) {
+        $id = $req->id;
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
+        $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['account'] = isset($req->account) ? trim($req->account) :null ;
+        $request['match_id'] = isset($req->match_id) ? trim($req->match_id) :null ;
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/SoccerStringNoteList/detailinfo?id='.$id.'');
+        $dt->setLang('sportsnotelist');
+        $dt->addColsFields('match_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('game_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('odds_code', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('condition', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('odds', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->enableCheckBox();
+        return view('sports/sports_notelistdetail', $dt->render($request));
+    }
+    function detailinfo(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_zq_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')) {
+        //$match_id = Request::get('match_id') ? Request::get('match_id') : '';
 
 
-            $data = $data->toArray();
+        $newapp = new \App\Models\MoneyBuyStr();
+        $data = $newapp->getdetailinfo($id);
+        //$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());
+        //return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+        return \App\Lib\DataTable\DataTable::init()->toJson($data);
+
+        //return view('sports/sports_notelistdetail', $data);
 
-            $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]);
-                }
-            }
+    public function resettlement(Req $req) {
+        $id = $req->id;
+        if (intval($id) < 1) {
+            return -1;
         }
 
-        $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');
@@ -191,7 +162,7 @@ class SoccerStringNoteListController extends Controller
             }
         }
 
-        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        $rows = \App\Models\MoneyBuyStr::whereIn('id', $ids)->delete();
         if (!$rows) {
             return responseToJson(-2003); //id����
         }
@@ -204,11 +175,10 @@ class SoccerStringNoteListController extends Controller
      */
     function moneycount()
     {
-        $type = '2';//串关注单
         $where = Request::has('where') ? Request::get('where') : '';
-        $db = new \App\Models\SportsNoteList;
+        $db = new \App\Models\MoneyBuyStr;
 
-        $data = $db->MoneyCount($where,$type);
+        $data = $db->MoneyCount($where);
         return responseToJson($data);
     }
 

app/Http/Controllers/Admin/SportsbqController.php

@@ -0,0 +1,61 @@
+<?php
+
+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 SportsbqController extends Controller {
+
+	//足球结果列表  sureblurs
+	function outcome(Req $req) {
+		$request=array();
+		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['source'] = isset($req->source) ? $req->source : null;
+		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+		$dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/Sportsbq/info');
+        $dt->setLang('Sportsbq');
+        $dt->addColsFields('home_team', array('templet' => '#home_team', 'sort' => false, 'width' => 200));
+        $dt->addColsFields('guest_team', array('templet' => '#guest_team', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('home_rate', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('guest_rate', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('home_score', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('guest_score', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('all_goal', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('first_score', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('last_score', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('match_score', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('match_winer', array('templet' => '#home_rate', 'sort' => false, 'width' => 80));
+		return view('admin.Sportsbq/outcome', $dt->render($request));
+	}
+
+	function info(){
+		$page = Request::has('page') ? Request::get('page') : '';
+		$list = Request::has('limit') ? Request::get('limit') : 10;
+		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
+		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+		$status = Request::has('status') ? Request::get('status') : '';
+		$source = Request::has('source') ? Request::get('source') : 'hg3535';
+		$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' : '';
+        $where = array();
+        if ($status != -1) {
+			$where[] = array('st_zq_result.status', '=', $status);
+		}
+		if (!empty($source)) {
+			$where[] = array('st_zq_result.source', '=', $source);
+		}
+		$newapp = new \App\Models\Stbqresult();
+        $data = $newapp->getinfo($list, $page, $where);
+        
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+	}
+}

app/Http/Controllers/Admin/SportsfootController.php

@@ -34,8 +34,8 @@ class SportsfootController extends Controller {
         $dt->addColsFields('totime', array('templet' => '#totime', 'sort' => false, 'width' => 80));
         $dt->addColsFields('home_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
 		$dt->addColsFields('guest_team', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-		$dt->addColsFields('dsnum', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-		$dt->addColsFields('csnum', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
+		$dt->addColsFields('dsnum', array('templet' => '#dsnum', 'sort' => false, 'width' => 70));
+		$dt->addColsFields('csnum', array('templet' => '#csnum', 'sort' => false, 'width' => 110));
 		$dt->addColsFields('sxalfcourt', array('templet' => '#sxalfcourt', 'sort' => false, 'width' => 300));
         // $dt->addColsFields('status', array('templet' => '#status', 'sort' => false, 'width' => 150,'align' => 'left'));
         // $arr[] = 'view';

app/Http/Controllers/Admin/TestController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Request;
+
+class TestController extends Controller {
+	function test() {
+        $gameTypeModel = new \App\Models\StGameType();
+        $getGameTypeSelect = ['id', 'game_name', 'game_code']; 
+        $getGameTypeWhere['status'] = 1;
+        $result['sportType'] = $gameTypeModel -> getGameType($getGameTypeSelect, $getGameTypeWhere);
+        $cascadeModel = new \App\Models\Cascade();
+        $getRankSelect = ['id', 'title', 'source'];
+        $result['rank']['area'] = $cascadeModel -> allArea($getRankSelect);
+        $getCountrySelect = ['country_id', 'name_chinese', 'name_english', 'country_ico', 'country_area', 'id', 'source'];
+        $result['rank']['country'] = $cascadeModel -> getCountry($getCountrySelect, '');
+        $dt = \App\Lib\DataTable\DataTable::init();
+        return view('admin.test/test', $dt->render($result));
+	}
+}

app/Http/Controllers/Admin/WagentController.php

@@ -0,0 +1,99 @@
+<?php
+
+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 WagentController extends Controller {
+
+	//代理列表
+	function index(Req $req) {
+		$request=array();
+		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
+		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
+		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+		$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');
+
+		$dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/wagent/info');
+        $dt->setLang('wagent');
+        $dt->addColsFields('agent_name', array('templet' => '#newtime', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('agent_key_secret', array('templet' => '#agent_key_secret', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('create_time', array('templet' => '#totime', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('frozen_money', array('templet' => '#frozen_money', 'sort' => false, 'width' => 120));
+        $dt->addColsFields('money', array('templet' => '#totime', 'sort' => false, 'width' => 80));
+        if (checkRriv('/admin/sportsfoot/edit')) {
+			$arr[] = 'edit';
+		}
+		$dt->setToolBar($arr, array('width' => 200));
+        $dt->enableCheckBox();
+		return view('admin.wagent/index', $dt->render($request));
+	}
+
+	function info(){
+		$page = Request::has('page') ? Request::get('page') : '';
+		$list = Request::has('limit') ? Request::get('limit') : 10;
+		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
+		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+		$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' : '';
+		$where = array();
+		if (!empty($home_team)) {
+			if (empty($sureblur) || $sureblur == 'off') {
+				$where[] = array('wagent.agent_name', 'like', '%' . $home_team . '%');
+			} else {
+				$where[] = array('wagent.agent_name', '=', $home_team);
+			}
+		}
+
+		$newapp = new \App\Models\Wagent();
+        $data = $newapp->wagentlist($list, $page, $where);
+        
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+	}
+
+	function add(Req $req) {
+		if (!$req->isMethod('post')) {
+            $lange = trans('menu');
+
+            return view('admin.wagent/add');
+        } else {
+        	$agent_name = trim($req->input('agent_name'));//唯一代理名称
+        	$agent_pre = trim($req->input('agent_pre'));//唯一代理用户前缀
+
+            $model = new \App\Models\Wagent();
+            $only = $model->onlywagent($agent_name,$agent_pre);
+            if($only==1){
+				$model->agent_name = $agent_name;//唯一代理名称
+				$model->money = trim($req->input('money'));
+				$model->frozen_money = trim($req->input('frozen_money'));
+				$model->agent_key = md5($this->randomnum(6));
+				$model->auth_expire = time();
+				$model->agent_secret = md5($this->randomnum(6));
+				$model->create_time = date("Y-m-d");
+				$model->agent_pre = $agent_pre.'_';//唯一代理用户前缀
+				$model->status = trim($req->input('status'));
+			}
+
+			$model->save();
+			return responseToJson(1);
+        }
+	}
+
+	//随机数
+	function randomnum($num){
+		$str='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
+		$randStr = str_shuffle($str);//打乱字符串
+		$rands= substr($randStr,0,$num);
+		return $rands;
+	}
+
+}

app/Models/Cascade.php

@@ -2,6 +2,7 @@
 namespace App\Models;
 
 use DB;
+use PHPUnit\Runner\Filter\NameFilterIterator;
 
 /**
  * 获取级联关系 Model
@@ -16,17 +17,44 @@ class Cascade extends BaseModel
      * @param mixed $orderBy 排序字段
      * @return array JsonString
      */
-    public function getArea($select, $orderBy = 'id') {
+    public function allArea($select, $orderBy = 'id') {
+        $result = DB :: table('st_area')
+                -> select($select)
+                -> orderBy($orderBy)
+                -> get();
+
+        return $result;
+    }
+
+    /**
+     * 获取国家
+     *
+     * @access public
+     * @param mixed $select 查询参数
+     * @param mixed $where 查询条件
+     * @param mixed $orderBy 排序字段
+     * @return array JsonString
+     */
+    public function getCountry($select, $where, $orderBy = 'country_order') {
         $result = [];
-        $result['area'] = DB :: table('st_area')
+        if (empty($where)) {
+            $result = DB :: table('st_country')
                 -> select($select)
                 -> orderBy($orderBy)
                 -> get();
+        } else {
+            $result = DB :: table('st_country')
+                -> select($select)
+                -> where($where)
+                -> orderBy($orderBy)
+                -> get();
+        }
 
         return $result;
     }
+
     /**
-     * 循环获取国家级联关系
+     * 获取联赛
      *
      * @access public
      * @param mixed $select 查询参数
@@ -35,132 +63,180 @@ class Cascade extends BaseModel
      * @param mixed $orderBy 排序字段
      * @return array JsonString
      */
-    public function getCountry($select, $where, $gameType, $gameTypeId, $orderBy = 'country_order') {
-        // 获取国家的数据
-        $result['country'] = DB :: table('st_country')
+    public function getLeague($select, $where, $gameType, $orderBy = 'league_list') {
+        $leagueTable = 'st_' . $gameType . '_league';
+        $result = [];
+        if (empty($where)) {
+            $result = DB :: table($leagueTable)
+                -> select($select)
+                -> orderBy($orderBy)
+                -> get();
+        } else {
+            $result = DB :: table($leagueTable)
                 -> select($select)
                 -> where($where)
                 -> orderBy($orderBy)
                 -> get();
-        // 从洲直接获取联赛
-        $getLeagueSelect = ['name_chinese', 'name_english', 'kind', 'league_pic', 'country_id', 'area_id', 'id', 'lg_id'];
-        $leagueByAreaWhere['area_id'] = $where['country_area'];
-        $leagueByArea = $this -> getLeague($getLeagueSelect, $leagueByAreaWhere, $gameType);
-        $getCompetitionSelect = ['id', 'home_team', 'guest_team', 'lg_id'];
-        // 循环从国家取联赛、球队
-        $leagueByCountry = [];
-        $competitionByCountry = [];
-        foreach ($result['country'] as $key => $value) {
-            // 获取联赛
-            $leagueByCountryWhere['country_id'] = $value -> country_id;
-            $getLeagueByCountry = $this->getLeague($getLeagueSelect, $leagueByCountryWhere, $gameType);
-            $leagueByCountry = array_merge($leagueByCountry, $getLeagueByCountry);
-            // 获取球队
-            /*$leagueByCountryWhere['game_type_id'] = $gameTypeId;
-            $getCompetitionByCountry = $this->getCompetitionByCountry($getLeagueSelect, $leagueByCountryWhere, $gameType);
-            $competitionByCountry = array_merge_recursive($competitionByCountry, $getCompetitionByCountry);*/
-        }
-        // 不同获取路径合并  并去重
-        $league = array_merge($leagueByCountry, $leagueByArea);
-        $result['league'] = array_unique($league, SORT_REGULAR)['league'];
-        // 从联赛获取球队
-        $competitionByLeague = [];
-        foreach ($result['league'] as $key => $value) {
-            $competitionByLeagueWhere['lg_id'] = $value -> lg_id;
-            $getCompetitionByLeague = $this -> getCompetition($getCompetitionSelect, $competitionByLeagueWhere, $gameType);
-            $competitionByLeague = array_merge_recursive($competitionByLeague, $getCompetitionByLeague);
-        }
-        foreach ($competitionByLeague['competition'] as $key => $value) {
-            $result['competition'] = array_unique($value, SORT_REGULAR);
         }
 
         return $result;
     }
+
     /**
-     * 循环获取联赛级联关系
+     * 获取联赛球队
      *
      * @access public
      * @param mixed $select 查询参数
      * @param mixed $where 查询条件
      * @param mixed $gameType 球类型
+     * @param mixed $orderBy 排序字段
      * @return array JsonString
      */
-    public function league($select, $where, $gameType) {
-        // 获取联赛
-        $getLeagueByCountry = $this->getLeague($select, $where, $gameType);
-        $result['league'] = $getLeagueByCountry['league'];
-        // 从联赛获取球队
-        $getCompetitionSelect = ['id', 'home_team', 'guest_team', 'lg_id'];
-        $competitionByLeague = [];
-        foreach ($result['league'] as $key => $value) {
-            $competitionByLeagueWhere['lg_id'] = $value -> lg_id;
-            $getCompetitionByLeague = $this -> getCompetition($getCompetitionSelect, $competitionByLeagueWhere, $gameType);
-            $competitionByLeague = array_merge_recursive($competitionByLeague, $getCompetitionByLeague);
-        }
-        foreach ($competitionByLeague['competition'] as $key => $value) {
-            $result['competition'] = array_unique($value, SORT_REGULAR);
+    public function getCompetition($select, $where, $gameType, $orderBy = 'id') {
+        $competitionTable = 'st_' . $gameType . '_competition';
+        $result = [];
+        if (empty($where)) {
+            $result = DB :: table($competitionTable)
+                -> select($select)
+                -> orderBy($orderBy)
+                -> get();
+        } else {
+            $result = DB :: table($competitionTable)
+                -> select($select)
+                -> where($where)
+                -> orderBy($orderBy)
+                -> get();
         }
 
         return $result;
     }
+
     /**
-     * 获取联赛
+     * 获取国家球队
      *
      * @access public
      * @param mixed $select 查询参数
      * @param mixed $where 查询条件
-     * @param mixed $gameType 球类型
      * @param mixed $orderBy 排序字段
      * @return array JsonString
      */
-    public function getLeague($select, $where, $gameType, $orderBy = 'league_list') {
-        $leagueTable = 'st_' . $gameType . '_league';
-        $result['league'] = DB :: table($leagueTable)
-            -> select($select)
-            -> where($where)
-            -> orderBy($orderBy)
-            -> get();
+    public function getCountryCompetition($select, $where, $orderBy = 'id') {
+        $result = [];
+        if (empty($where)) {
+            $result = DB :: table('st_team')
+                -> select($select)
+                -> orderBy($orderBy)
+                -> get();
+        } else {
+            $result = DB :: table('st_team')
+                -> select($select)
+                -> where($where)
+                -> orderBy($orderBy)
+                -> get();
+        }
 
         return $result;
     }
+
     /**
-     * 获取球队
+     * 获取国家级联关系
      *
      * @access public
      * @param mixed $select 查询参数
      * @param mixed $where 查询条件
      * @param mixed $gameType 球类型
-     * @param mixed $orderBy 排序字段
+     * @param mixed $gameTypeId 运动类型Id
      * @return array JsonString
      */
-    public function getCompetition($select, $where, $gameType, $orderBy = 'id') {
-        $competitionTable = 'st_' . $gameType . '_competition';
-        $result['competition'] = DB :: table($competitionTable)
-            -> select($select)
-            -> where($where)
-            -> orderBy($orderBy)
-            -> get();
+    public function getCountryByArea($select, $where, $gameType, $gameTypeId) {
+        // 获取国家的数据
+        $result['country'] = $this -> getCountry($select, $where);
+        // 循环获取所有国家ID集
+        $countryId = [];
+        foreach ($result['country'] as $key => $value) {
+            $countryId[] = $value->country_id;
+        }
+        // 获取所有联赛数据
+        $getLeagueSelect = ['name_chinese', 'name_english', 'kind', 'league_pic', 'country_id', 'area_id', 'id', 'lg_id'];
+        $getAllLeague = $this -> getLeague($getLeagueSelect, '', $gameType);
+        // 获取所有联赛球队
+        $getCompetitionSelect = ['id', 'home_team', 'guest_team', 'lg_id'];
+        $getAllCompetition = $this -> getCompetition($getCompetitionSelect, '', $gameType);
+        // 获取所有国家球队
+        $getCtyCtnSelect = ['id', 'team_id', 'country_id', 'game_type_id', 'team_name_cn', 'team_name_en'];
+        $getCtyCtnWhere['game_type_id'] = $gameTypeId;
+        $getCtyCtn = $this -> getCountryCompetition($getCtyCtnSelect, $getCtyCtnWhere);
+
+        // 循环获取联赛
+        $getLeague = [];
+        foreach ($getAllLeague as $key => $value) {
+            // 从洲直接获取联赛
+            if ($value->area_id == $where['country_area']) {
+                $getLeague[] = $value;
+
+
+            // 从国家获取联赛
+            } elseif (in_array($value->country_id, $countryId)) {
+                $getLeague[] = $value;
+            }
+        }
+        // 数组去重
+        $result['league'] = array_unique($getLeague, SORT_REGULAR);
+        // 循环获取所有联赛ID集
+        $leagueId = [];
+        foreach ($result['league'] as $key => $value) {
+            $leagueId[] = $value->lg_id;
+        }
+
+        // 循环获取联赛球队
+        $getCompetition = [];
+        foreach ($getAllCompetition as $key => $value) {
+            if (in_array($value->lg_id, $leagueId)) {
+                $getCompetition[] = $value;
+            }
+        }
+        // 循环获取国家球队
+        foreach ($getCtyCtn as $key => $value) {
+            if (in_array($value->country_id, $countryId)) {
+                $getCompetition[] = $value;
+            }
+        }
+        // 数组去重
+        $result['competition'] = array_unique($getCompetition, SORT_REGULAR);
 
         return $result;
     }
+
     /**
-     * 获取球队
+     * 获取联赛级联关系
      *
      * @access public
      * @param mixed $select 查询参数
      * @param mixed $where 查询条件
      * @param mixed $gameType 球类型
-     * @param mixed $orderBy 排序字段
      * @return array JsonString
      */
-    public function getCompetitionByCountry($select, $where, $gameType, $orderBy = 'id') {
-        $competitionTable = 'st_' . $gameType . '_competition';
-        $result['competition'] = DB :: table('st_team')
-            -> join($competitionTable, $competitionTable.'.team_id','=','st_team.id')
-            -> select($select)
-            -> where($where)
-            -> orderBy($orderBy)
-            -> get();
+    public function league($select, $where, $gameType) {
+        // 获取联赛数据
+        $result['league'] = $this -> getLeague($select, $where, $gameType);
+        // 循环获取所有联赛ID集
+        $leagueId = [];
+        foreach ($result['league'] as $key => $value) {
+            $leagueId[] = $value->lg_id;
+        }
+        // 获取所有联赛球队
+        $getCompetitionSelect = ['id', 'home_team', 'guest_team', 'lg_id'];
+        $getAllCompetition = $this -> getCompetition($getCompetitionSelect, '', $gameType);
+
+        // 循环获取联赛球队
+        $getCompetition = [];
+        foreach ($getAllCompetition as $key => $value) {
+            if (in_array($value->lg_id, $leagueId)) {
+                $getCompetition[] = $value;
+            }
+        }
+        // 数组去重
+        $result['competition'] = array_unique($getCompetition, SORT_REGULAR);
 
         return $result;
     }

app/Models/MoneyBuyStr.php

@@ -0,0 +1,113 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/9
+ * Time: 9:18
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class MoneyBuyStr extends BaseModel {
+    protected $table = "money_buy_str";
+    public $timestamps = false;
+
+    function getinfo($list = 10, $page, $where = '')
+    {
+        if (is_array ($where) && count ($where) > 0) {
+            $data = $this->join('money_details','money_details.info_identity','=','money_buy_str.info_identity')
+                ->select('money_buy_str.id','money_buy_str.order_id','money_buy_str.account_name','money_buy_str.game_name','money_buy_str.money','money_buy_str.prize_money','money_buy_str.water_status','money_buy_str.money_time','money_buy_str.settle_status','money_details.money_cash')
+                ->where($where)
+                ->orderby('money_buy_str.money_time','desc')
+                ->paginate ($list);
+        } else {
+            $data = $this->join('money_details','money_details.info_identity','=','money_buy_str.info_identity')
+                ->select('money_buy_str.id','money_buy_str.order_id','money_buy_str.account_name','money_buy_str.game_name','money_buy_str.money','money_buy_str.prize_money','money_buy_str.water_status','money_buy_str.money_time','money_buy_str.settle_status','money_details.money_cash')
+                ->orderby('money_buy_str.money_time','desc')
+                ->paginate ($list);
+        }
+        if (!$data < 0) {
+            return -2021052003; //
+        }
+        for($i=0;$i<count($data);$i++){
+            if($data[$i]->status==1){
+                $data[$i]->status = '投注';
+            }else if($data[$i]->status==2){
+                $data[$i]->status = '追号';
+            }else if($data[$i]->status==4){
+                $data[$i]->status = '撤单';
+            }
+            if($data[$i]->water_status==1){
+                $data[$i]->water_status = '未回水';
+            }else if($data[$i]->water_status==2){
+                $data[$i]->water_status = '已回水';
+            }
+            if($data[$i]->settle_status==1){
+                $data[$i]->settle_status = '未结算';
+            }else if($data[$i]->settle_status==2){
+                $data[$i]->settle_status = '已结算';
+            }
+            if($data[$i]->game_status==0){
+                $data[$i]->game_status = '待开奖';
+            }else if($data[$i]->game_status==1){
+                $data[$i]->game_status = '中奖';
+            }else if($data[$i]->game_status==2){
+                $data[$i]->game_status = '未中奖';
+            }
+            if($data[$i]->member_type==1){
+                $data[$i]->member_type = '普通会员';
+            }else if($data[$i]->member_type==2){
+                $data[$i]->member_type = '超级会员';
+            }
+
+            $data[$i]->game_name = str_replace('*', '串', $data[$i]->game_name);
+
+            $mun = explode('串',$data[$i]->game_name);
+            $data[$i]->detail_content = $data[$i]->settle_status.'：'.$mun[0].' [<a class="detail" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/detail/?id=" href="/admin/SoccerStringNoteList/detail/?id='.$data[$i]->id.'"> 详情 </a>]';
+
+            $data[$i]->money_match_time = '投注：'.$data[$i]->money_time;
+
+            $data[$i]->frozen_cash = $data[$i]->money_cash;
+            $data[$i]->available_cash = $data[$i]->money_cash+$data[$i]->money.'.00';
+            $data[$i]->account = $data[$i]->available_cash.' <span>'.$data[$i]->account_name.' </span> '.$data[$i]->frozen_cash;
+
+            $data[$i]->settle_status = $data[$i]->settle_status.'<br><a class="layui-btn layui-btn-sm resettlement" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/resettlement/?id=" href="/admin/SoccerStringNoteList/resettlement/?id='.$data[$i]->id.'"> 重新结算 </a>';
+
+        }
+        return $data->toArray();
+
+    }
+
+    //投注金额汇总统计
+    function MoneyCount($where = '') {
+        $data = array();
+        $data['all_money'] = $this->sum('money');
+        $data['all_prize_money'] = $this->sum('prize_money');
+        if (!empty($where) && is_array($where)) {
+            $data['all_money'] = $this->where($where)->sum('money');
+            $data['all_prize_money'] = $this->where($where)->sum('prize_money');
+        }
+
+        return $data;
+    }
+
+    //获取串关注单详情信息
+    function getdetailinfo($id) {
+        $res = $this->where('id',$id)->first();
+        $data = DB::table('st_bet_str')->where('id',$res->bet_str_id)->first();
+        $codes = json_decode($data->bet_srt_all, true);
+
+        for($i=0;$i<count($codes);$i++){
+            $codes[$i]['home_guest'] = $codes[$i]['home_team'].' VS '.$codes[$i]['guest_team'];
+            $oddscode = DB::table('st_odds_code')->where('odds_code',$codes[$i]['ganame'])->first();
+            $codes[$i]['odds_code'] = $oddscode->odds_name;
+            $type = DB::table('st_game_type')->where('game_code',$codes[$i]['ballId'])->first();
+            $codes[$i]['game_type'] = $type->game_name;
+
+        }
+        return $codes;
+    }
+
+
+
+
+}

app/Models/SportsNoteList.php

@@ -8,27 +8,26 @@
 namespace App\Models;
 use Illuminate\Support\Facades\DB;
 class SportsNoteList extends BaseModel {
-    protected $table = "st_zq_bet";
+    protected $table = "money_buy";
     public $timestamps = false;
 
     function getinfo($list = 10, $page, $where = '',$type)
     {
         if (is_array ($where) && count ($where) > 0) {
             $data = $this
-                ->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_bet.match_id')
-                ->join('account_detailed','account_detailed.account_identity','=','st_zq_bet.account_identity')
+                ->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy.match_id')
+                ->join('money_details','money_details.info_identity','=','money_buy.info_identity')
+                //->join('st_game_type','st_game_type.game_code','=','money_buy.game_name')
                 ->where($where)
-                ->where('st_zq_bet.game_name', 'zq')
-                ->where('st_zq_bet.type', $type)
-                ->orderby('money_time','desc')
+                ->where('money_buy.game_name', $type)
+                ->orderby('money_buy.money_time','desc')
                 ->paginate ($list);
         } else {
             $data = $this
-                ->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_bet.match_id')
-                ->join('account_detailed','account_detailed.account_identity','=','st_zq_bet.account_identity')
-                ->where('st_zq_bet.game_name', 'zq')
-                ->where('st_zq_bet.type', $type)
-                ->orderby('money_time','desc')
+                ->join('st_'.$type.'_competition','st_'.$type.'_competition.match_id','=','money_buy.match_id')
+                ->join('money_details','money_details.info_identity','=','money_buy.info_identity')
+                ->where('money_buy.game_name', $type)
+                ->orderby('money_buy.money_time','desc')
                 ->paginate ($list);
         }
         if (!$data < 0) {
@@ -70,18 +69,18 @@ class SportsNoteList extends BaseModel {
             $data[$i]->match_time = '开赛：'.$data[$i]->match_date.' '.$data[$i]->match_time;
             $data[$i]->money_match_time = '投注：'.$data[$i]->money_time.'<br>'.$data[$i]->match_time;
 
-            $league = DB::table('st_zq_league')->where('lg_id',$data[$i]->lg_id)->first();
+            $league = DB::table('st_'.$type.'_league')->where('lg_id',$data[$i]->lg_id)->first();
             if(!empty($league)){
                 $data[$i]->league = $league->name_chinese;
             }else{
                 $data[$i]->league = $data[$i]->lg_id;
             }
-
-            $data[$i]->frozen_cash = $data[$i]->available_cash-$data[$i]->money.'.00';
+            //用户投注后账户金额
+            $data[$i]->frozen_cash = $data[$i]->money_cash;
+            //用户投注前账户金额
+            $data[$i]->available_cash = $data[$i]->money+$data[$i]->money_cash.'.00';
             $data[$i]->account = $data[$i]->available_cash.'<br><span>'.$data[$i]->account_name.'</span><br>'.$data[$i]->frozen_cash;
 
-
-
             $codes = json_decode($data[$i]->codes, true);
             $data[$i]->content = '';
             for($j=0;$j<count($codes);$j++){
@@ -92,9 +91,7 @@ class SportsNoteList extends BaseModel {
                 }else{
                     $odds_name = $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;
 
             }
 
@@ -104,15 +101,15 @@ class SportsNoteList extends BaseModel {
     }
 
     //投注金额汇总统计
-    function MoneyCount($where = '',$type) {
+    function MoneyCount($where = '') {
         $data = array();
-        $data['all_money'] = $this->where('type',$type)->sum('money');
-        $data['all_prize_money'] = $this->where('type',$type)->sum('prize_money');
-        $data['alraedy_prize_money'] = $this->where('game_status','1')->where('type',$type)->sum('prize_money');
+        $data['all_money'] = $this->sum('money');
+        $data['all_prize_money'] = $this->sum('prize_money');
+        $data['alraedy_prize_money'] = $this->where('game_status','1')->sum('prize_money');
         if (!empty($where) && is_array($where)) {
-            $data['all_money'] = $this->where($where)->where('type',$type)->sum('money');
-            $data['all_prize_money'] = $this->where($where)->where('type',$type)->sum('prize_money');
-            $data['alraedy_prize_money'] = $this->where($where)->where('game_status','1')->where('type',$type)->sum('prize_money');
+            $data['all_money'] = $this->where($where)->sum('money');
+            $data['all_prize_money'] = $this->where($where)->sum('prize_money');
+            $data['alraedy_prize_money'] = $this->where($where)->where('game_status','1')->sum('prize_money');
         }
 
         return $data;

app/Models/StGameType.php

@@ -21,10 +21,16 @@ class StGameType extends BaseModel
      * @return array JsonString
      */
     public function getGameType($select, $where, $orderBy = 'id') {
-        $result = $this -> select($select)
+        if ($where) {
+            $result = $this -> select($select)
                 -> where($where)
                 -> orderBy($orderBy)
                 -> get();
+        } else {
+            $result = $this -> select($select)
+                -> orderBy($orderBy)
+                -> get();
+        }
 
         return $result;
     }

app/Models/Stbqresult.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jimy
+ * Date: 2019/4/18
+ * Time: 13:59
+ */
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class Stbqresult extends BaseModel {
+    protected $table = "st_bq_result";
+    public $timestamps = false;
+
+    function getinfo($list = 10, $page, $where = '',$orwhere = '')
+    {
+    	if (is_array ($where) && count ($where) > 0) {
+            $data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.lg_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
+        } else { 
+        	//$data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.lg_id')->select($this->table.".home_team",$this->table.".guest_team",$this->table.".home_rate",$this->table.".guest_rate")->orderby($this->table.'.id','desc')->select()->paginate($list);
+        	$data = $this->join('st_bq_league','st_bq_result.lg_id','=','st_bq_league.lg_id')->select($this->table.".*")->orderby($this->table.'.id','desc')->select()->paginate($list);
+        }
+        return $data->toArray ();
+    }
+}

app/Models/Stzqresult.php

@@ -6,31 +6,6 @@ class Stzqresult extends BaseModel
 {
 	protected $table = 'st_zq_result';
 	public $timestamps = false;
-
-
-	// function resultlist($list = 10, $page, $where = '',$orwhere = '')
- //    {
- //        if (is_array ($where) && count ($where) > 0) {
- //            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->select('st_zq_result.id','st_zq_result.lg_id','st_zq_result.home_team','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_result.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
- //        } else {
- //            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->select('st_zq_result.id','st_zq_result.lg_id','st_zq_result.home_team','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_result.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->paginate ($list);
- //        }
-
- //        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==2){
- //                $data[$i]->status = '已结束';
- //            }
- //            $data[$i]->home_guest = $data[$i]->home_rate.' <br> '.$data[$i]->guest_rate;
- //            $data[$i]->shome_guest = $data[$i]->home_score.' <br> '.$data[$i]->guest_score;
- //        }
-
- //        return $data->toArray ();
-
-	// }
     
     function resultlist($list = 10, $page, $where = '',$orwhere = '')
     {

app/Models/Wagent.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models;
+use Illuminate\Support\Facades\DB;
+class Wagent extends BaseModel
+{
+	protected $table = 'wagent';
+	public $timestamps = false;
+
+    function wagentlist($list = 10, $page, $where = '')
+    {
+    	if (is_array ($where) && count ($where) > 0) { 
+    		$data = $this->select($this->table.'.*')->orderby($this->table.'.id','desc')->where($where)->paginate ($list);  
+    	}else{
+    		$data = $this->select($this->table.'.*')->orderby($this->table.'.id','desc')->paginate ($list); 
+    	}
+    	for ($i=0; $i < count($data); $i++) { 
+    		$data[$i]->auth_expire = date("Y-m-d",$data[$i]->auth_expire);
+    	}
+    	return $data->toArray (); 
+    }
+
+    //唯一性
+    function onlywagent($name,$pre){
+    	$res = $this->where ('agent_name', $name)->orwhere('agent_pre',$pre)->first ();
+    	if ($res) {
+            return 2; //唯一性
+        }
+        return 1;
+    }
+
+}

resources/lang/zh-cn/Sportsbq.php

@@ -0,0 +1,28 @@
+<?php
+return array(
+
+    //棒球赛事结果
+	'id' => '赛事结果ID',
+    'lg_id' => '联赛id',
+    'home_team' =>'主队名称',
+    'guest_team' => '客队名称',
+	'home_rate' => '主队让球',
+    'guest_rate' => '客队让球',
+    'home_score' => '主队总进球数',
+    'guest_score' => '客队总进球数',
+    'all_goal' => '总进球数',
+    'status' => '比赛状态',
+    'first_score' => '最先进球球队',
+    'last_score' => '最后进球球队',
+    'match_score' => '赛事比分',
+    'match_winer' => '获胜球队',
+    'update_time' => '更新时间',
+    'match_time' => '比赛进行时间',
+    'match_process' => '比赛进程',
+    'tag' => '赛事 标签 用于获取赛事赔率详情',
+    'match_id' => '赛事id',
+    'u_home_score' => '上半场-主队进球数',
+    'u_guest_score' => '上半场-客队进球数',
+    'source' => '数据来源',
+
+);

resources/lang/zh-cn/sportsnotelist.php

@@ -15,24 +15,32 @@ return array(
     'prize_note' => '中奖注数',
     'money' => '投注金额',
     'prize_money' => '可赢金额',
+    'result' => '结果',
     'status' => '状态',
     'content' => '投注详细信息',
     'water_status' => '回水',
     'money_time' => '下注时间',
     'prize' => '开奖号码',
-    'settle_status' => '结算',
+    'settle_status' => '状态',
     'game_status' => '状态',
     'member_type' => '会员类型',
     'edit' => '修改',
 
-    'model' => '模式',
+    'game_name' => '模式',
     'detail_content' => '结算详细信息',
 
-
-    'account' => '会员',
+    'notelist_type' => '投注球类',
+    'account' => '投注账号',
     'date' => '日期',
     'star_time' => '开始时间',
     'end_time' => '结束时间',
 
+    'game_type' => '类型',
+    'odds_code' => '赔率代码',
+    'condition' => '赔率条件',
+    'odds' => '赔率值',
+
+
+
 
 );

resources/lang/zh-cn/status.php

@@ -356,6 +356,14 @@ return array(
 			'2' => '禁用',
 		),
 	),
+	'notelist_type' => array(
+		'type' => array(
+			'zq' => '足球',
+			'lq' => '篮球',
+			'wq' => '网球',
+			'bq' => '棒球',
+		),
+	),
 	'xgstatus' => array(
 		'status' => array(
 			'0' => '结算全场',

resources/lang/zh-cn/wagent.php

@@ -0,0 +1,22 @@
+<?php
+return array(
+
+    //代理审核
+	'id' => '代理ID',
+	'agent_name' => '代理名称',
+    'agent_key' => '授权key',
+    'agent_secret' => '安全码',
+    'auth_token' => '授权token',
+    'auth_expire' => '有效期',
+    'status' => '状态',
+    'create_time' => '创建时间',
+    'apply_time' => '审核时间',
+    'money' => '可用余额',
+    'frozen_money' => '冻结余额',
+    'agent_pre' => '用户前缀',
+    'sousuo' => '搜索',
+    'star_time' => '时间起',
+    'end_time' => '时间止',
+    'agent_key_secret' => 'key/secret'
+
+);

resources/views/admin/Sportsbq/addoutcome.blade.php

@@ -0,0 +1,168 @@
+@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">{{ trans('sportsbk.home_team') }}:</label>
+                <div class="layui-input-block">
+                <input type="text" name="home_team"   id="home_team"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($home_team) {{ $sportsbk['home_team'] }} @endisset" class="layui-input">
+                </div>
+            </div>
+			<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($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($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($sportsbk) {{ $sportsbk['guest_rate'] }} @endisset" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">{{ trans('sportsbk.home_score') }}:</label>
+                <div class="layui-input-block">
+                <input type="text" name="home_score"   id="home_score"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($home_score) {{ $sportsbk['home_score'] }} @endisset" class="layui-input">
+                </div>
+            </div>
+            <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($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($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($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($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($sportsbk) {{ $sportsbk['tag'] }} @endisset" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <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($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('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($sportsbk) {{ $sportsbk['match_process'] }} @endisset </textarea>
+                </div>
+            </div>
+            <div class="layui-form-item layui-form">
+                <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('sportsbk.lg_select') }}</option>
+                        @foreach($data as $k=>$v)
+                            <option value="{{$v['lg_id']}}">{{$v['name_chinese']}}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+             <div class="layui-form-item layui-form">
+                <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('sportsbk.league_select') }}</option>
+                    </select>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+              <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="已结束">
+              </div>
+            </div>
+
+    @if(S('ACTION')!='view')
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <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>
+    var data;
+    var lgid;
+    var res;
+    layui.use(['form'], function() {
+        var form = layui.form;
+
+        form.on('select(sect)', function(data) {
+            lgid = data.value;
+            $("#match_id").empty()
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbk/saislist',
+                data: {lgid:lgid},
+                success: function(data) {
+                    if (data != undefined && data != null && data != "") {
+                        var html = "<option value=''>请选择所属赛事</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
+                             form.render('select');
+                             // $("#match_id").empty()
+                    }
+                }
+            })
+        })
+      form.on('select(api)',function(data){
+        data = data.value;
+        // $("#match_id").empty()
+      })
+    });
+
+// function cbFormSuccess(data){
+// 	layer.msg(data.msg);
+// 	setTimeout(function(){
+//     window.location.href='/admin/Sportsfoot/index';
+// 		// parent.window.location.reload();
+// 	},2500);
+// }
+// lay('.test-item').each(function(){
+//     laydate.render({
+//         elem: this
+//         ,type: 'datetime'
+//         ,trigger: 'click'
+//     });
+// });
+</script>
+@endsection

resources/views/admin/Sportsbq/edit.blade.php

@@ -0,0 +1,65 @@
+@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">主队名称</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">
+    </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:'' }}" >
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">客队让球数</label>
+    <div class="layui-input-block">
+    <input type="text" name="home_rate"   lay-verify="" placeholder="请输入客队让球数" autocomplete="off" class="layui-input"  value="{{ isset($home_rate)?$home_rate:'' }}" >
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">主队让球数</label>
+    <div class="layui-input-block">
+    <input type="text" name="guest_rate"   lay-verify="" placeholder="请输入主队让球数" autocomplete="off" class="layui-input"  value="{{ isset($guest_rate)?$guest_rate:'' }}" >
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">比赛状态:</label>
+        <div class="layui-input-block">
+            <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>
+        </div>
+  </div>
+
+
+@if(S('ACTION')!='view')
+  <div class="layui-form-item">
+    <div class="layui-input-block">
+      <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>
+//Demo
+layui.use(['form'], function(){
+  var form = layui.form;
+
+  //监听提交
+  form.on('submit(submitForm)', function(data){
+    return true;
+  });
+});
+function cbFormSuccess(data){
+	layer.msg(data.msg);
+	setTimeout(function(){
+		parent.window.location.reload();
+	},2500);
+}
+</script>
+@endsection

resources/views/admin/Sportsbq/outcome.blade.php

@@ -0,0 +1,146 @@
+@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;
+        }
+    </style>
+
+    <script type="text/html" id="status">
+        @if(checkRriv('/admin/sportsbk/index'))<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="">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsbk.sousuo') }}</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>
+                        <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>
+                            <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('sportsbk.status') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="status"  id="form_status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1">{{ trans('sportsbk.select_status') }}</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">
+                        <label class="layui-form-label">{{ trans('sportsbk.sjsource') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="source"  id="form_source"  lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
+                                <option value="">请选择{{ trans('sportsbk.sjsource') }}</option>
+                                @foreach(trans('status.sjsource.source') as $k=>$v):
+                                    @if($source==$k)
+                                        <option value={{$v}} selected>{{$v}}</option>
+                                    @else
+                                        <option value={{$v}}>{{$v}}</option>
+                                    @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </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>
+                        <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/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+	<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(){
+      //执行重载
+      table.reload('{{ $dataId }}', {
+        page: {
+          curr: 1 //重新从第 1 页开始
+        }
+        ,where: {
+            account:$("#form_account").val(),
+            register_ip:$('#form_register_ip').val(),
+            last_ip:$('#form_last_ip').val(),
+            register_url:$('#form_register_url').val(),
+            last_url:$('#form_last_url').val(),
+            regist_startime:$('#form_regist_startime').val(),
+            regist_endtime:$('#form_regist_endtime').val(),
+            statuss:$('#form_statuss').val(),
+            cash_small:$('#form_cash_small').val(),
+            cash_big:$('#form_cash_big').val(),
+            sureblur:$('.layui-form-switch').text(),
+        }
+      });
+    }
+  };
+$('.lay-btn-diy').on('click', function(){
+    var type = $(this).data('type');
+    active[type] ? active[type].call(this) : '';
+  });*/
+
+  //重置表单
+  $('.reset').on('click',function(){
+      $('input').val('');
+      $('#form_statuss').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

resources/views/admin/Test/test.blade.php

@@ -0,0 +1,83 @@
+@extends('vip.layouts')
+@section('content')
+<div style="float: left">
+    <select name="type" id="sportType"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+        <option value='' selected="selected">请选择运动类型</option>
+        @foreach($sportType as $k=>$v)
+            <option value="{{$v->id}}">{{$v->game_name}}</option>
+        @endforeach
+    </select>
+</div>
+<div style="margin-left: 50px; float: left">
+    <select name="type" onchange="changeRank(event, 1) " id="aa"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+        <option value='' selected="selected">请选择洲</option>
+        @foreach($rank['area'] as $k=>$v)
+            <option value="{{$v->id}}">{{$v->title}}</option>
+        @endforeach
+    </select>
+
+</div>
+<div style="margin-left: 50px; float: left">
+    <select name="type" onchange="changeRank(event, 2) " id="selectCountry"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+        <option value='' selected="selected">请选择国家</option>
+        @foreach($rank['country'] as $k=>$v)
+            <option value="{{$v->country_id}}">{{$v->name_chinese}}</option>
+        @endforeach
+    </select>
+</div>
+<div style="margin-left: 50px; float: left">
+    <select name="type" onchange="changeRank(event, 3) " id="selectLeague"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+        <option value='' selected="selected">请选择联赛</option>
+    </select>
+</div>
+<div style="margin-left: 50px; float: left">
+    <select name="type" id="selectCompetition"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+        <option value='' selected="selected">请选择球队</option>
+    </select>
+</div>
+<script>
+    // 洲改变
+    function changeRank(event, rank) {
+        const sportType = $("#sportType").val();
+        $.ajax({
+            type: 'GET',
+            dataType: 'json',
+            url: '/admin/Cascade/index',
+            data: {rank: rank, id: event.target.value, gameType: sportType},
+            success: function(backData) {
+                const msg = backData.msg;
+                const data = backData.data;
+                const code = backData.code;
+                if (data && msg === 'success') {
+                    if (data.country && data.country.length) {
+                        $("#selectCountry").empty();
+                        let selectCountry = "<option value=''>请选择所属国家</option>";
+                        for (i in data.country) {
+                            selectCountry += "<option value=" + data.country[i]["country_id"] + ">" + data.country[i]["name_chinese"] + "</option>";
+                        }
+                        $("#selectCountry").append(selectCountry);
+                    }
+                    if (data.league && data.league.length) {
+                        $("#selectLeague").empty();
+                        let selectLeague = "<option value=''>请选择所属联赛</option>";
+                        for (j in data.league) {
+                            selectLeague += "<option value=" + data.league[j]["lg_id"] + ">" + data.league[j]["name_chinese"] + "</option>";
+                        }
+                        $("#selectLeague").append(selectLeague);
+                    }
+                    if (data.competition && data.competition.length) {
+                        $("#selectCompetition").empty();
+                        let selectCompetition = "<option value=''>请选择球队</option>";
+                        for (o in data.competition) {
+                            selectCompetition += "<option value=" + data.competition[o]["id"] + ">" + data.competition[o]["home_team"] + "</option>";
+                        }
+                        $("#selectCompetition").append(selectCompetition);
+                    }
+                } else {
+                    alert(msg);
+                }
+            }
+        })
+    }
+</script>
+@endsection

resources/views/admin/sportsfoot/outcome.blade.php

@@ -37,6 +37,10 @@
       @{{#} }}
     </script>
 
+    <script type="text/html" id="dsnum">
+        <span><a href="/admin/SoccerNoteList/notelist?match_id=@{{d.match_id}}"> 单式</a></span>
+    </script>
+
     <script type="text/html" id="sxalfcourt">
       @{{#if(d.match_time!=null){ }}
         <!-- <span>@{{ d.match_time}}</span> -->

resources/views/admin/wagent/add.blade.php

@@ -0,0 +1,72 @@
+@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">{{ trans('wagent.agent_name') }}:</label>
+                <div class="layui-input-block">
+                <input type="text" name="agent_name"   id="agent_name"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($agent_name) {{ $wagent['agent_name'] }} @endisset" class="layui-input">
+                </div>
+            </div>
+			<div class="layui-form-item">
+                <label class="layui-form-label">{{ trans('wagent.money') }}:</label>
+                <div class="layui-input-block">
+                <input type="text" name="money"   id="money"  required  lay-verify="" placeholder="" autocomplete="off" value="@isset($wagent) {{ $wagent['money'] }} @endisset" class="layui-input">
+                </div>
+            </div>
+			<div class="layui-form-item">
+                <label class="layui-form-label">{{ trans('wagent.frozen_money') }}:</label>
+                <div class="layui-input-block">
+                <textarea  name="frozen_money"   id="frozen_money"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($wagent) {{ $wagent['frozen_money'] }} @endisset </textarea>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">{{ trans('wagent.agent_pre') }}:</label>
+                <div class="layui-input-block">
+                <textarea  name="agent_pre"   id="agent_pre"    lay-verify="" placeholder="" autocomplete="off" class="layui-input" >@isset($wagent) {{ $wagent['agent_pre'] }} @endisset </textarea>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+              <label class="layui-form-label">{{ trans('wagent.status') }}:</label>
+              <div class="layui-input-block">
+                <input type="radio" name="status" value="1" title="正常" checked >
+                <input type="radio" name="status" value="2" title="禁用">
+                <input type="radio" name="status" value="3" title="待启用">
+                <input type="radio" name="status" value="4" title="停用">
+              </div>
+            </div>
+
+    @if(S('ACTION')!='view')
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <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>
+    layui.use(['form'], function() {
+        var form = layui.form;
+    });
+
+// function cbFormSuccess(data){
+// 	layer.msg(data.msg);
+// 	setTimeout(function(){
+//     window.location.href='/admin/Sportsfoot/index';
+// 		// parent.window.location.reload();
+// 	},2500);
+// }
+// lay('.test-item').each(function(){
+//     laydate.render({
+//         elem: this
+//         ,type: 'datetime'
+//         ,trigger: 'click'
+//     });
+// });
+</script>
+@endsection

resources/views/admin/wagent/edit.blade.php

@@ -0,0 +1,65 @@
+@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">主队名称</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">
+    </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:'' }}" >
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">客队让球数</label>
+    <div class="layui-input-block">
+    <input type="text" name="home_rate"   lay-verify="" placeholder="请输入客队让球数" autocomplete="off" class="layui-input"  value="{{ isset($home_rate)?$home_rate:'' }}" >
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">主队让球数</label>
+    <div class="layui-input-block">
+    <input type="text" name="guest_rate"   lay-verify="" placeholder="请输入主队让球数" autocomplete="off" class="layui-input"  value="{{ isset($guest_rate)?$guest_rate:'' }}" >
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <label class="layui-form-label">比赛状态:</label>
+        <div class="layui-input-block">
+            <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>
+        </div>
+  </div>
+
+
+@if(S('ACTION')!='view')
+  <div class="layui-form-item">
+    <div class="layui-input-block">
+      <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>
+//Demo
+layui.use(['form'], function(){
+  var form = layui.form;
+
+  //监听提交
+  form.on('submit(submitForm)', function(data){
+    return true;
+  });
+});
+function cbFormSuccess(data){
+	layer.msg(data.msg);
+	setTimeout(function(){
+		parent.window.location.reload();
+	},2500);
+}
+</script>
+@endsection

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

@@ -0,0 +1,141 @@
+@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;
+        }
+    </style>
+
+    
+    <script type="text/html" id="agent_key_secret">
+      @{{#if(d.agent_key!=null){ }}
+        <span>@{{ d.agent_key}}</span>
+      @{{#} }}<br>
+      @{{#if(d.agent_secret!=null){ }}
+        <span>@{{ d.agent_secret}}</span>
+      @{{#} }}
+    </script>
+
+    <script type="text/html" id="status">
+        @if(checkRriv('/admin/wagent/index'))<input type="checkbox" name="status" id="uid" 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="">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('wagent.sousuo') }}</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>
+                        <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>
+                            <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('wagent.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('wagent.end_time') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="end_time"  value="{{$end_time}}" id="end_time" placeholder=" - " word-break: break-all; lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </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>
+                        <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/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif
+                        @if(checkRriv('/admin/wagent/deleteoutcome'))<a href="javascript:delWin('/admin/wagent/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+    <script type="text/javascript">
+        $(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(){
+      //执行重载
+      table.reload('{{ $dataId }}', {
+        page: {
+          curr: 1 //重新从第 1 页开始
+        }
+        ,where: {
+            account:$("#form_account").val(),
+            register_ip:$('#form_register_ip').val(),
+            last_ip:$('#form_last_ip').val(),
+            register_url:$('#form_register_url').val(),
+            last_url:$('#form_last_url').val(),
+            regist_startime:$('#form_regist_startime').val(),
+            regist_endtime:$('#form_regist_endtime').val(),
+            statuss:$('#form_statuss').val(),
+            cash_small:$('#form_cash_small').val(),
+            cash_big:$('#form_cash_big').val(),
+            sureblur:$('.layui-form-switch').text(),
+        }
+      });
+    }
+  };
+$('.lay-btn-diy').on('click', function(){
+    var type = $(this).data('type');
+    active[type] ? active[type].call(this) : '';
+  });*/
+
+  //重置表单
+  $('.reset').on('click',function(){
+      $('input').val('');
+      $('#form_statuss').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

resources/views/sports/sports_notelist.blade.php

@@ -70,6 +70,22 @@
             <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('sportsnotelist.notelist_type') }}</label>
+                        <div class="layui-input-inline" style="width: 100px">
+                            <select name="type"  id="form_type"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1"></option>
+                                @foreach(trans('status.notelist_type.type') as $k=>$v):
+                                @if($type==$k))
+                                <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                @else
+                                    <option value="{{$k}}">{{$v}}</option>
+                                @endif
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.account') }}</label>
                         <div class="layui-input-inline">
@@ -81,15 +97,6 @@
                         </div>
                     </div>
 
-                    <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('money.apply_startime') }}</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="apply_startime" id="form_apply_startime" placeholder=" - " lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query  value="">
-                        </div>
-                    </div>
-
-
-
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportsnotelist.date') }}</label>
                         <div class="layui-input-inline">
@@ -199,6 +206,7 @@
 
     function dataTableLoadFinished(res,curr,count){
     var str='';
+    console.log(res);
     if(document.getElementById("statistics")){
 
     }else{

resources/views/sports/sports_notelistdetail.blade.php

@@ -0,0 +1,203 @@
+@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;
+        }
+
+        .red{
+            color: red;
+        }
+        .blue{
+            color: #1E9FFF;
+        }
+        .green{
+            color: green;
+        }
+        .yellow{
+            color: #ffca10;
+        }
+
+        .red{
+            color: red;
+        }
+        .blue{
+            color: #1E9FFF;
+        }
+        .green{
+            color: green;
+        }
+        .yellow{
+            color: #ffca10;
+        }
+        .bottom-txt{
+            padding: 0.5em;
+            line-height: 2em;
+        }
+        table{
+            text-align: center;
+        }
+        th div{
+            margin:0 auto;
+            text-align: center;
+        }
+        td div{
+            margin:0 auto;
+            text-align: center;
+        }
+        tbody span{
+            color: red;
+        }
+    </style>
+
+    <script type="text/html" id="status">
+        @if(checkRriv('/admin/SportsSoccer/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="" method="get">
+                <div class="layui-form-item">
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" 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>
+                            <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">
+                        <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/SportsSoccer/add'))<a href="/admin/SportsSoccer/add" class="layui-btn layui-btn-sm ">添加</a>@endif--}}
+                        {{--@if(checkRriv('/admin/SoccerNoteList/orderstatus'))<a href="/admin/SoccerNoteList/orderstatus" class="layui-btn layui-btn-sm ">订单状态审核</a>@endif--}}
+                        @if(checkRriv('/admin/SoccerNoteList/delete'))<a href="javascript:delWin('/admin/SoccerNoteList/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>
+                    <div class="layui-inline"><a href="/admin/menu/add" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div> -->
+
+                </div>
+            </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(){
+    //执行重载
+    console.log($('#form_status').val());
+    table.reload('{{ $dataId }}', {
+    page: {
+    curr: 1 //重新从第 1 页开始
+    }
+    ,where: {
+    account_name:$("#form_account_name").val(),
+    order_id:$('#form_order_id').val(),
+    bank_user:$('#form_bank_user').val(),
+    money_small:$('#form_money_small').val(),
+    money_big:$('#form_money_big').val(),
+    status:$('#form_status').val(),
+    apply_startime:$('#form_apply_startime').val(),
+    apply_endtime:$('#form_apply_endtime').val(),
+    haddle_startime:$('#form_haddle_startime').val(),
+    haddle_endtime:$('#form_haddle_endtime').val(),
+    sureblur:$('.layui-form-switch').text(),
+    }
+    });
+    }
+    };*/
+    //$('.lay-btn-diy').on('click', function(){
+    //	var type = $(this).data('type');
+    //	active[type] ? active[type].call(this) : '';
+    //});
+
+    //重置表单
+    $('.reset').on('click',function(){
+    $('input').val('');
+    $('#form_status').val('3');
+    $('.layui-form-select input').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) : '';
+    });
+
+
+    {{--function dataTableLoadFinished(res,curr,count){--}}
+    {{--var str='';--}}
+    {{--if(document.getElementById("statistics")){--}}
+
+    {{--}else{--}}
+    {{--$('.layui-table-page').after('<div id="statistics"></div>');--}}
+    {{--}--}}
+    {{--$.ajax({--}}
+    {{--type: 'get',--}}
+    {{--url: '/admin/SoccerstringNoteList/moneycount',--}}
+    {{--data: {where:res.extras},--}}
+    {{--dataType: 'json',--}}
+    {{--//async: false,--}}
+    {{--success: function (data) {--}}
+    {{--var data=data.data;--}}
+    {{--for(var i in data){--}}
+    {{--data[i]=parseFloat(data[i]);--}}
+    {{--}--}}
+    {{--str+='<p class="bottom-txt">总投注金额：<span class="blue">'+data.all_money+'</span> , 总可赢金额：<span class="green">'+data.all_prize_money+'</span> , 已赢金额：<span class="green">'+data.alraedy_prize_money+'</span></p>'--}}
+    {{--str+='<p class="bottom-txt">总金额：<span class="blue">'+data.all_money+'</span> , 成功：<span class="green">'+data.success_money+'</span> , 手续费：<span class="red">'+data.service_money+'</span> , 处理中：<span class="yellow">'+data.handing+'</span></p>'--}}
+    {{--$('#statistics').html(str);--}}
+    {{--var height1=$('.layui-table-view').height();--}}
+    {{--var height2=$('#statistics').height();--}}
+
+    {{--$('.layui-table-view').css({height:(height1+height2)});--}}
+    {{--}--}}
+    {{--});--}}
+
+
+    {{--}--}}
+    @endpush
+
+    @include('vip.datatable')
+@endsection

resources/views/sports/sports_stringnotelist.blade.php

@@ -57,7 +57,10 @@
             text-align: center;
         }
         tbody span{
-            color: red;
+            color: #FF5722;
+        }
+        .resettlement{
+            background-color: #FF5722;
         }
     </style>
 
@@ -110,20 +113,13 @@
                         </div>
                     </div>
 
-                    <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportsnotelist.match_id') }}</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="match_id" id="match_id" eventType="event-query"  value="{{ $match_id }}" lay-verify="required" autocomplete="off" class="layui-input">
-                        </div>
-                    </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>
                         <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/SportsSoccer/add'))<a href="/admin/SportsSoccer/add" class="layui-btn layui-btn-sm ">添加</a>@endif--}}
-                        {{--@if(checkRriv('/admin/SoccerNoteList/orderstatus'))<a href="/admin/SoccerNoteList/orderstatus" class="layui-btn layui-btn-sm ">订单状态审核</a>@endif--}}
-                        @if(checkRriv('/admin/SoccerNoteList/delete'))<a href="javascript:delWin('/admin/SoccerNoteList/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
+                        {{--@if(checkRriv('/admin/SoccerstringNoteList/add'))<a href="/admin/SoccerstringNoteList/add" class="layui-btn layui-btn-sm ">添加</a>@endif--}}
+                        {{--@if(checkRriv('/admin/SoccerstringNoteList/orderstatus'))<a href="/admin/SoccerstringNoteList/orderstatus" class="layui-btn layui-btn-sm ">订单状态审核</a>@endif--}}
+                        @if(checkRriv('/admin/SoccerstringNoteList/delete'))<a href="javascript:delWin('/admin/SoccerstringNoteList/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>
@@ -215,7 +211,7 @@
     for(var i in data){
     data[i]=parseFloat(data[i]);
     }
-    str+='<p class="bottom-txt">总投注金额：<span class="blue">'+data.all_money+'</span> , 总可赢金额：<span class="green">'+data.all_prize_money+'</span> , 已赢金额：<span class="green">'+data.alraedy_prize_money+'</span></p>'
+    str+='<p class="bottom-txt">总投注金额：<span class="blue">'+data.all_money+'</span> , 总可赢金额：<span class="green">'+data.all_prize_money+'</span></p>'
     {{--str+='<p class="bottom-txt">总金额：<span class="blue">'+data.all_money+'</span> , 成功：<span class="green">'+data.success_money+'</span> , 手续费：<span class="red">'+data.service_money+'</span> , 处理中：<span class="yellow">'+data.handing+'</span></p>'--}}
     $('#statistics').html(str);
     var height1=$('.layui-table-view').height();