彭俊 6 年 前
コミット
811a24ccac

+ 5 - 5
app/Http/Controllers/Admin/BaseNoteListController.php

@@ -28,26 +28,26 @@ class BaseNoteListController extends Controller
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BaseNoteList/info');
         $dt->setLang('sportsnotelist');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 70));
-        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
         $dt->addColsFields('game', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('game_no', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_note', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         //$dt->addColsFields('prize', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         //$arr[] = 'view';
         if (checkRriv('/admin/BaseNoteList/edit')) {
             $arr[] = 'edit';
         }
-        $dt->setToolBar($arr, array('width' => 80));
+        $dt->setToolBar($arr, array('width' => 70));
         $dt->enableCheckBox();
         return view('sports/sports_notelist', $dt->render($request));
     }

+ 5 - 5
app/Http/Controllers/Admin/BasketNoteListController.php

@@ -28,26 +28,26 @@ class BasketNoteListController extends Controller
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/BasketNoteList/info');
         $dt->setLang('sportsnotelist');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 70));
-        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
         $dt->addColsFields('game', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('game_no', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_note', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         //$dt->addColsFields('prize', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         //$arr[] = 'view';
         if (checkRriv('/admin/BasketNoteList/edit')) {
             $arr[] = 'edit';
         }
-        $dt->setToolBar($arr, array('width' => 80));
+        $dt->setToolBar($arr, array('width' => 70));
         $dt->enableCheckBox();
         return view('sports/sports_notelist', $dt->render($request));
     }

+ 55 - 23
app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -23,60 +23,78 @@ class SoccerNoteListController extends Controller
     {
         $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['account'] = isset($req->account) ? trim($req->account) :null ;
         $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+        $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/SoccerNoteList/info');
         $dt->setLang('sportsnotelist');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 70));
