瀏覽代碼

异常处理

彭俊 6 年之前
父節點
當前提交
47d92c02bb

+ 74 - 68
app/Http/Controllers/Admin/AdminlogController.php

@@ -9,77 +9,83 @@ use Request;
 /**
  *
  */
-class AdminlogController extends Controller {
-	/**
-	 * @return 管理员日志管理
-	 */
-	function index(Req $req) {
-		$request=array();
-		$request['loginname'] = isset($req->loginname) ? trim($req->loginname) : null;
-		$request['ip'] = isset($req->ip) ? trim($req->ip) : null;
-		$request['operation'] = isset($req->operation) ? trim($req->operation) : null;
-        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.seven_day') ;
+class AdminlogController extends Controller
+{
+    /**
+     * @return 管理员日志管理
+     */
+    function index(Req $req)
+    {
+        $request = array();
+        $request['loginname'] = isset($req->loginname) ? trim($req->loginname) : null;
+        $request['sureblur'] = isset($req->sureblur) ? 0 : '2';
+        $request['ip'] = isset($req->ip) ? trim($req->ip) : null;
+        $request['operation'] = isset($req->operation) ? trim($req->operation) : null;
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) : trans('status.default_time.seven_day');
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
-		$dt = \App\Lib\DataTable\DataTable::init();
-		$dt->setDataSource('/admin/manager/systemLog');
-		$dt->setLang('system_user');
-		$dt->addColsFields('loginname', array('width' => 160));
-		$dt->addColsFields('ip', array('templet' => '#selectip', 'width' => 220));
-		$dt->addColsFields('operation_time', array('width' => 260));
-		$dt->addColsFields('operation', array('templet' => '#desc','width' => 710));
-		$dt->setToolBar();
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/manager/systemLog');
+        $dt->setLang('system_user');
+        $dt->addColsFields('loginname', array('width' => 160));
+        $dt->addColsFields('ip', array('templet' => '#selectip', 'width' => 220));
+        $dt->addColsFields('operation_time', array('width' => 260));
+        $dt->addColsFields('operation', array('templet' => '#desc', 'width' => 710));
+        $dt->setToolBar();
 
-		return view('admin.SystemManage/LogList', $dt->render($request));
-	}
+        return view('admin.SystemManage/LogList', $dt->render($request));
+    }
 
-	/**
-	 * 登录ip列表
-	 * [detail description]
-	 * @return [type] [description]
-	 */
-	function logipDetail() {
-		$ip = Request::has('ip') ? Request::get('ip') : '';
-		$dt = \App\Lib\DataTable\DataTable::init();
-		$dt->setDataSource('/admin/manager/systemLog?ip=' . $ip);
-		$dt->setLang('system_user');
-		$dt->addColsFields('loginname', array('sort' => false, 'width' => 130));
-		$dt->addColsFields('ip', array('width' => 160));
-		$dt->addColsFields('operation_time', array('width' => 170));
-		$dt->addColsFields('operation', array('width' => 637));
-		return view('admin.SystemManage/Viewip', $dt->render());
-	}
-	//修改管理员密码
-	function ChangePwd(Req $req) {
-		$admin_id = session('adminInfo.admin_id');
-		if (!$req->isMethod('post')) {
-			return view('admin.login.edit', ['name' => session('adminInfo.admin_name')]);
-		} else {
-			$db = new \App\Models\System_user;
-			$pwd = $req->password;
-			$repwd = $req->repassword;
-			$data = array();
-			if (!empty($pwd)) {
-				if ($pwd != $repwd) {
-					return responseToJson(-7051010522); //两次密码不一致
-				}
-				$pwddata = GenPassword($pwd);
-				$data['password'] = $pwddata['password'];
-				$data['encryption'] = $pwddata['encryption'];
-			}
-			$twopwd = $req->password_2;
-			$retwopwd = $req->repassword_2;
-			if (!empty($twopwd)) {
-				if ($twopwd != $retwopwd) {
-					return responseToJson(-7051010622); //两次密码不一致
-				}
-				$twopwddata = GenPassword($twopwd);
-				$data['password_2'] = $twopwddata['password'];
-				$data['encryption_2'] = $twopwddata['encryption'];
-			}
-			$res = $db->updateInfo($data, $admin_id);
-			return responseToJson($res);
-		}
-	}
+    /**
+     * 登录ip列表
+     * [detail description]
+     * @return [type] [description]
+     */
+    function logipDetail()
+    {
+        $ip = Request::has('ip') ? Request::get('ip') : '';
+        $dt = \App\Lib\DataTable\DataTable::init();
+        $dt->setDataSource('/admin/manager/systemLog?ip=' . $ip);
+        $dt->setLang('system_user');
+        $dt->addColsFields('loginname', array('sort' => false, 'width' => 130));
+        $dt->addColsFields('ip', array('width' => 160));
+        $dt->addColsFields('operation_time', array('width' => 170));
+        $dt->addColsFields('operation', array('width' => 637));
+        return view('admin.SystemManage/Viewip', $dt->render());
+    }
+
+    //修改管理员密码
+    function ChangePwd(Req $req)
+    {
+        $admin_id = session('adminInfo.admin_id');
+        if (!$req->isMethod('post')) {
+            return view('admin.login.edit', ['name' => session('adminInfo.admin_name')]);
+        } else {
+            $db = new \App\Models\System_user;
+            $pwd = $req->password;
+            $repwd = $req->repassword;
+            $data = array();
+            if (!empty($pwd)) {
+                if ($pwd != $repwd) {
+                    return responseToJson(-7051010522); //两次密码不一致
+                }
+                $pwddata = GenPassword($pwd);
+                $data['password'] = $pwddata['password'];
+                $data['encryption'] = $pwddata['encryption'];
+            }
+            $twopwd = $req->password_2;
+            $retwopwd = $req->repassword_2;
+            if (!empty($twopwd)) {
+                if ($twopwd != $retwopwd) {
+                    return responseToJson(-7051010622); //两次密码不一致
+                }
+                $twopwddata = GenPassword($twopwd);
+                $data['password_2'] = $twopwddata['password'];
+                $data['encryption_2'] = $twopwddata['encryption'];
+            }
+            $res = $db->updateInfo($data, $admin_id);
+            return responseToJson($res);
+        }
+    }
 
 }
 

+ 46 - 32
app/Http/Controllers/Admin/ManagerController.php

@@ -9,11 +9,13 @@ use Request;
 /**
  *
  */
-class ManagerController extends Controller {
+class ManagerController extends Controller
+{
     /**
      * @return 信息管理
      */
-    function index() {
+    function index()
+    {
 
         return view('admin.demo/index');
     }
@@ -23,25 +25,26 @@ class ManagerController extends Controller {
      * [systemAdd description]
      * @return [type] [description]
      */
-    function systemAdd(Req $req) {
+    function systemAdd(Req $req)
+    {
         if (!$req->isMethod('post')) {
             return view('admin.Manager/systemAdd');
         } else {
             $model = new \App\Models\System_root();
-            $data=$model->select('id')->orderBy('id','desc')->first();
-            $id=!empty($data->id)?$data->id:0;
-            $model->id=$id+1;
+            $data = $model->select('id')->orderBy('id', 'desc')->first();
+            $id = !empty($data->id) ? $data->id : 0;
+            $model->id = $id + 1;
             $model->level = trim($req->input('level'));
 
             $model->name = trim($req->input('name'));
 
             $model->settingmoney = trim($req->input('settingmoney'));
-          
+
             $model->save();
-             $log = array(
+            $log = array(
                 session('adminInfo.admin_name'),
                 $model->level,
-                $model->name, 
+                $model->name,
                 $model->settingmoney
             );
             OperationLog(session('adminInfo.admin_id'), 'qxsystemAdd', $log);
@@ -51,7 +54,8 @@ class ManagerController extends Controller {
     }
 
     //管理员信息
-    function adminInfo() {
+    function adminInfo()
+    {
         $page = Request::has('page') ? Request::get('page') : 1;
         $limit = Request::has('limit') ? Request::get('limit') : 10;
         $field = Request::has('field') ? Request::get('field') : 5;
@@ -62,8 +66,8 @@ class ManagerController extends Controller {
             $loginname = Request::has('loginname') ? Request::get('loginname') : '';
             $name = Request::has('name') ? Request::get('name') : '';
             $status = Request::has('status') ? Request::get('status') : '';
-            $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' : '';
+            $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('sureblur') ? Request::get('sureblur') : 'off';
             $where = array();
             if (!empty($loginname)) {
@@ -100,19 +104,19 @@ class ManagerController extends Controller {
         } else {
             $data = $adminlist->getAdminInfo($id, 1, 'system_root', 'root_id', 'id');
         }
-        $role_db=new \App\Models\Role;
+        $role_db = new \App\Models\Role;
         $datas = array();
-        foreach ($data['data'] as $k=>$v){
-            $datas[]=$v['id'];
+        foreach ($data['data'] as $k => $v) {
+            $datas[] = $v['id'];
 //            $role=$role_db->getRoleBy($v['id']);
 //            print_r($role);
         }
-        $data_role=$role_db->getRoleIn($datas);
-        foreach ($data['data'] as $k=>$v){
-            $data['data'][$k]['role_name']='';
-            foreach ($data_role as  $ka=>$va){
-                if($va['admin_id']==$v['id']){
-                    $data['data'][$k]['role_name'].=$va['role_name'].',';
+        $data_role = $role_db->getRoleIn($datas);
+        foreach ($data['data'] as $k => $v) {
+            $data['data'][$k]['role_name'] = '';
+            foreach ($data_role as $ka => $va) {
+                if ($va['admin_id'] == $v['id']) {
+                    $data['data'][$k]['role_name'] .= $va['role_name'] . ',';
                 }
             }
         }
@@ -120,7 +124,8 @@ class ManagerController extends Controller {
     }
 
     //修改管理员信息
-    function adminEdit() {
+    function adminEdit()
+    {
         $status = Request::has('status') ? Request::get('status') : 1;
         $id = Request::has('id') ? Request::get('id') : ''; //管理员ID
         $pwd = Request::has('password') ? Request::get('password') : ''; //管理员密码
@@ -141,7 +146,7 @@ class ManagerController extends Controller {
         }
         $password = GenPassword($pwd);
         $data = array
-            (
+        (
             'password' => $password['password'],
             'root_id' => $levelid,
             'status' => $astatus,
@@ -155,7 +160,8 @@ class ManagerController extends Controller {
     }
 
     //管理员权限信息
-    function adminLevel() {
+    function adminLevel()
+    {
         $page = Request::has('page') ? Request::get('page') : 1;
         $limit = Request::has('limit') ? Request::get('limit') : 10;
         $field = Request::has('field') ? Request::get('field') : 1;
@@ -193,10 +199,11 @@ class ManagerController extends Controller {
     }
 
     //权限菜单信息
-    function rootMenu() {
+    function rootMenu()
+    {
         $status = Request::has('status') ? Request::get('status') : 1;
         $data = array
-            (
+        (
             array(
                 'id' => 1,
                 'name' => '彩票注单管理',
@@ -259,7 +266,8 @@ class ManagerController extends Controller {
     }
 
     //修改权限信息
-    function rootEdit() {
+    function rootEdit()
+    {
         $status = Request::has('status') ? Request::get('status') : 1; //1:成功 2:失败
         $rootid = Request::has('rootid') ? Request::get('rootid') : ''; //权限ID
         $level = Request::has('level') ? Request::get('level') : '';
@@ -290,7 +298,8 @@ class ManagerController extends Controller {
     }
 
     //删除管理员权限信息
-    function delLevel() {
+    function delLevel()
+    {
         $status = Request::has('status') ? Request::get('status') : 1;
         $id = Request::has('id') ? Request::get('id') : ''; //管理员权限ID,返回对应管理员权限信息
         if (empty($id)) {
@@ -304,7 +313,8 @@ class ManagerController extends Controller {
     }
 
     //操作日志1
-    function systemLog() {
+    function systemLog()
+    {
         $page = Request::has('page') ? Request::get('page') : 1;
         $limit = Request::has('limit') ? Request::get('limit') : 10;
         $field = Request::has('field') ? Request::get('field') : 4;
@@ -313,8 +323,8 @@ class ManagerController extends Controller {
         $loginname = Request::has('loginname') ? Request::get('loginname') : '';
         $ip = Request::has('ip') ? Request::get('ip') : '';
         $operation = Request::has('operation') ? Request::get('operation') : '';
-        $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' : '';
+        $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('sureblur') ? Request::get('sureblur') : '';
         $where = array();
         if (!empty($loginname)) {
@@ -323,7 +333,10 @@ class ManagerController extends Controller {
             } else {
                 $where[] = array('loginname', '=', $loginname);
             }
+            //$where[] = array('loginname', 'like', '%' . $loginname . '%');
         }
+
+
         if (!empty($ip)) {
             $where[] = array('ip', '=', $ip);
         }
@@ -351,7 +364,8 @@ class ManagerController extends Controller {
     }
 
     //添加权限菜单
-    private function addmenu($menu, $menulist, $rootid) {
+    private function addmenu($menu, $menulist, $rootid)
+    {
         $data = array('root_id' => $rootid);
         foreach ($menu as $v) {
             if (!in_array($v['id'], $menulist)) {

+ 1 - 1
app/Http/Controllers/Admin/Priv_codeController.php

@@ -118,7 +118,7 @@ class Priv_codeController extends Controller {
 		}
 		 **/
 
-		$data = $model->get();
+		$data = $model->orderby('id','desc')->get();
 		if (!$data) {
 			return;
 		}

+ 1 - 1
app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -30,7 +30,7 @@ class SoccerStringNoteListController 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['status'] = isset($req->status) ? trim($req->status) : '-1';
-        $request['match_id'] = $_GET['match_id'] ? $_GET['match_id'] : '';
+        $request['match_id'] = isset($req->match_id) ? trim($req->match_id) : '';
         $request['order_status'] = isset($req->order_status) ? trim($req->order_status) : '-1';
         $dt = \App\Lib\DataTable\DataTable::init();
         $dt->setDataSource('/admin/SoccerStringNoteList/info');

+ 13 - 0
app/Http/Controllers/Api/SettlementController.php

@@ -34,6 +34,19 @@ class SettlementController extends Controller
     public function debug()
     {
 
+        $match = DB::table('money_buy_match')->where(['batch_id' => '156741065534'])->first();
+        $result = DB::table('st_zq_result')->where(['match_id' => '605'])->get();
+        $rule = new  ZqRule();
+
+        print_r([$match,$result]);
+
+        $result = $rule->flbfh($match, $result, []);
+        print_r($result);
+
+
+        exit;
+
+
 
         return;
         $datas = DB::table("dc_navs")->select("id", "name", "href", "type")->get();

+ 96 - 74
app/Http/Model/StLqResult.php

@@ -3,6 +3,10 @@ namespace App\Http\Model;
 
 use Illuminate\Database\Eloquent\Model;
 use App\Http\Response\Response;
+use Illuminate\Support\Facades\DB;
+use App\Lib\Biz\Sport\Common as commonFunction;
+
+
 
 /**
  * Class StLqResult
@@ -109,13 +113,13 @@ class StLqResult extends Model
     public static function LQresult($model){
         //获取当天开始并且已结束的所有赛事
         $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
-            ->where([['match_date','=',date('Y-m-d', time())],['status','=',2]])
+            ->where([['match_date','>',date('Y-m-d',strtotime("-2 day"))],['status','=',2]])
             ->get()
             ->toArray();
 
         //获取赛事结果表 一天内
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-2 day"))]])
             ->get()
             ->toarray();
 
@@ -144,85 +148,103 @@ class StLqResult extends Model
             }
         }
 
+
         $match_ids_str = implode(",", $match_ids);
         
-        //上半场
-        $sql_h = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer from st_lq_result_record a,
-        (select match_id,max(id) id from st_zq_result_record where match_process = '上半场' and match_id IN ($match_ids_str) group by match_id)b
+        //第一节
+        $sql_1 = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.home_rate,a.guest_rate,a.match_process,a.first_score,a.last_score,a.match_score,a.match_winer from st_lq_result_record a,
+        (select match_id,max(id) id from st_lq_result_record where match_process = '第一节' and match_id IN ($match_ids_str) group by match_id)b
         where a.match_id = b.match_id and a.id = b.id ";
-
-        //全场
-        $sql_f = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.match_process,a.all_goal,a.first_score,a.last_score,a.match_score,a.match_winer,a.home_rate,a.guest_rate from st_lq_result_record a,
-        (select match_id,max(id) id from st_zq_result_record where match_id IN ($match_ids_str) group by match_id)b
+        //第二节
+        $sql_2 = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.home_rate,a.guest_rate,a.match_process,a.first_score,a.last_score,a.match_score,a.match_winer from st_lq_result_record a,
+        (select match_id,max(id) id from st_lq_result_record where match_process = '第二节' and match_id IN ($match_ids_str) group by match_id)b
+        where a.match_id = b.match_id and a.id = b.id ";
+        //第三节
+        $sql_3 = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.home_rate,a.guest_rate,a.match_process,a.first_score,a.last_score,a.match_score,a.match_winer from st_lq_result_record a,
+        (select match_id,max(id) id from st_lq_result_record where match_process = '第三节' and match_id IN ($match_ids_str) group by match_id)b
+        where a.match_id = b.match_id and a.id = b.id ";
+        //第四节
+        $sql_4 = "select a.match_id,a.home_score,a.guest_score,a.match_time as a_time,a.home_rate,a.guest_rate,a.match_process,a.first_score,a.last_score,a.match_score,a.match_winer from st_lq_result_record a,
+        (select match_id,max(id) id from st_lq_result_record where match_process = '第四节' and match_id IN ($match_ids_str) group by match_id)b
         where a.match_id = b.match_id and a.id = b.id ";
 
-        //上半场最终结果
-        $match_result_h = DB::select($sql_h);
-
-        //全场最终结果
-        $match_result_f = DB::select($sql_f);
-        //拼装赛事结果数据
-        $match_result_record = [];
-        if(!empty($match_result_h) and !empty($match_result_f)){
-            foreach($match_result_h as $k=>$v){
-                foreach($match_result_f as $kk=>$vv){
-                    if($v->match_id == $vv->match_id){
-                        $match_result_record[$k] = [
-                            "match_id"=>$v->match_id,
-                            "home_score"=> $vv->home_score,
-                            "guest_score"=> $vv->guest_score,
-                            "a_time"=> $vv->a_time,
-                            "match_process"=> $vv->match_process,
-                            "all_goal"=> $vv->all_goal,
-                            "first_score"=> $vv->first_score,
-                            "last_score"=> $vv->last_score,
-                            "match_score"=> $vv->match_score,
-                            "match_winer"=> $vv->match_winer,
-                            "u_home_score"=> $v->home_score,
-                            "u_guest_score"=> $v->guest_score,
-                            "home_rate"=> $vv->home_rate,
-                            "guest_rate"=> $vv->guest_rate,
-                        ];
-                    }
-                }
-            }
-        }
+
+        //第一节最终结果
+        $match_result_1 = DB::select($sql_1);
+        //第二节最终结果
+        $match_result_2 = DB::select($sql_2);
+        //第三节最终结果
+        $match_result_3 = DB::select($sql_3);
+        //第四节最终结果
+        $match_result_4 = DB::select($sql_4);
         
+        //拼装赛事结果数据 
+        $set_match_r = [];
 
-        //组装赛果数据
-        if(!empty($match_result_record)){
-            foreach ($matchData as $k=>$v){
-                $start_time = ($v['match_date'].' '.$v['match_time']);
-                $time = time()-strtotime($v['match_time']);
-                $match_time = self::secTime($time);
-                foreach($match_result_record as $kk =>$vv){        
-                    if($v['id'] == $vv['match_id']){
-                        $set_match_r[] = [
-                            "match_id"=> $v['id'],
-                            "home_team"=>$v['home_team'],
-                            "guest_team"=>$v['guest_team'],
-                            "lg_id"=>$v['lg_id'],
-                            "status"=>$v['status'],
-                            "tag"=> $v['tag'],
-                            'match_time'=>$vv['a_time']?:0,//比赛进行时间
-                            "ctime"=>date('Y-m-d H:i:s'),
-                            "update_time"=>date('Y-m-d H:i:s'),
-                            "start_time"=>date('Y-m-d H:i:s',strtotime($start_time)),
-
-                            "home_rate"=> $vv['home_rate']?:0, //主队让球
-                            "guest_rate"=> $vv['guest_rate']?:0, //客队让球
-                            "home_score"=> $vv['home_score']?:0, //主队进球数
-                            "guest_score"=> $vv['guest_score']?:0, //客队进球数
-                            "all_goal"=> $vv['all_goal']?:0, //总进球数
-                            "first_score"=> $vv['first_score']?:'', //最先进球球队
-                            "last_score"=> $vv['last_score']?:'', //最后进球球队
-                            "match_score"=> $vv['match_score']?:0, //赛事比分
-                            "match_winer"=>  $vv['match_winer']?:'',//获胜球队
-                            "match_process"=> $vv['match_process']?:'',//比赛进程
-                            "u_home_score"=> $vv['u_home_score']?:0,//上半场主队进球数
-                            "u_guest_score"=> $vv['u_guest_score']?:0,//上半场客队进球数
-                        ];                        
-                    }                   
+        if(!empty($match_result_1) and !empty($match_result_2) and !empty($match_result_3) and !empty($match_result_4)){
+            $start_time = ($v['match_date'].' '.$v['match_time']);
+            $time = time()-strtotime($v['match_time']);
+            $match_time = self::secTime($time);
+            foreach($matchData as $k =>$v ){
+                //获取赛事每节的赛果
+                $result_1 = commonFunction::filter_by_value($match_result_1,$v['id']);
+                $result_2 = commonFunction::filter_by_value($match_result_2,$v['id']);
+                $result_3 = commonFunction::filter_by_value($match_result_3,$v['id']);
+                $result_4 = commonFunction::filter_by_value($match_result_4,$v['id']);
+                
+                if(!empty($result_1) and !empty($result_2) and !empty($result_3) and !empty($result_4)){
+
+                    //拼接赛事主队比分  {"1":0,"2":0,"3":0,"4":0}
+                    $home_score = [
+                        '1'=>$result_1['home_score'],
+                        '2'=>$result_2['home_score'],
+                        '3'=>$result_3['home_score'],
+                        '4'=>$result_4['home_score']
+                    ];
+                    //拼接赛事客队比分
+                    $guest_score = [
+                        '1'=>$result_1['guest_score'],
+                        '2'=>$result_2['guest_score'],
+                        '3'=>$result_3['guest_score'],
+                        '4'=>$result_4['guest_score']
+                    ];
+
+                    //获取获胜球队
+                    if(($result_4['home_score']) > ($result_4['guest_score'])){
+                        $match_winer = $v['home_team'];
+                    }else{
+                        $match_winer = $v['guest_team'];
+                    }
+
+                    //获取总进球数
+                    $all_goal = ($result_4['home_score'])+($result_4['guest_score']);
+
+                    //赛事待写入赛果数据
+                    $set_match_r[] = [
+                        "match_id"=> $v['id'],
+                        "home_team"=>$v['home_team'],
+                        "guest_team"=>$v['guest_team'],
+                        "lg_id"=>$v['lg_id'],
+                        "status"=>$v['status'],
+                        "tag"=> $v['tag'],
+                        'match_time'=>$result_4['a_time']?:0,//比赛进行时间
+                        "ctime"=>date('Y-m-d H:i:s'),
+                        "update_time"=>date('Y-m-d H:i:s'),
+                        "start_time"=>date('Y-m-d H:i:s',strtotime($start_time)),
+
+                        "home_rate"=> $result_4['home_rate']?:0, //主队让球
+                        "guest_rate"=> $result_4['guest_rate']?:0, //客队让球
+                        "home_score"=> json_encode($home_score)?:'', //主队进球数
+                        "guest_score"=> json_encode($guest_score)?:'', //客队进球数
+                        "all_goal"=> $all_goal?:0, //总进球数
+                        "first_score"=> $result_4['first_score']?:'', //最先进球球队
+                        "last_score"=> $result_4['last_score']?:'', //最后进球球队
+                        "match_score"=> $result_4['match_score']?:0, //赛事比分
+                        "match_winer"=>  $match_winer?:'',//获胜球队
+                        "match_process"=> $result_4['match_process']?:'',//比赛进程
+                        "u_home_score"=> $result_2['home_score']?:0,//上半场主队进球数
+                        "u_guest_score"=> $result_2['guest_score']?:0,//上半场客队进球数
+                    ];     
                 }
             }
         }

+ 10 - 4
app/Http/Model/StZqResult.php

@@ -201,13 +201,13 @@ class StZqResult extends Model
     public static function ZQresult($model){
         //获取当天开始并且已结束的所有赛事
         $matchData = $model['model_match']::select('id','home_team','guest_team','lg_id','status','tag','match_date','match_time')
-            ->where([['match_date','=',date('Y-m-d', time())],['status','=',2]])
+            ->where([['match_date','>',date('Y-m-d', strtotime("-2 day"))],['status','=',2]])
             ->get()
             ->toArray();
 
         //获取赛事结果表 一天内
         $matchData_r = $model['model_result']::select('match_id')
-            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-1 day"))]])
+            ->where([['ctime','>',date('Y-m-d H:i:s', strtotime("-2 day"))]])
             ->get()
             ->toarray();
 
@@ -225,7 +225,7 @@ class StZqResult extends Model
 
         //没有数据,无需操作
         if(empty($matchData)) return Response::success();
-        
+
         //获取赛事id 用于获取赛事对应结果比分
         $match_ids = [];
         foreach($matchData as $k =>$v){
@@ -288,6 +288,12 @@ class StZqResult extends Model
                 $match_time = self::secTime($time);
                 foreach($match_result_record as $kk =>$vv){        
                     if($v['id'] == $vv['match_id']){
+                        //获取获胜球队
+                        if(($vv['home_score']) > ($vv['guest_score'])){
+                            $match_winer = $v['home_team'];
+                        }else{
+                            $match_winer = $v['guest_team'];
+                        }
                         $set_match_r[] = [
                             "match_id"=> $v['id'],
                             "home_team"=>$v['home_team'],
@@ -308,7 +314,7 @@ class StZqResult extends Model
                             "first_score"=> $vv['first_score']?:'', //最先进球球队
                             "last_score"=> $vv['last_score']?:'', //最后进球球队
                             "match_score"=> $vv['match_score']?:0, //赛事比分
-                            "match_winer"=>  $vv['match_winer']?:'',//获胜球队
+                            "match_winer"=>  $match_winer?:'',//获胜球队
                             "match_process"=> $vv['match_process']?:'',//比赛进程
                             "u_home_score"=> $vv['u_home_score']?:0,//上半场主队进球数
                             "u_guest_score"=> $vv['u_guest_score']?:0,//上半场客队进球数

+ 55 - 0
app/Lib/Biz/Sport/Common.php

@@ -1273,6 +1273,61 @@ class Common
         Log::useFiles(storage_path('logs/set_sports_record/' . date('Y-m-d', time()) . '/' . $game_code . '/' . $title . '.log'), 'info');
         Log::info('--->msg:' . $msg . ';data:' . $json_data);
     }
+
+    /* 
+     * 根据二维数组某个字段的值查找数组
+     * $array 数组
+     * 查询字段
+     * $value 字段值
+    */ 
+    static function filter_by_value ($array,$match_id){ 
+
+
+        /*
+        $newarray = [
+            'match_id'=> 1,
+            'home_score'=> 1,
+            'guest_score'=> 2,
+            'a_time'=> 0,
+            'home_rate'=> 0,
+            'guest_rate'=> 0,
+            'match_process'=> 0,
+            'first_score'=> '',
+            'last_score'=> '',
+            'match_score'=> '',
+            'match_winer'=>''
+        ];
+
+        return $newarray;
+
+        */
+
+        $newarray = [];
+
+        if(is_array($array) && count($array)>0)  
+        { 
+            foreach($array as $k=>$v){
+                if($v->match_id == $match_id){
+                    $newarray[$k] = [
+                        'match_id'=> $v->match_id,
+                        'home_score'=> $v->home_score,
+                        'guest_score'=> $v->guest_score,
+                        'a_time'=> $v->a_time,
+                        'home_rate'=> $v->home_rate,
+                        'guest_rate'=> $v->guest_rate,
+                        'match_process'=> $v->match_process,
+                        'first_score'=> $v->first_score,
+                        'last_score'=> $v->last_score,
+                        'match_score'=> $v->match_score,
+                        'match_winer'=> $v->match_winer
+                    ];       
+                }
+
+            }
+        } 
+
+        return $$newarray;
+    } 
 }
 
 ?>

+ 1 - 1
resources/views/admin/Priv_code/add.blade.php

@@ -81,7 +81,7 @@ function cbFormSuccess(data){
 		// parent.window.location.reload();
 	},2500);
 }
-lay('.test-item').each(function(){
+layui('.test-item').each(function(){
     laydate.render({
         elem: this
         ,type: 'datetime'

+ 1 - 1
resources/views/admin/Sportsbq/outcome.blade.php

@@ -166,7 +166,7 @@
     </script>
 
     <script type="text/html" id="operation">
-        <button onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果</button>
+        <!-- <button onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果</button> -->
         @{{#if(d.status==2 || d.status==3){ }}
             @{{#if(d.status==2){ }}
                 <span><li class="layui-btn layui-btn-sm layui-btn-green set" onclick="settlement(@{{d.match_id}},1)">结算</li></span>

+ 1 - 1
resources/views/admin/Sportswq/outcome.blade.php

@@ -158,7 +158,7 @@
     </script>
 
     <script type="text/html" id="operation">
-        <button onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果</button>
+        <!-- <button onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-green set">赛事结果</button> -->
         @{{#if(d.status==2 || d.status==3){ }}
             @{{#if(d.status==2){ }}
                 <span><li class="layui-btn layui-btn-sm layui-btn-green set" onclick="settlement(@{{d.match_id}},1)">结算</li></span>

+ 3 - 1
resources/views/admin/SystemManage/LogList.blade.php

@@ -39,11 +39,13 @@
                                    eventType="event-query" value="{{ $loginname }}" autocomplete="off"
                                    class="layui-input">
                         </div>
+
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="sureblur" eventType="event-query"
                                    value="{{$sureblur}}"
-                                   lay-skin="switch" lay-text="精确|模糊" @if ($sureblur=='精确') checked @endif>
+                                   lay-skin="switch" lay-text="模糊|精确"  @if ($sureblur=='0')checked @endif>
                         </div>
+
                     </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('system_user.ip') }}</label>

+ 23 - 193
resources/views/admin/sportsfoot/addwarn.blade.php

@@ -1,104 +1,6 @@
 @extends('vip.layouts')
 @section('content')
 	
-	<style type="text/css">
-    /* 弹窗 (background) */
-    .modal {
-        display: none; /* 默认隐藏 */
-        /*生成绝对定位的元素,相对于浏览器窗口进行定位。*/
-        position: fixed; 
-        z-index: 1; 
-        left: 0;
-        top: 0;
-        /*设置弹窗位置*/
-        padding-top: 100px;
-        padding-bottom: 200px;
-        /*浮在全屏上*/
-        width: 100%; 
-        height:  100%; 
-        /*overflow:auto;如果内容被修剪,则浏览器会显示滚动条,以便查看其余内容。*/
-        overflow: auto; 
-        background-color: rgb(0,0,0); 
-        background-color: rgba(0,0,0,0.4);
-        text-align: right;
-    }
-
-    /* 弹窗内容 */
-    .modal-content {
-        /*position: relative;*/
-        /*弹窗背景色设置*/
-        background-color: #fefefe;
-        margin: auto;
-        padding: 260px auto;
-        width: 600px;
-        box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
-        -webkit-animation-name: animatetop;
-        -webkit-animation-duration: 0.4s;
-        animation-name: animatetop;
-        animation-duration: 0.4s;
-        border-radius: 10px;
-       }
-
-    /* 添加动画 */
-    @-webkit-keyframes animatetop {
-        from {top:-200px; opacity:0} 
-        to {top:0; opacity:1}
-    }
-
-    @keyframes animatetop {
-        from {top:-200px; opacity:0}
-        to {top:0; opacity:1}
-    }
-
-    /* 关闭按钮 */
-    .close {
-        color: white;
-        float: right;
-        font-size: 28px;
-        font-weight: bold;
-    }
-
-    .close:hover, .close:focus {
-        color: #000;
-        text-decoration: none;
-        cursor: pointer;
-    }
-
-    .modal-header {
-        display: block;
-        line-height: 30px;
-        padding: 2px 10px;
-        background-color: #AEAEAE;
-        color: white;
-        text-align: left;
-        border-radius: 5px 5px 0 0;
-    }
-
-    .modal-body {
-        padding: 2px 16px;
-        font-size: 18px;
-        /*height: 200px;*/
-    }
-
-    .modal-footer {
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-        width: 520px;
-        padding: 0 40px;
-        height: 50px;
-       border-radius:0 0 5px 5px;
-        display: block;
-        line-height: 39px;
-        background-color: #AEAEAE;
-        color: white;
-    }
-    .ok,.no{
-        width: 100px;
-        height: 40px;
-    }
-</style>
-
 	<div class="layui-row">
 		<div class="layui-col-xs12">
 			<div class="layui-form-item" style="margin-left:50px;">
@@ -146,35 +48,6 @@
         @endif
     </table>
 
-	<!-- 弹窗 -->
-	<div id="myModal" class="modal">
-            <input type="hidden" id="matchid" name="matchid" value="">
-            <input type="hidden" id="wid" name="wid" value="">
-            <input type="hidden" id="typenum" name="typenum" value="">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <span class="close">&times;</span>
-                    <h2>危险球添加</h2>
-                </div>
-                <div class="modal-body">
-                    <p style="text-align:left;color:#5f7788;">请认真填写危险球结果,将会按照改结果结算</p><br>
-                    <div style="text-align:left;">
-                        <div style="display: flex;">
-                            <li>危险球时间:</li><input type="text" id="timei" name="timei" value="0" autocomplete="off">
-                        </div>
-                        <div style="display: flex;">
-                            <li>危险球类型:</li>
-                            <select name="warntype" id="warntype">
-                            </select>
-                        </div><br>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button class="ok" onchange="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="no"><h3>取消</h3></button>
-                </div>
-            </div>
-    </div>
-
     <script type="text/javascript">
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
@@ -191,70 +64,42 @@
             })
         })
 
-    	function addResult(match_id,wid,typenum){
-            $(":input",$("#myModal")).each(function(i){  $(this).val('');});
+        function addResult(match_id,wid,typenum){
             var wid = wid?wid:0;
-            document.getElementById("matchid").value=match_id;//赋值个弹窗
-            document.getElementById("wid").value=wid;//赋值个弹窗
-            document.getElementById("typenum").value=typenum;//赋值个弹窗
-          
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
                 url: '/admin/Sportsfoot/warnresult',
                 data: {match_id:match_id,wid:wid},
                 success: function(data) {
-                    // alert(data);
-                    // console.log(data.warn_more[0].timei);
+                    var  conttxt ='<div style="margin-left:50px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><input type="hidden" id="wid" name="wid" value="'+wid+'" /><input type="hidden" id="typenum" name="typenum" value="'+typenum+'" /><div style="display: flex;"><li>危险球时间:</li>';
+
                     if(wid!=0){
-                        document.getElementById("timei").value=data.warn_more[wid].timei;
+                        conttxt += '<input type="text" id="timei" name="timei" value="'+data.warn_more[wid].timei+'" autocomplete="off">';
                     }else{
-                        document.getElementById("timei").value=data['starttime'];
+                        conttxt += '<input type="text" id="timei" name="timei" value="'+data['starttime']+'" autocomplete="off">';
                     }
-                    warntype = "<option value='"+data.warn_more[wid].rtype+"' selected=''>";
-                    if (data.warn_more[wid].rtype!=0){
-                        warntype += data.warn_more[wid].rtype;
+
+                    conttxt += '</div><div style="display: flex;"><li>危险球类型:</li><select name="warntype" id="warntype">';
+                    if(data.warn_more[wid].rtype!=0){
+                        conttxt += '<option value="'+data.warn_more[wid].rtype+'">'+data.warn_more[wid].rtype+'</option><option value="0">无危险球类型';
                     }else{
-                        warntype += '请选择危险球';
+                        conttxt += '<option value="0">请选择危险球类型';
                     }
-                    warntype += "</option><option value='角球'>角球</option><option value='12码罚球'>12码罚球</option><option value='自由球'>自由球</option><option value='掷入球'>掷入球</option>";
-                    $("#warntype").html(warntype);
-                }
-            }) 
 
-            //获取弹窗得div
-            var modal = document.getElementById('myModal');
-            // 获取 <span> 元素,用于关闭弹窗 (X)
-            var span = document.getElementsByClassName("close")[0];
-            //获取弹窗中得确定按钮
-            var ok=document.getElementsByClassName("ok")[0];
-            //获取弹窗中得取消按钮
-            var no=document.getElementsByClassName("no")[0];
-            //窗体弹出
-            modal.style.display = "block";
-            //点击窗体ok
-            ok.onclick=function(){
-                //执行弹出窗体得确定后得操作
-                alert("执行确定按钮点击得操作");
-                //关闭窗口
-                modal.style.display = "none";
-                buttonClick();
-            }
-            //点击窗体取消按钮
-            no.onclick=function(){
-                //直接关闭窗口
-                modal.style.display = "none";
-            }
-            // 点击 <span> (x), 关闭弹窗
-            span.onclick = function() {
-                //直接关闭窗口
-                modal.style.display = "none";
-            }
-            // 在用户点击其他地方时,关闭弹窗
-            window.onclick = function(event) {
-                //点击窗口外内容,关闭窗口
-                if (event.target == modal) modal.style.display = "none";
-            }
+                    conttxt += '</option><option value="角球">角球</option><option value="12码罚球">12码罚球</option><option value="自由球">自由球</option><option value="掷入球">掷入球</option></select></div><br><div style="margin-left:230px;"><button class="layui-btn layui-btn-sm layui-btn-green set" onclick="buttonClick()"><h3>确定</h3></button>&nbsp;<button class="layui-btn layui-btn-sm layui-btn-danger"><h3>取消</h3></button></div></div>';
+
+                    layer.open({
+                      type: 1 //Page层类型
+                      ,area: ['500px', '200px']
+                      ,title: '<h2>危险球结果添加<h2>'
+                      ,shade: 0.6 //遮罩透明度
+                      ,maxmin: true //允许全屏最小化
+                      ,anim: 1 //0-6的动画形式,-1不开启
+                      ,content:conttxt
+                    });
+                }
+            })
         }
 
         function buttonClick(){
@@ -279,21 +124,6 @@
                 }
             })
         }
-        //搜索
-        // function soulist(){
-        //     var sousuo = $("#sousuo").val();
-        //     var match_id = $("#match_id").val();
-            
-        //     $.ajax({
-        //         type: 'POST',
-        //         dataType: 'json',
-        //         url: '/admin/Sportsfoot/addwarn',
-        //         data: {match_id:match_id,sousuo:sousuo},
-        //         success: function(data) {
-        //             location. reload()//刷新当前页面           
-        //         }
-        //     })
-        // }
 
     </script>
 

+ 2 - 1
resources/views/sports/base_league.blade.php

@@ -136,7 +136,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/BaseLeague/add'))<a href="/admin/BaseLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/BaseLeague/delete'))<a href="javascript:delWin('/admin/BaseLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

+ 2 - 1
resources/views/sports/base_match.blade.php

@@ -120,7 +120,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsBase/add'))<a href="/admin/SportsBase/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBase/delete'))<a href="javascript:delWin('/admin/SportsBase/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

+ 2 - 1
resources/views/sports/basket_league.blade.php

@@ -137,7 +137,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/BasketLeague/add'))<a href="/admin/BasketLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/BasketLeague/delete'))<a href="javascript:delWin('/admin/BasketLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

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

@@ -126,7 +126,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsBasket/add'))<a href="/admin/SportsBasket/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsBasket/delete'))<a href="javascript:delWin('/admin/SportsBasket/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

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

@@ -138,7 +138,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SoccerLeague/add'))<a href="/admin/SoccerLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SoccerLeague/delete'))<a href="javascript:delWin('/admin/SoccerLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

+ 2 - 1
resources/views/sports/soccer_match.blade.php

@@ -120,7 +120,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><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/SportsSoccer/delete'))<a href="javascript:delWin('/admin/SportsSoccer/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

File diff suppressed because it is too large
+ 4 - 258
resources/views/sports/sports_notelist.blade.php


+ 2 - 1
resources/views/sports/sports_search.blade.php

@@ -264,7 +264,8 @@
                         <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>
                         {{--@if(checkRriv('/admin/SoccerNoteList/batchsettlement'))<a href="javascript:batchsettlement('/admin/SoccerNoteList/batchsettlement');" class="layui-btn layui-btn-sm  layui-btn-danger">批量结算</a>@endif--}}
-                        <!-- <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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><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

+ 2 - 1
resources/views/sports/sports_stringnotelist.blade.php

@@ -144,7 +144,8 @@
                         <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>
                         {{--@if(checkRriv('/admin/SoccerstringNoteList/batchsettlement'))<a href="javascript:batchsettlement('/admin/SoccerstringNoteList/batchsettlement');" class="layui-btn layui-btn-sm  layui-btn-danger">批量结算</a>@endif--}}
-                        <!-- <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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         {{--@if(checkRriv('/admin/SoccerstringNoteList/add'))<a href="/admin/SoccerstringNoteList/add" 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>

+ 2 - 1
resources/views/sports/tennis_league.blade.php

@@ -136,7 +136,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/TennisLeague/add'))<a href="/admin/TennisLeague/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/TennisLeague/delete'))<a href="javascript:delWin('/admin/TennisLeague/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

+ 2 - 1
resources/views/sports/tennis_match.blade.php

@@ -120,7 +120,8 @@
                         {{--<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> -->
+                        <a class="layui-btn layui-btn-sm layui-laydate-range set" data-type="reload"
+                           style="opacity: 1; pointer-events: auto;" href="javascript:window.location.reload()"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/SportsTennis/add'))<a href="/admin/SportsTennis/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         @if(checkRriv('/admin/SportsTennis/delete'))<a href="javascript:delWin('/admin/SportsTennis/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                     </div>

Some files were not shown because too many files changed in this diff