-        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
-        $dt->addColsFields('game', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('game_no', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('prize_note', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('match_id_order', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
+        $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 150));
+        $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('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
         $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        //$dt->addColsFields('prize', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-        $dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        //$dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $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));
         $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         //$arr[] = 'view';
-        if (checkRriv('/admin/SoccerNoteList/edit')) {
-            $arr[] = 'edit';
-        }
-        $dt->setToolBar($arr, array('width' => 80));
+//        if (checkRriv('/admin/SoccerNoteList/edit')) {
+//            $arr[] = 'edit';
+//        }
+//        $dt->setToolBar($arr, array('width' => 70));
         $dt->enableCheckBox();
         return view('sports/sports_notelist', $dt->render($request));
     }
 
     function info()
     {
-        $type = 'zq';
+        $type = '1';//单式注单
         $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' : '';
-//        $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
+        $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 . '%');
+            } else {
+                $where[] = array('st_zq_bet.account_name', '=', $account);
+            }
+        }
         if (!empty($star_time)) {
             if (!empty($end_time)){
-                $where[] = array('money_buy.money_time', '>', $star_time);
-                $where[] = array('money_buy.money_time', '<', $end_time);
+                $where[] = array('st_zq_bet.money_time', '>', $star_time);
+                $where[] = array('st_zq_bet.money_time', '<', $end_time);
             }else{
-                $where[] = array('money_buy.money_time', '>', $star_time);
+                $where[] = array('st_zq_bet.money_time', '>', $star_time);
             }
         }else if(empty($star_time)){
             if (!empty($end_time)){
 
-                $where[] = array('money_buy.money_time', '<', $end_time);
+                $where[] = array('st_zq_bet.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);
+        }
         $newapp = new \App\Models\SportsNoteList();
         $data = $newapp->getinfo($list, $page, $where,$type);
-        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
+
+        return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
 
     /**
@@ -181,4 +199,18 @@ class SoccerNoteListController extends Controller
         return responseToJson(1, trans('menu.delete_success')); //id����
 
     }
+
+    /**
+     * 投注金额统计
+     */
+    function moneycount()
+    {
+        $type = '1';//单式注单
+        $where = Request::has('where') ? Request::get('where') : '';
+        $db = new \App\Models\SportsNoteList;
+
+        $data = $db->MoneyCount($where,$type);
+        return responseToJson($data);
+    }
+
 }

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

@@ -0,0 +1,215 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jonlin
+ * Date: 2019/4/9
+ * Time: 9:11
+ */
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request as Req;
+use Illuminate\Support\Facades\DB;
+use App\Models;
+use Request;
+
+/**
+ *
+ */
+class SoccerStringNoteListController extends Controller
+{
+
+    public function notelist(Req $req)
+    {
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : null;
+        $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['account'] = isset($req->account) ? trim($req->account) :null ;
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+        $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('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
+        //$dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $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));
+        $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        //$arr[] = 'view';
+//        if (checkRriv('/admin/SoccerNoteList/edit')) {
+//            $arr[] = 'edit';
+//        }
+//        $dt->setToolBar($arr, array('width' => 70));
+        $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 . '%');
+            } else {
+                $where[] = array('st_zq_bet.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);
+            }else{
+                $where[] = array('st_zq_bet.money_time', '>', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('st_zq_bet.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);
+        }
+        $newapp = new \App\Models\SportsNoteList();
+        $data = $newapp->getinfo($list, $page, $where,$type);
+
+        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);
+        }
+
+    }
+
+    /**
+     *订单审核
+     */
+    public function orderstatus(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+
+
+    /**
+     *删除订单
+     */
+    public function delete(Req $req) {
+        $id = $req->input('id');
+        if (empty($id)) {
+            return responseToJson(-2001); //id������
+        }
+        $ids = explode(',', $id);
+        if (!is_array($ids) && intval($ids) < 0) {
+            return responseToJson(-2002); //id����
+        }
+        if (is_array($ids) && count($ids) > 0) {
+            foreach ($ids as $k => $v) {
+                if (intval($v) < 1) {
+                    unset($ids[$k]);
+                }
+            }
+        }
+
+        $rows = \App\Models\SportsNoteList::whereIn('id', $ids)->delete();
+        if (!$rows) {
+            return responseToJson(-2003); //id����
+        }
+        return responseToJson(1, trans('menu.delete_success')); //id����
+
+    }
+
+    /**
+     * 投注金额统计
+     */
+    function moneycount()
+    {
+        $type = '2';//串关注单
+        $where = Request::has('where') ? Request::get('where') : '';
+        $db = new \App\Models\SportsNoteList;
+
+        $data = $db->MoneyCount($where,$type);
+        return responseToJson($data);
+    }
+
+}

+ 26 - 16
app/Http/Controllers/Admin/SportsfootController.php

@@ -30,20 +30,13 @@ class SportsfootController extends Controller {
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/sportsfoot/outcomeinfo');
         $dt->setLang('sportsfoot');
-        $dt->addColsFields('saisname', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('newtime', array('templet' => '#newtime', 'sort' => false, 'width' => 200));
+        $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' => 80));
-		$dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-		$dt->addColsFields('shome_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-		$dt->addColsFields('first_score', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
-		$dt->addColsFields('last_score', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
-		$dt->addColsFields('match_score', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-		$dt->addColsFields('match_winer', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-		$dt->addColsFields('update_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-		$dt->addColsFields('match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-		$dt->addColsFields('u_home_score', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-		$dt->addColsFields('u_guest_score', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
-		$dt->addColsFields('status', 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('sxalfcourt', array('templet' => '#sxalfcourt', 'sort' => false, 'width' => 300));
         // $dt->addColsFields('status', array('templet' => '#status', 'sort' => false, 'width' => 150,'align' => 'left'));
         // $arr[] = 'view';
 		if (checkRriv('/admin/sportsfoot/edit')) {
@@ -197,9 +190,26 @@ class SportsfootController extends Controller {
 		return responseToJson(1); 
 	}
 
-	//
-	function notelist(){
-		return view('admin.sportsfoot/notelist');
+	//更新赛事比分
+	function updatenum(){
+		$type = $_POST['type'];
+		$id = $_POST['id'];
+		$num = $_POST['num'];
+		$newapp = new \App\Models\Stzqresult();
+		if($type==1){
+			$data['u_home_score'] = $num;
+			$res = $newapp->updateInfo($data,$id);//联赛id
+		}else if($type==2){
+			$data['u_guest_score'] = $num;
+			$res = $newapp->updateInfo($data,$id);//联赛id
+		}else if($type==3){
+			$data['home_score'] = $num;
+			$res = $newapp->updateInfo($data,$id);//联赛id
+		}else{
+			$data['guest_score'] = $num;
+			$res = $newapp->updateInfo($data,$id);//联赛id
+		}
+		return responseToJson($res);
 	}
 	
 	

+ 5 - 5
app/Http/Controllers/Admin/TennisNoteListController.php

@@ -28,26 +28,26 @@ class TennisNoteListController extends Controller
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/TennisNoteList/info');
         $dt->setLang('sportsnotelist');
-        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 70));
-        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 160));
+        $dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
+        $dt->addColsFields('order_time', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
         $dt->addColsFields('game', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('game_no', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_note', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 160));
+        $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
         $dt->addColsFields('water_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         //$dt->addColsFields('prize', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('settle_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('game_status', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
-        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('account_name', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('member_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         //$arr[] = 'view';
         if (checkRriv('/admin/TennisNoteList/edit')) {
             $arr[] = 'edit';
         }
-        $dt->setToolBar($arr, array('width' => 80));
+        $dt->setToolBar($arr, array('width' => 70));
         $dt->enableCheckBox();
         return view('sports/sports_notelist', $dt->render($request));
     }

+ 53 - 18
app/Models/SportsNoteList.php

@@ -8,18 +8,26 @@
 namespace App\Models;
 use Illuminate\Support\Facades\DB;
 class SportsNoteList extends BaseModel {
-    protected $table = "money_buy";
+    protected $table = "st_zq_bet";
     public $timestamps = false;
 
     function getinfo($list = 10, $page, $where = '',$type)
     {
         if (is_array ($where) && count ($where) > 0) {
-            $data = $this->where($where)
-                ->where('money_buy.game_name', $type)
+            $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($where)
+                ->where('st_zq_bet.game_name', 'zq')
+                ->where('st_zq_bet.type', $type)
                 ->orderby('money_time','desc')
                 ->paginate ($list);
         } else {
-            $data = $this->where('money_buy.game_name', $type)
+            $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')
                 ->paginate ($list);
         }
@@ -47,7 +55,7 @@ class SportsNoteList extends BaseModel {
             if($data[$i]->game_status==0){
                 $data[$i]->game_status = '待开奖';
             }else if($data[$i]->game_status==1){
-                $data[$i]->game_status = '奖';
+                $data[$i]->game_status = '奖';
             }else if($data[$i]->game_status==2){
                 $data[$i]->game_status = '未中奖';
             }
@@ -56,25 +64,37 @@ class SportsNoteList extends BaseModel {
             }else if($data[$i]->member_type==2){
                 $data[$i]->member_type = '超级会员';
             }
+            $data[$i]->match_id_order = '<span>'.$data[$i]->match_id.'</span><br>'.$data[$i]->order_id;
+
+            $data[$i]->home_guest = $data[$i]->home_team.' VS '.$data[$i]->guest_team;
+            $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();
+            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]->account = $data[$i]->available_cash.'<br><span>'.$data[$i]->account_name.'</span><br>'.$data[$i]->frozen_cash;
+
 
-            $data[$i]->order_time = $data[$i]->order_id.'<br>'.$data[$i]->money_time;
 
             $codes = json_decode($data[$i]->codes, true);
             $data[$i]->content = '';
             for($j=0;$j<count($codes);$j++){
-                $odds_only = $codes[$j]['odds_only'];
-                $res = DB::table('st_'.$type.'_odds_record')->where('odds_only',$odds_only)->first();
-                if(!empty($res)){
-                    $result = DB::table('st_odds_code')->where('odds_code',$res->odds_code)->first();
-                    if(!empty($result)){
-                        $odds_name = $result->odds_name;
-                    }else{
-                        $odds_name = $res->odds_code;
-                    }
-                    $game = DB::table('st_game_type')->where('game_code',$data[$i]->game_name)->first();
-                    $data[$i]->content = $data[$i]->content.$odds_name.  '¥'.$codes[$j]['bet_amount'].'<br>';
-                    $data[$i]->game = $game->game_name;
+                $odds_code = $codes[$j]['odds_code'];
+                $result = DB::table('st_odds_code')->where('odds_code',$odds_code)->first();
+                if(!empty($result)){
+                    $odds_name = $result->odds_name;
+                }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;
 
             }
 
@@ -83,5 +103,20 @@ class SportsNoteList extends BaseModel {
 
     }
 
+    //投注金额汇总统计
+    function MoneyCount($where = '',$type) {
+        $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');
+        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');
+        }
+
+        return $data;
+    }
+
 
 }

+ 39 - 5
app/Models/Stzqresult.php

@@ -8,12 +8,36 @@ class Stzqresult extends BaseModel
 	public $timestamps = false;
 
 
-	function resultlist($list = 10, $page, $where = '',$orwhere = '')
+	// 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 = '')
     {
         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);
+            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_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 { 
+            $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_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')->paginate ($list);
         }
 
         for($i=0;$i<count($data);$i++){
@@ -30,7 +54,7 @@ class Stzqresult extends BaseModel
 
         return $data->toArray ();
 
-	}
+    }
 
     //地区联赛赛事查询
     function alldiqu(){
@@ -38,6 +62,16 @@ class Stzqresult extends BaseModel
         return $data->toArray ();   
     }
 
+    //更新
+    function updateInfo($data, $id)
+    {
+        $res = $this->where ('id', $id)->update ($data);
+        if (!$res) {
+            return -7010101202; //更新失败
+        }
+        return 1;
+    }
+
     
 
 

+ 7 - 2
resources/lang/zh-cn/sportsfoot.php

@@ -3,8 +3,8 @@ return array(
     'sousuo' => '搜 索',
     'lg_id' => '联赛',
 	'saisname' => '联赛名称',
-    'home_team' => '主队名称',
-    'guest_team' => '客队名称',
+    'home_team' => '主队队伍',
+    'guest_team' => '客队队伍',
     'home_rate' => '主队让球',
     'guest_rate'=>'客队让球',
     'home_score' => '主队进球数',
@@ -32,6 +32,11 @@ return array(
 	'end_time' => '时间止',
 	'lgselect' => '联赛查询',
 	'qxlgselect' => '请选择联赛',
+	'newtime' => '日期/联赛',
+	'totime' => '时间',
+	'dsnum' => '单式注单数',
+	'csnum' => '串式注单数',
+	'sxalfcourt' => '上半场/全场比分',
 	
 	'name_chinese' => '中文名称',
     'name_english' => '英文全称',

+ 14 - 3
resources/lang/zh-cn/sportsnotelist.php

@@ -2,24 +2,35 @@
 return array(
 
     'id' => '序号',
+    'match_id' => '赛事id',
+    'order_id' => '订单号',
     'account_name' => '投注用户',
     'order_time' => '订单号/下注时间',
+    'match_id_order' => '赛事id/订单号',
     'game' => '游戏名称',
+    'league' => '联赛名',
+    'money_match_time' => '投注/开赛时间',
+    'home_guest' => '主队 VS 客队',
     'game_no' => '游戏期号',
     'prize_note' => '中奖注数',
     'money' => '投注金额',
-    'prize_money' => '中奖金额',
+    'prize_money' => '可赢金额',
     'status' => '状态',
-    'content' => '投注内容',
+    'content' => '投注详细信息',
     'water_status' => '回水',
     'money_time' => '下注时间',
     'prize' => '开奖号码',
     'settle_status' => '结算',
-    'game_status' => '开奖',
+    'game_status' => '状态',
     'member_type' => '会员类型',
     'edit' => '修改',
 
+    'model' => '模式',
+    'detail_content' => '结算详细信息',
 
+
+    'account' => '会员',
+    'date' => '日期',
     'star_time' => '开始时间',
     'end_time' => '结束时间',
 

+ 7 - 0
resources/lang/zh-cn/status.php

@@ -356,5 +356,12 @@ return array(
 			'2' => '禁用',
 		),
 	),
+	'xgstatus' => array(
+		'status' => array(
+			'0' => '结算全场',
+			'1' => '结算上半场',
+			'2' => '重新结算上半场',
+		),
+	),
 	
 );

+ 2 - 2
resources/views/admin/Take/index.blade.php

@@ -54,7 +54,7 @@
 
 	<script type="text/html" id="usertake">
 	   <a href="/admin/Take/index?account_name=@{{d.account_name}}">@{{ d.account_name}}</a><br>
-       
+
 	</script>
     <script type="text/html" id="pass">
         @{{#if(d.status=='待审核'){ }}
@@ -256,7 +256,7 @@
         /*$('.reset').on('click',function(){
 			$('input').val('');
 			$('#form_status').val('3');
-			$('.layui-form-select input').val('待审核');			
+			$('.layui-form-select input').val('待审核');
 			//var type = $(this).data('type');
 			//active[type] ? active[type].call(this) : '';
         });

+ 0 - 1
resources/views/admin/sportsbk/noteList.blade.php

@@ -1 +0,0 @@
-55

+ 112 - 7
resources/views/admin/sportsfoot/outcome.blade.php

@@ -22,8 +22,35 @@
         }
     </style>
 
+    <script type="text/html" id="newtime">
+      @{{#if(d.match_id!=null){ }}
+        <span>@{{ d.match_id}}</span>
+      @{{#} }}<br>
+      @{{#if(d.saisname!=null){ }}
+        <span>@{{ d.saisname}}</span>
+      @{{#} }}
+    </script>
+
+    <script type="text/html" id="totime">
+      @{{#if(d.match_time!=null){ }}
+        <span>@{{ d.match_time}}</span>
+      @{{#} }}
+    </script>
+
+    <script type="text/html" id="sxalfcourt">
+      @{{#if(d.match_time!=null){ }}
+        <!-- <span>@{{ d.match_time}}</span> -->
+        <input type="text" style="width:30px;heigth:20px" id="u_home_score" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value)"> 
+        <input type="text" style="width:30px;heigth:20px" id="u_guest_score" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="inputTunc(@{{d.id}}, event.target.value)"> / 
+        <input type="text" style="width:30px;heigth:20px" id="home_score" name="home_score" value="@{{d.home_score}}" onchange="inputSunc(@{{d.id}}, event.target.value)">
+        <input type="text" style="width:30px;heigth:20px" id="guest_score" name="guest_score" value="@{{d.guest_score}}" onchange="inputAunc(@{{d.id}}, event.target.value)">
+
+      @{{#} }}
+    </script>
+
+
     <script type="text/html" id="status">
-        @if(checkRriv('/admin/sportsfoot/index'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="进行中|已结束" lay-filter="openStatus" @{{ d.status == '1' ? 'checked' : '' }}>@endif
+        @if(checkRriv('/admin/sportsfoot/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">
@@ -73,17 +100,18 @@
                     </div>
 
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{trans('sportsfoot.lgselect')}}</label>
+                        <label class="layui-form-label">相关操作:</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name="name_chinese"  id="name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="">{{trans('sportsfoot.qxlgselect')}}</option>
-                                @foreach($league as $k=>$v):
-                                    @if($name_chinese==$v['name_chinese'])
+                                <option value="">选择确认</option>
+                                @foreach(trans('status.xgstatus.status') as $k=>$v):
+                                    @if($status==$k)
                                     <option value="{{$v['name_chinese']}}" selected>{{$v['name_chinese']}}</option>
                                     @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
+                                    <option value="{{$k}}">{{$v}}</option>
                                     @endif
                                 @endforeach
+                                <option value="">设为无效</option>
                             </select>
                         </div>
                     </div>
@@ -114,7 +142,7 @@
             </form>
         </div>
     </div>
-	<script>
+    <script type="text/javascript">
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
                 var span = $(this).prev();
@@ -130,6 +158,83 @@
             	}
             })
         })
+
+        //上半场主队
+        function inputFunc(id,num){
+            var id = id;
+            var num = num;
+            var reg = /^[0-99]\d*$/;
+            var home_score = $("#home_score").val();
+            if(reg.test(num)==false){ 
+                return;
+            }else if(home_score<num){
+                return;
+            }
+
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsfoot/updatenum',
+                data: {id:id,num:num,type:1},
+                success: function(data) {
+                }
+            })
+        }
+        //上半场客队
+        function inputTunc(id,num){
+           var id = id;
+            var num = num;
+            var reg = /^[0-99]\d*$/;
+            var guest_score = $("#guest_score").val();
+            if(reg.test(num)==false){ 
+                return;
+            }else if(guest_score<num){
+                return;
+            }
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsfoot/updatenum',
+                data: {id:id,num:num,type:2},
+                success: function(data) {
+                }
+            })
+        }
+        //全场主队
+        function inputSunc(id,num){
+            var id = id;
+            var num = num;
+            var u_home_score = $("#u_home_score").val();
+            if(u_home_score>num){ 
+                return;
+            }
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsfoot/updatenum',
+                data: {id:id,num:num,type:3},
+                success: function(data) {
+                }
+            })
+        }
+        //全场客队
+        function inputAunc(id,num){
+            var id = id;
+            var num = num;
+            var u_guest_score = $("#u_guest_score").val();
+            if(u_guest_score>num){ 
+                return;
+            }
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsfoot/updatenum',
+                data: {id:id,num:num,type:4},
+                success: function(data) {
+                }
+            })
+        }
+        
 	</script>
 @push('dataTableJS')
 /*var active = {

+ 45 - 45
resources/views/admin/welcome.blade.php

@@ -372,23 +372,23 @@
     });@endif
 
     // 异步加载数据
-    @if(checkRriv('/admin/game/allTotalBetmoney'))$.get('/admin/game/allTotalBetmoney').done(function (data) {
-        var data = data.data;
-		//console.log('allTotalBetmoney');
-		//console.log(data);
-        // 填入数据
-        chart3.setOption({
-            title: {
-                text: '今日注单金额'
-            },
-            legend: {
-                data: data.title
-            },
-            series:{
-                data:data.data
-            }
-        });
-    });
+  //   @if(checkRriv('/admin/game/allTotalBetmoney'))$.get('/admin/game/allTotalBetmoney').done(function (data) {
+  //       var data = data.data;
+		// //console.log('allTotalBetmoney');
+		// //console.log(data);
+  //       // 填入数据
+  //       chart3.setOption({
+  //           title: {
+  //               text: '今日注单金额'
+  //           },
+  //           legend: {
+  //               data: data.title
+  //           },
+  //           series:{
+  //               data:data.data
+  //           }
+  //       });
+  //   });
     // 异步加载数据
     $.get('/admin/index/TodayGameNote').done(function (data) {
         var data = data.data;
@@ -463,34 +463,34 @@
         });
     });@endif
 
-    @if(checkRriv('/admin/game/sevendayBetmoney'))$.get('/admin/game/sevendayBetmoney').done(function (data) {
-        var data = data.data;
-        var legend = data.lenged;
-        var arr = [],tit=[];
-        for (var i in legend) {
-            var no = legend[i];
-            var obj = {};
-            obj.name = legend[i];
-            obj.type = 'line';
-            obj.data = data.data[i];
-            arr.push(obj);
-            tit.push(no);
-        }
-
-        // 填入数据
-        chart7.setOption({
-            title: {
-                text: '最近7天投注总额趋势图'
-            },
-            legend: {
-                data: tit
-            },
-            xAxis: {
-                data: data.title
-            },
-            series: arr
-        });
-    });@endif
+    // @if(checkRriv('/admin/game/sevendayBetmoney'))$.get('/admin/game/sevendayBetmoney').done(function (data) {
+    //     var data = data.data;
+    //     var legend = data.lenged;
+    //     var arr = [],tit=[];
+    //     for (var i in legend) {
+    //         var no = legend[i];
+    //         var obj = {};
+    //         obj.name = legend[i];
+    //         obj.type = 'line';
+    //         obj.data = data.data[i];
+    //         arr.push(obj);
+    //         tit.push(no);
+    //     }
+
+    //     // 填入数据
+    //     chart7.setOption({
+    //         title: {
+    //             text: '最近7天投注总额趋势图'
+    //         },
+    //         legend: {
+    //             data: tit
+    //         },
+    //         xAxis: {
+    //             data: data.title
+    //         },
+    //         series: arr
+    //     });
+    // });@endif
 
 
 </script>

+ 137 - 72
resources/views/sports/sports_notelist.blade.php

@@ -1,6 +1,6 @@
 @extends('vip.layouts')
 @section('seo_title')
-    足球注单管理
+    足球单式注单管理
 @endsection
 @section('content')
     <style>
@@ -20,12 +20,45 @@
         .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{
             text-align: center;
         }
+        tbody span{
+            color: red;
+        }
     </style>
 
     <script type="text/html" id="status">
@@ -36,30 +69,54 @@
         <div class="layui-col-xs12">
             <form class="layui-form rewrite" eventType="eventForm"  action="" method="get">
                 <div class="layui-form-item">
-                    {{--<div class="layui-inline">--}}
-                        {{--<label class="layui-form-label">{{ trans('sportssoccer.search') }}</label>--}}
-                        {{--<div class="layui-input-inline">--}}
-                            {{--<input type="text" name="name_chinese" id="name_chinese" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">--}}
-                        {{--</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('sportsnotelist.star_time') }}</label>
+                        <label class="layui-form-label">{{ trans('sportsnotelist.account') }}</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>
+                            <input type="text" name="account" id="account" eventType="event-query"  value="{{ $account }}" 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('sportsnotelist.end_time') }}</label>
+                        <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">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>~
+                    <div class="layui-inline">
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
                         <div class="layui-input-inline">
                             <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
 
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.order_id') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="order_id" id="order_id" eventType="event-query"  value="{{ $order_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </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>
@@ -95,73 +152,81 @@
         })
     </script>
     @push('dataTableJS')
-    //var active = {
-    //    reload: function(){
-    //      //执行重载
-    //      table.reload('{{ $dataId }}', {
-    //        page: {
-    //          curr: 1 //重新从第 1 页开始
-    //        }
-    //        ,where: {
-    //            infoname:$('#infoname').val(),
-    //        }
-    //      });
-    //    }
-    //  };
-
-    //启用|禁用用户
-    form.on('switch(openStatus)', function(obj){
-    var status = 0;
-    if(obj.elem.checked==true){
-    status = 1;
-    }
-    setcolumn('/admin/BankSet/UserStart',this.name,status,this.value,obj);
-    console.log(this.name);
-    console.log(status);
-    console.log(this.value);
-    console.log(obj);
-    //layer.tips(msg, obj.othis);
-    });
-
-    function setcolumn(url,column,value,id,obj){
-    $.ajax({
-    url: url+'?'+column+'='+value+'&id='+id,
-    dataType: 'json',
-    type: 'get',
-    success:function(data){
-    layer.msg(data.msg);
-    if(data.status!=1){
-    if(value==1){
-    obj.othis[0].setAttribute("class", "layui-unselect layui-form-switch");
-    obj.othis[0].innerHTML='<em>开启</em><i></i>';
-    }else{
-    obj.othis[0].setAttribute("class",'layui-unselect layui-form-switch layui-form-onswitch');
-    obj.othis[0].innerHTML='<em>禁用</em><i></i>';
-    }
-    }
-    }
-    });
-    }
-
+        /*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) : '';
-    //  });
+    //	var type = $(this).data('type');
+    //	active[type] ? active[type].call(this) : '';
+    //});
 
     //重置表单
     $('.reset').on('click',function(){
     $('input').val('');
-    $('#infoname').val('');
-    //	  var type = $(this).data('type');
-    //	  active[type] ? active[type].call(this) : '';
+    $('#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) : '';
-    //    });
+    $('.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/SoccerNoteList/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')

+ 233 - 0
resources/views/sports/sports_stringnotelist.blade.php

@@ -0,0 +1,233 @@
+@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{
+            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.account') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="account" id="account" eventType="event-query"  value="{{ $account }}" 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('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">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>~
+                    <div class="layui-inline">
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
+                        <div class="layui-input-inline">
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                        </div>
+                    </div>
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">{{ trans('sportsnotelist.order_id') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="order_id" id="order_id" eventType="event-query"  value="{{ $order_id }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </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
+                    </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

+ 16 - 16
resources/views/vip/index.blade.php

@@ -266,8 +266,8 @@
             dataType: 'json',
             success: function (json) {
                 var val = json.data;
-                if (liarr['/admin/rgame/egamerecord?type=3'] != 'undefined')
-                    setNotifyNum(liarr['/admin/rgame/egamerecord?type=3'], val.back);
+                // if (liarr['/admin/rgame/egamerecord?type=3'] != 'undefined')
+                //     setNotifyNum(liarr['/admin/rgame/egamerecord?type=3'], val.back);
                 if (liarr['/admin/remittance/index?status=0'] != 'undefined')
                     setNotifyNum(liarr['/admin/remittance/index?status=0'], val.rimit);
                 if (liarr['/admin/take/index'] != 'undefined')
@@ -303,20 +303,20 @@
         updateNum();
     }, 5000);
 
-    function updatem() {
-        $.ajax({
-            type: 'get',
-            url: '/admin/Allowip/getC',
-            data: {},
-            async: false,
-            dataType: 'json',
-            success: function (json) {
-                var val = json.data;
-                if (liarr['/admin/RgameCash/kygameInfo'] != 'undefined')
-                    setNotifyNum(liarr['/admin/RgameCash/kygameInfo'], val.agent_money);
-            }
-        });
-    }
+    // function updatem() {
+    //     $.ajax({
+    //         type: 'get',
+    //         url: '/admin/Allowip/getC',
+    //         data: {},
+    //         async: false,
+    //         dataType: 'json',
+    //         success: function (json) {
+    //             var val = json.data;
+    //             if (liarr['/admin/RgameCash/kygameInfo'] != 'undefined')
+    //                 setNotifyNum(liarr['/admin/RgameCash/kygameInfo'], val.agent_money);
+    //         }
+    //     });
+    // }
 
     setInterval(function () {
         updatem();