异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -263,7 +263,7 @@ class SportsbkController extends Controller {
 		$noticeid = $notice['id'];
 		//查询赛事单式是否有订单(蓝球)
 		$newapp = new \App\Models\MoneyBuyMatch();
-		$simplex = $newapp->simsettleorder($match_id,'lq');
+		$simplex = $newapp->simsettleorder($match_id,$type);
 		$str = $newapp->strsettleorder($match_id);
 
 		//获取赛事结算进程下的注单
@@ -342,6 +342,10 @@ class SportsbkController extends Controller {
 				session('adminInfo.admin_name'),
 			);
 			OperationLog(session('adminInfo.admin_id'), '蓝球结算', $log);
+			$res = \App\Models\SportsBasket::where ('id', $match_id)->first();
+			if($res['status'] == 1){
+				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
+			}
 			$res = \App\Models\Stlqresult::where ('match_id', $match_id)->update(['status' =>3]);
 			$res = \App\Models\SportsBasket::where ('id', $match_id)->update(['status' =>3]);
 			return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);

app/Http/Controllers/Admin/SportsbqController.php

@@ -128,6 +128,113 @@ class SportsbqController extends Controller {
 		return responseToJson(1);
 	}
 
+	//结算
+	function Settlement1(Req $req){
+		$match_id = $req->match_id;
+		$type = $req->type;
+		$process = $req->process;
+		if(empty($process)){
+			$process = array();
+		}
+
+		$token = session('adminInfo.token');
+		$notice = \App\Models\Comendnotice::where('match_id', $match_id)->first();
+
+		if(!$notice){
+			return json_encode(['status'=>5,'msg'=>'请先核对结果,并提交结果']);
+		}
+		$noticeid = $notice['id'];
+		//查询赛事单式是否有订单(棒球)
+		$newapp = new \App\Models\MoneyBuyMatch();
+		$simplex = $newapp->simsettleorder($match_id,$type);
+		$str = $newapp->strsettleorder($match_id);
+
+		//获取赛事结算进程下的注单
+		$simplex = commonFunction::getOrderData($data = [],$simplex,$type,$process);
+		$str = commonFunction::getOrderData($data = [],$str,$type,$process);
+
+		//获取注单id组成一维数组
+		$simplex_ids = array_column($simplex['settle'],'order_id');
+		$str_ids = array_column($str['settle'],'order_id');
+
+		//去重
+		$simplex_ids = array_unique($simplex_ids);
+		$str_ids = array_unique($str_ids);
+
+		//判断赛事下注单输赢
+		$datas = array('noticeid' => $noticeid , 'token' => $token);
+		$settlementAuto = new \App\Lib\Settlement\SettlementAuto();
+		$winfail = $settlementAuto->SubmitSettelement('w',$datas);
+		if($winfail == false){
+			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
+		}
+		$sim = array(
+			'token'=>$token,
+			'order_ids'=>'', //订单id字符串，用半角都好分隔
+			'bettype'=>1, //结算类型  1单式  2串式
+			'settype'=>2, //结算次数  1首次  2非首次
+			'game_code'=>$type, //赛事类型  zq lq wq bq
+			'match_id'=>$match_id,  // 赛事ID
+			'change_status'=>1  //是否改状态
+		);
+		$str = array(
+			'token'=>$token,
+			'order_ids'=>'', //订单id字符串，用半角都好分隔
+			'bettype'=>2, //结算类型  1单式  2串式
+			'settype'=>2, //结算次数  1首次  2非首次
+			'game_code'=>$type, //赛事类型  zq lq wq bq
+			'match_id'=>$match_id,  // 赛事ID
+			'change_status'=>1  //是否改状态
+		);
+		if(count($simplex_ids)>0 || count($str_ids)>0){
+			//单式结算
+			if(count($simplex_ids)>0 && count($str_ids)==0){
+				$sim['order_ids'] = implode(',',$simplex_ids);
+				$settlesim = $settlementAuto->SubmitSettelement('s',$sim);
+				if($settlesim == false){
+					return json_encode(['status'=>3,'msg'=>'单式注单结算有误,请联系管理员!!!']);
+				}else{
+					return json_encode(['status'=>1,'msg'=>'单式结算成功,没有串式订单']);
+				}
+			}
+			//串式结算
+			elseif(count($str_ids)>0 && count($simplex_ids)==0){
+				$str['order_ids'] = implode(',',$str_ids);
+				$settlestr = $settlementAuto->SubmitSettelement('s',$str);
+				if($settlestr == false){
+					return json_encode(['status'=>3,'msg'=>'串式注单结算有误,请联系管理员!!!']);
+				}else{
+					return json_encode(['status'=>1,'msg'=>'串式结算成功,没有单式订单']);
+				}
+			}
+			//既有单式也有串式
+			elseif(count($str_ids)>0 && count($simplex_ids)>0){
+				$sim['order_ids'] = implode(',',$simplex_ids);
+				$str['order_ids'] = implode(',',$str_ids);
+				$settlesim = $settlementAuto->SubmitSettelement('s',$sim);
+				$settlestr = $settlementAuto->SubmitSettelement('s',$str);
+				if($settlesim == true || $settlestr == true){
+					return json_encode(['status'=>1,'msg'=>'结算成功']);
+				}else{
+					return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!']);
+				}
+			}
+		}else{
+			$log = array(
+				session('adminInfo.admin_name'),
+			);
+			OperationLog(session('adminInfo.admin_id'), '足球结算', $log);
+			$res = \App\Models\SportsBase::where ('id', $match_id)->first();
+			if($res['status'] == 1){
+				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
+			}
+			$res = \App\Models\Stbqresult::where ('match_id', $match_id)->update(['status' =>3]);
+			$res = \App\Models\SportsBase::where ('id', $match_id)->update(['status' =>3]);
+			return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);
+		}
+	}
+
+
 	//结算
 	function Settlement(Req $req){
 		$jsurl = config('sconstant.url');//结算请求域名地址
@@ -221,7 +328,7 @@ class SportsbqController extends Controller {
 		$newapp = \App\Models\Stbqresult::where('match_id', $match_id)->first();
 
 		$jieguo =array(
-			'bqresult' => json_decode($newapp['match_score_t'],true),
+			'bqresult' => json_decode($newapp['manual_result'],true),
 			'newapp' => $newapp,
 		);
 		return $jieguo;
@@ -358,6 +465,7 @@ class SportsbqController extends Controller {
 				"home_score"=>$uscore['all']['home'],
 				"guest_score"=>$uscore['all']['guest'],
 				"match_score_t"=>json_encode($uscore),
+				"manual_result"=>json_encode($uscore),
 				"match_score"=>$uscore['all']['home'].':'.$uscore['all']['guest'],
 				"u_home_score"=>$uscore['five']['home'],
 				"u_guest_score"=>$uscore['five']['guest'],
@@ -466,6 +574,14 @@ class SportsbqController extends Controller {
 		return responseToJson(1);
 	}
 
+	//获取赛事进程数据
+	function getprocess(Req $req){
+		$type = $req->type;
+
+		$process = commonFunction::getprocess($type);
+		return json_encode($process);
+	}
+
 
 
 

app/Http/Controllers/Admin/SportsfootController.php

@@ -32,7 +32,7 @@ class SportsfootController extends Controller {
 		$noticeid = $notice['id'];
 		//查询赛事单式是否有订单(足球)
 		$newapp = new \App\Models\MoneyBuyMatch();
-		$simplex = $newapp->simsettleorder($match_id,'zq');
+		$simplex = $newapp->simsettleorder($match_id,$type);
 		$str = $newapp->strsettleorder($match_id);
 
 		//获取赛事结算进程下的注单
@@ -111,6 +111,10 @@ class SportsfootController extends Controller {
 				session('adminInfo.admin_name'),
 			);
 			OperationLog(session('adminInfo.admin_id'), '足球结算', $log);
+			$res = \App\Models\SportsSoccer::where ('id', $match_id)->first();
+			if($res['status'] == 1){
+				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
+			}
 			$res = \App\Models\Stzqresult::where ('match_id', $match_id)->update(['status' =>3]);
 			$res = \App\Models\SportsSoccer::where ('id', $match_id)->update(['status' =>3]);
             return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);
@@ -713,19 +717,25 @@ class SportsfootController extends Controller {
 				'scoretime'=>intval($req->onescoretime)?intval($req->onescoretime):0,
 				'scoretype'=>$req->firststye ? $req->firststye:0,
 			);
-			$model->match_score = $data['all']['home'].':'.$data['all']['guest'];
-			$model->u_home_score = $data['half']['home'];
-			$model->u_guest_score = $data['half']['guest'];
-			$model->home_score = $data['all']['home'];
-			$model->guest_score = $data['all']['guest'];
-			$model->last_score = $req->lastscore?$req->lastscore:'';
-			$model->match_winer = $req->matchwiner?$req->matchwiner:'';
-			$model->penalty_card = json_encode($penaltycard,JSON_UNESCAPED_UNICODE);
-			$model->corner_ball = json_encode($cornerball,JSON_UNESCAPED_UNICODE);
-			$model->first_score = json_encode($firstone,JSON_UNESCAPED_UNICODE);
-			$model->is_correct = 1;
-			$model->manual_result = json_encode($data,JSON_UNESCAPED_UNICODE);
-			$model->save();
+//			$model->match_score = $data['all']['home'].':'.$data['all']['guest'];
+//			$model->u_home_score = $data['half']['home'];
+//			$model->u_guest_score = $data['half']['guest'];
+//			$model->home_score = $data['all']['home'];
+//			$model->guest_score = $data['all']['guest'];
+//			$model->last_score = $req->lastscore?$req->lastscore:'';
+//			$model->match_winer = $req->matchwiner?$req->matchwiner:'';
+//			$model->penalty_card = json_encode($penaltycard,JSON_UNESCAPED_UNICODE);
+//			$model->corner_ball = json_encode($cornerball,JSON_UNESCAPED_UNICODE);
+//			$model->first_score = json_encode($firstone,JSON_UNESCAPED_UNICODE);
+//			$model->is_correct = 1;
+//			$model->manual_result = json_encode($data,JSON_UNESCAPED_UNICODE);
+//			$model->save();
+
+			$updatainfo = [
+				"manual_result"=>json_encode($data,JSON_UNESCAPED_UNICODE),
+				'is_correct'=>1
+			];
+			\App\Models\Stzqresult::where('match_id', $match_id)->update($updatainfo);
 
 			$update = $this->addcomendnotice($match_id);
 

app/Http/Controllers/Admin/SportswqController.php

@@ -139,6 +139,113 @@ class SportswqController extends Controller {
 		return responseToJson(1);
 	}
 
+	//结算
+	function Settlement1(Req $req){
+		$match_id = $req->match_id;
+		$type = $req->type;
+		$process = $req->process;
+		if(empty($process)){
+			$process = array();
+		}
+
+		$token = session('adminInfo.token');
+		$notice = \App\Models\Comendnotice::where('match_id', $match_id)->first();
+
+		if(!$notice){
+			return json_encode(['status'=>5,'msg'=>'请先核对结果,并提交结果']);
+		}
+		$noticeid = $notice['id'];
+		//查询赛事单式是否有订单(网球)
+		$newapp = new \App\Models\MoneyBuyMatch();
+		$simplex = $newapp->simsettleorder($match_id,$type);
+		$str = $newapp->strsettleorder($match_id);
+
+		//获取赛事结算进程下的注单
+		$simplex = commonFunction::getOrderData($data = [],$simplex,$type,$process);
+		$str = commonFunction::getOrderData($data = [],$str,$type,$process);
+
+		//获取注单id组成一维数组
+		$simplex_ids = array_column($simplex['settle'],'order_id');
+		$str_ids = array_column($str['settle'],'order_id');
+
+		//去重
+		$simplex_ids = array_unique($simplex_ids);
+		$str_ids = array_unique($str_ids);
+//		print_r($simplex_ids);exit;
+
+		//判断赛事下注单输赢
+		$datas = array('noticeid' => $noticeid , 'token' => $token);
+		$settlementAuto = new \App\Lib\Settlement\SettlementAuto();
+		$winfail = $settlementAuto->SubmitSettelement('w',$datas);
+		if($winfail == false){
+			return json_encode(['status'=>2,'msg'=>'判断输赢错误,请联系管理员!!!']);//输赢错误
+		}
+		$sim = array(
+			'token'=>$token,
+			'order_ids'=>'', //订单id字符串，用半角都好分隔
+			'bettype'=>1, //结算类型  1单式  2串式
+			'settype'=>2, //结算次数  1首次  2非首次
+			'game_code'=>$type, //赛事类型  zq lq wq bq
+			'match_id'=>$match_id,  // 赛事ID
+			'change_status'=>1  //是否改状态
+		);
+		$str = array(
+			'token'=>$token,
+			'order_ids'=>'', //订单id字符串，用半角都好分隔
+			'bettype'=>2, //结算类型  1单式  2串式
+			'settype'=>2, //结算次数  1首次  2非首次
+			'game_code'=>$type, //赛事类型  zq lq wq bq
+			'match_id'=>$match_id,  // 赛事ID
+			'change_status'=>1  //是否改状态
+		);
+		if(count($simplex_ids)>0 || count($str_ids)>0){
+			//单式结算
+			if(count($simplex_ids)>0 && count($str_ids)==0){
+				$sim['order_ids'] = implode(',',$simplex_ids);
+				$settlesim = $settlementAuto->SubmitSettelement('s',$sim);
+				if($settlesim == false){
+					return json_encode(['status'=>3,'msg'=>'单式注单结算有误,请联系管理员!!!']);
+				}else{
+					return json_encode(['status'=>1,'msg'=>'单式结算成功,没有串式订单']);
+				}
+			}
+			//串式结算
+			elseif(count($str_ids)>0 && count($simplex_ids)==0){
+				$str['order_ids'] = implode(',',$str_ids);
+				$settlestr = $settlementAuto->SubmitSettelement('s',$str);
+				if($settlestr == false){
+					return json_encode(['status'=>3,'msg'=>'串式注单结算有误,请联系管理员!!!']);
+				}else{
+					return json_encode(['status'=>1,'msg'=>'串式结算成功,没有单式订单']);
+				}
+			}
+			//既有单式也有串式
+			elseif(count($str_ids)>0 && count($simplex_ids)>0){
+				$sim['order_ids'] = implode(',',$simplex_ids);
+				$str['order_ids'] = implode(',',$str_ids);
+				$settlesim = $settlementAuto->SubmitSettelement('s',$sim);
+				$settlestr = $settlementAuto->SubmitSettelement('s',$str);
+				if($settlesim == true || $settlestr == true){
+					return json_encode(['status'=>1,'msg'=>'结算成功']);
+				}else{
+					return json_encode(['status'=>3,'msg'=>'结算有误,请联系管理员!!!']);
+				}
+			}
+		}else{
+			$log = array(
+				session('adminInfo.admin_name'),
+			);
+			OperationLog(session('adminInfo.admin_id'), '网球结算', $log);
+			$res = \App\Models\SportsTennis::where ('id', $match_id)->first();
+			if($res['status'] == 1){
+				return json_encode(['status'=>4,'msg'=>'该赛事进程下没有任何订单']);
+			}
+			$res = \App\Models\Stwqresult::where ('match_id', $match_id)->update(['status' =>3]);
+			$res = \App\Models\SportsTennis::where ('id', $match_id)->update(['status' =>3]);
+			return json_encode(['status'=>4,'msg'=>'该赛事没有任何订单,将会结束该赛事!!!']);
+		}
+
+	}
 	//结算
 	function Settlement(Req $req){
 		$jsurl = config('sconstant.url');//结算请求域名地址
@@ -232,7 +339,7 @@ class SportswqController extends Controller {
 		$newapp = \App\Models\Stwqresult::where('match_id', $match_id)->first();
 
 		$array =array(
-			'wqresult' => json_decode($newapp['inning'],true),
+			'wqresult' => json_decode($newapp['manual_result'],true),
 			'newapp' => $newapp,
 		);
 		return $array;
@@ -268,28 +375,28 @@ class SportswqController extends Controller {
 
 		$data = array(
 			"1" => array(
-				'home' => intval($req->homeo)?intval($req->homeo):0,
-				'guest' => intval($req->guesto)?intval($req->guesto):0,
+				'home' => intval($req->homeo)?intval($req->homeo):'',
+				'guest' => intval($req->guesto)?intval($req->guesto):'',
 			),
 			"2" => array(
-				'home' => intval($req->homet)?intval($req->homet):0,
-				'guest' => intval($req->guestt)?intval($req->guestt):0,
+				'home' => intval($req->homet)?intval($req->homet):'',
+				'guest' => intval($req->guestt)?intval($req->guestt):'',
 			),
 			"3" => array(
-				'home' => intval($req->homes)?intval($req->homes):0,
-				'guest' => intval($req->guests)?intval($req->guests):0,
+				'home' => intval($req->homes)?intval($req->homes):'',
+				'guest' => intval($req->guests)?intval($req->guests):'',
 			),
 			"4" => array(
-				'home' => intval($req->homef)?intval($req->homef):0,
-				'guest' => intval($req->guestf)?intval($req->guestf):0,
+				'home' => intval($req->homef)?intval($req->homef):'',
+				'guest' => intval($req->guestf)?intval($req->guestf):'',
 			),
 			"5" => array(
-				'home' => intval($req->homee)?intval($req->homee):0,
-				'guest' => intval($req->gueste)?intval($req->gueste):0,
+				'home' => intval($req->homee)?intval($req->homee):'',
+				'guest' => intval($req->gueste)?intval($req->gueste):''
 			),
 			"all" => array(
-				'home' => intval($req->homen)?intval($req->homen):0,
-				'guest' => intval($req->guestn)?intval($req->guestn):0,
+				'home' => intval($req->homen)?intval($req->homen):'',
+				'guest' => intval($req->guestn)?intval($req->guestn):'',
 			),
 		);
 
@@ -300,7 +407,7 @@ class SportswqController extends Controller {
 
 		//修改网球比分前的比分数据
 		$res = \App\Models\Stwqresult::where('match_id', $match_id)->first();
-		$scores = json_decode($res['inning'],true);
+		$scores = json_decode($res['manual_result'],true);
 		$process = array();//进程
 		if($scores[1]['home'] != $data[1]['home'] || $scores[1]['guest'] != $data[1]['guest']){
 			$process[] = 'one';
@@ -329,6 +436,7 @@ class SportswqController extends Controller {
 				"home_player_score"=>$data['all']['home'],
 				"guest_player_score"=>$data['all']['guest'],
 				"inning"=>json_encode($data),
+				"manual_result"=>json_encode($data),
 				"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
 				"first_inning_score"=>$data[1]['home'].':'.$data[1]['guest'],
 				"second_inning_score"=>$data[2]['home'].':'.$data[2]['guest'],
@@ -438,6 +546,14 @@ class SportswqController extends Controller {
 		return responseToJson(1); 
 	}
 
+	//获取赛事进程数据
+	function getprocess(Req $req){
+		$type = $req->type;
+
+		$process = commonFunction::getprocess($type);
+		return json_encode($process);
+	}
+
 
 
 }

app/Lib/Biz/Sport/Common.php

@@ -2108,10 +2108,10 @@ class Common
         $process = [];
 
         if($game_code == 'zq'){
-            $process[] = ['process'=>'half','name'=>'结算上半场'];
-            $process[] = ['process'=>'all','name'=>'结算全场'];
             $process[] = ['process'=>'half_corner','name'=>'结算上半场角球'];
             $process[] = ['process'=>'all_corner','name'=>'结算全场角球'];
+            $process[] = ['process'=>'half','name'=>'结算上半场'];
+            $process[] = ['process'=>'all','name'=>'结算全场'];
         }
         if($game_code == 'lq'){
             $process[] = ['process'=>'one','name'=>'结算第一节'];
@@ -2123,10 +2123,26 @@ class Common
             $process[] = ['process'=>'all','name'=>'结算全场'];
         }
         if($game_code == 'wq'){
-            $process[] = '';
+            $process[] = ['process'=>'one','name'=>'结算第一盘'];
+            $process[] = ['process'=>'two','name'=>'结算第二盘'];
+            $process[] = ['process'=>'three','name'=>'结算第三盘'];
+            $process[] = ['process'=>'four','name'=>'结算第四盘'];
+            $process[] = ['process'=>'five','name'=>'结算第五盘'];
+            $process[] = ['process'=>'all','name'=>'结算全场'];
         }
         if($game_code == 'bq'){
-            $process[] = '';
+            $process[] = ['process'=>'one','name'=>'结算第一局'];
+            $process[] = ['process'=>'two','name'=>'结算第二局'];
+            $process[] = ['process'=>'three','name'=>'结算第三局'];
+            $process[] = ['process'=>'four','name'=>'结算第四局'];
+            $process[] = ['process'=>'five','name'=>'结算第五局'];
+            $process[] = ['process'=>'six','name'=>'结算第六局'];
+            $process[] = ['process'=>'seven','name'=>'结算第七局'];
+            $process[] = ['process'=>'eight','name'=>'结算第八局'];
+            $process[] = ['process'=>'nine','name'=>'结算第九局'];
+            $process[] = ['process'=>'other','name'=>'结算第十局'];
+            $process[] = ['process'=>'sfive','name'=>'结算前五局'];
+            $process[] = ['process'=>'all','name'=>'结算全场'];
         }
 
         return $process;

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

@@ -63,12 +63,14 @@
 
     <script type="text/html" id="operation">
         <a href="javascript:;" onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm">赛事结果</a>
-        @{{#if(d.status==2 || d.status==3){ }}
-            @{{#if(d.status==2){ }}
-                <a href="javascript:;" onclick="settlement(@{{d.match_id}},'bq')" class="layui-btn layui-btn-sm">结算</a>
+        @{{#if(d.status==1 || d.status==2 || d.status==3){ }}
+            @{{#if(d.status==1 || d.status==2){ }}
+                {{--<a href="javascript:;" onclick="settlement(@{{d.match_id}},'bq')" class="layui-btn layui-btn-sm">结算</a>--}}
+        <a href="javascript:;" onclick="settleopen(@{{d.match_id}},'bq')" class="layui-btn layui-btn-sm">结算</a>
             @{{#} }}
             @{{#if(d.status==3){ }}
-                <a href="javascript:;" onclick="settlement(@{{d.match_id}},'bq')" class="layui-btn layui-btn-sm">再结算</a>
+                {{--<a href="javascript:;" onclick="settlement(@{{d.match_id}},'bq')" class="layui-btn layui-btn-sm">再结算</a>--}}
+        <a href="javascript:;" onclick="settleopen(@{{d.match_id}},'bq')" class="layui-btn layui-btn-sm">再结算</a>
             @{{#} }}
         @{{#} }}
         <!--
@@ -500,6 +502,79 @@
             layer.close(resultLogOpen)
         }
 
+
+        //layer弹窗开始(结算)
+        let settleOpen = '';
+        function settleopen(match_id,type){
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbq/getprocess',
+                data: {type:type},
+                success: function(data) {
+                    //console.log(type);
+                    let length = data.length;
+
+                    let html = '<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;width:60%;"><div><input class="checkall" type="checkbox" onclick="oncheck()">全选</div><input id="match_id" type="hidden" value="'+match_id+'"><input id="game_type" type="hidden" value="'+type+'">';
+                    let info = '';
+                    html += '<div style="height: 100px;"><ul>';
+                    for(let i=0; i<length; i++){
+
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+
+                    }
+
+                    html += '</div></ul><br><div><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="settleClick()"><h3>确定</h3></button>&nbsp;<button onclick="seClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+
+                    settleOpen = layer.open({
+                        type: 1 //Page层类型
+                        ,area: ['500px', '40%']
+                        ,title: '<h2>结算<h2>'
+                        ,shade: 0.6 //遮罩透明度
+                        ,maxmin: true //允许全屏最小化
+                        ,anim: 1 //0-6的动画形式，-1不开启
+                        ,content:html
+                    });
+                }
+            })
+        }
+
+        function seClick() {
+            layer.close(settleOpen)
+        }
+
+        function settleClick(){
+            obj = document.getElementsByClassName("checkone");
+            var match_id = $("#match_id").val();
+            var type = $("#game_type").val();
+            process = [];
+            for(k in obj){
+                if(obj[k].checked)
+                    process.push(obj[k].value);
+            }
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbq/Settlement1',
+                data: {process:process,match_id:match_id,type:type},
+                success: function(data) {
+                    //console.log(data);
+                    layer.msg(data.msg);
+                    location. reload()//刷新当前页面
+                }
+            })
+        }
+
+        //结算弹框全选/取消
+        function oncheck() {
+            console.log(1);
+            if($('.checkall').is(':checked')==true){
+                $('.checkone').prop('checked',true);
+            }else{
+                $('.checkone').prop('checked',false);
+            }
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

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

@@ -55,12 +55,14 @@
 
     <script type="text/html" id="operation">
         <a href="javascript:;" onclick="addResult(@{{d.match_id}})" class="layui-btn layui-btn-sm">赛事结果</a>
-        @{{#if(d.status==2 || d.status==3){ }}
-            @{{#if(d.status==2){ }}
-                <a href="javascript:;" onclick="settlement(@{{d.match_id}},'wq')" class="layui-btn layui-btn-sm">结算</a>
+        @{{#if(d.status==1 || d.status==2 || d.status==3){ }}
+            @{{#if(d.status==1 || d.status==2){ }}
+                {{--<a href="javascript:;" onclick="settlement(@{{d.match_id}},'wq')" class="layui-btn layui-btn-sm">结算</a>--}}
+        <a href="javascript:;" onclick="settleopen(@{{d.match_id}},'wq')" class="layui-btn layui-btn-sm">结算</a>
             @{{#} }}
             @{{#if(d.status==3){ }}
-                <a href="javascript:;" onclick="settlement(@{{d.match_id}},'wq')" class="layui-btn layui-btn-sm">再结算</a>
+                {{--<a href="javascript:;" onclick="settlement(@{{d.match_id}},'wq')" class="layui-btn layui-btn-sm">再结算</a>--}}
+        <a href="javascript:;" onclick="settleopen(@{{d.match_id}},'wq')" class="layui-btn layui-btn-sm">再结算</a>
             @{{#} }}
         @{{#} }}
         <!--
@@ -438,6 +440,79 @@
             layer.close(resultLogOpen)
         }
 
+
+        //layer弹窗开始(结算)
+        let settleOpen = '';
+        function settleopen(match_id,type){
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportswq/getprocess',
+                data: {type:type},
+                success: function(data) {
+                    //console.log(type);
+                    let length = data.length;
+
+                    let html = '<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;width:60%;"><div><input class="checkall" type="checkbox" onclick="oncheck()">全选</div><input id="match_id" type="hidden" value="'+match_id+'"><input id="game_type" type="hidden" value="'+type+'">';
+                    let info = '';
+                    html += '<div style="height: 100px;"><ul>';
+                    for(let i=0; i<length; i++){
+
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+
+                    }
+
+                    html += '</div></ul><br><div><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="settleClick()"><h3>确定</h3></button>&nbsp;<button onclick="seClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+
+                    settleOpen = layer.open({
+                        type: 1 //Page层类型
+                        ,area: ['500px', '40%']
+                        ,title: '<h2>结算<h2>'
+                        ,shade: 0.6 //遮罩透明度
+                        ,maxmin: true //允许全屏最小化
+                        ,anim: 1 //0-6的动画形式，-1不开启
+                        ,content:html
+                    });
+                }
+            })
+        }
+
+        function seClick() {
+            layer.close(settleOpen)
+        }
+
+        function settleClick(){
+            obj = document.getElementsByClassName("checkone");
+            var match_id = $("#match_id").val();
+            var type = $("#game_type").val();
+            process = [];
+            for(k in obj){
+                if(obj[k].checked)
+                    process.push(obj[k].value);
+            }
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportswq/Settlement1',
+                data: {process:process,match_id:match_id,type:type},
+                success: function(data) {
+                    //console.log(data);
+                    layer.msg(data.msg);
+                    location. reload()//刷新当前页面
+                }
+            })
+        }
+
+        //结算弹框全选/取消
+        function oncheck() {
+            console.log(1);
+            if($('.checkall').is(':checked')==true){
+                $('.checkone').prop('checked',true);
+            }else{
+                $('.checkone').prop('checked',false);
+            }
+        }
+
 	</script>
 @push('dataTableJS')
 /*var active = {

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

@@ -679,12 +679,12 @@
                     //console.log(type);
                     let length = data.length;
 
-                    let html = '<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;width:60%;"><div style="margin-left:-10px;"><input class="checkall" type="checkbox" onclick="oncheck()">全选</div><input id="match_id" type="hidden" value="'+match_id+'"><input id="game_type" type="hidden" value="'+type+'">';
+                    let html = '<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;width:60%;"><div><input class="checkall" type="checkbox" onclick="oncheck()">全选</div><input id="match_ids" type="hidden" value="'+match_id+'"><input id="game_type" type="hidden" value="'+type+'">';
                     let info = '';
                     html += '<div style="height: 100px;"><ul>';
                     for(let i=0; i<length; i++){
 
-                        html +='<li style="float: left;margin-left: 10px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
 
                     }
 
@@ -692,7 +692,7 @@
 
                     settleOpen = layer.open({
                         type: 1 //Page层类型
-                        ,area: ['500px', '40%']
+                        ,area: ['500px', '45%']
                         ,title: '<h2>结算<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化
@@ -709,7 +709,7 @@
 
         function settleClick(){
             obj = document.getElementsByClassName("checkone");
-            var match_id = $("#match_id").val();
+            var match_id = $("#match_ids").val();
             var type = $("#game_type").val();
             process = [];
             for(k in obj){

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

@@ -226,8 +226,8 @@
                 url: '/admin/Sportsfoot/Matchresult',
                 data: {match_id:match_id},
                 success: function(data) {
-                    console.log(data);
-                    conttxt ='<div id="scores" style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'" /><div style="display: flex;"><li>主队全场角球：</li><input type="text" id="homeallcorner" name="homeallcorner" value="'+data.manual_result.all_corner.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球：</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.manual_result.all_corner.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球：</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.manual_result.half_corner.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球：</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.manual_result.half_corner.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌：</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.manual_result.all_penalty.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌：</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.manual_result.all_penalty.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌：</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.manual_result.half_penalty.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌：</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.manual_result.half_penalty.guest+'" autocomplete="off"></div>';
+                    //console.log(data);
+                    conttxt ='<div id="scores" style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><input type="hidden" id="matchid" name="matchid" value="'+match_id+'"><div style="display: flex;"><li>主队全场角球：</li><input type="text" id="homeallcorner" name="homeallcorner" value="'+data.manual_result.all_corner.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场角球：</li><input type="text" id="guestallcorner" name="guestallcorner" value="'+data.manual_result.all_corner.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场角球：</li><input type="text" id="homehalfcorner" name="homehalfcorner" value="'+data.manual_result.half_corner.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场角球：</li><input type="text" id="guesthalfcorner" name="guesthalfcorner" value="'+data.manual_result.half_corner.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队全场罚牌：</li><input type="text" id="homeallcard" name="homeallcard" value="'+data.manual_result.all_penalty.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队全场罚牌：</li><input type="text" id="guestallcard" name="guestallcard" value="'+data.manual_result.all_penalty.guest+'" autocomplete="off"></div><div style="display: flex;"><li>主队半场罚牌：</li><input type="text" id="homehalfcard" name="homehalfcard" value="'+data.manual_result.half_penalty.home+'" autocomplete="off"></div><div style="display: flex;"><li>客队半场罚牌：</li><input type="text" id="guesthalfcard" name="guesthalfcard" value="'+data.manual_result.half_penalty.guest+'" autocomplete="off"></div>';
                     if (data.newapp.home_score!=0 || data.newapp.guest_score!=0){
                         conttxt += '<div style="display: flex;"><li>首 进 球 时 间：</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.manual_result.first_score.time+'" autocomplete="off"></div>';
 //                        conttxt += '<div style="display: flex;"><li>首 进 球 时 间：</li><input type="text" id="onescoretime" name="onescoretime" value="'+data.first_score.scoretime+'" autocomplete="off"></div><div style="display: flex;"><li>最终获胜球队：</li><input type="text" id="matchwiner" name="matchwiner" value="'+data.newapp.match_winer+'" autocomplete="off"></div><div style="display: flex;"><li>最先进球球队：</li><select name="firstscore" id="firstscore">';
@@ -267,9 +267,9 @@
                       ,content:conttxt
                     });
 
-                    if(data.newapp.status == 0 || data.newapp.status == 1 || data.newapp.status == 6){
-                        $('#scores input').val('');
-                    }
+//                    if(data.newapp.status == 0 || data.newapp.status == 1 || data.newapp.status == 6){
+//                        $('#scores input').val('');
+//                    }
                 }
             })
         }
@@ -298,7 +298,7 @@
             var homeall = $("#homeall").val();
             var guestall = $("#guestall").val();
             var reg = /^[0-99]\d*$/;
-
+            console.log(matchid);
             if(homehalf == -1 && guesthalf != -1 || homehalf != -1 && guesthalf == -1 || homehalf<-1 || guesthalf<-1){
                 layer.alert('请输入正确的上半场比分');
                 return false;
@@ -311,33 +311,45 @@
             $.ajax({
                 type: 'POST',
                 dataType: 'json',
-                url: '/admin/Sportsfoot/onlyresult',
-                data: {matchid:matchid},
+                url: '/admin/Sportsfoot/addend',
+                data: {matchid:matchid,firstscore:firstscore,onescoretime:onescoretime,firststye:firststye,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner,homehalf:homehalf,guesthalf:guesthalf,homeall:homeall,guestall:guestall},
                 success: function(data) {
-                    var allnum = data.home_score+ data.guest_score;
-
-//                    if(allnum>0){
-//                        if(firstscore.length==0){
-//                            alert("请输入最先进球");return;
-//                        }
-//                        if(lastscore.length==0){
-//                            alert("请输入最后进球");return;
-//                        }
-//                    }
+                    layer.msg(data.msg);
+                    location. reload()//刷新当前页面
 
-                    $.ajax({
-                            type: 'POST',
-                            dataType: 'json',
-                            url: '/admin/Sportsfoot/addend',
-                            data: {matchid:matchid,firstscore:firstscore,onescoretime:onescoretime,firststye:firststye,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner,homehalf:homehalf,guesthalf:guesthalf,homeall:homeall,guestall:guestall},
-                            success: function(data) {
-                                    layer.msg(data.msg);
-                                    location. reload()//刷新当前页面
-
-                            }
-                        })
                 }
             })
+
+//            $.ajax({
+//                type: 'POST',
+//                dataType: 'json',
+//                url: '/admin/Sportsfoot/onlyresult',
+//                data: {matchid:matchid},
+//                success: function(data) {
+//                    var allnum = data.home_score+ data.guest_score;
+//
+////                    if(allnum>0){
+////                        if(firstscore.length==0){
+////                            alert("请输入最先进球");return;
+////                        }
+////                        if(lastscore.length==0){
+////                            alert("请输入最后进球");return;
+////                        }
+////                    }
+//
+//                    $.ajax({
+//                            type: 'POST',
+//                            dataType: 'json',
+//                            url: '/admin/Sportsfoot/addend',
+//                            data: {matchid:matchid,firstscore:firstscore,onescoretime:onescoretime,firststye:firststye,lastscore:lastscore,matchwiner:matchwiner,homeallcard:homeallcard,guestallcard:guestallcard,homehalfcard:homehalfcard,guesthalfcard:guesthalfcard,homeallcorner:homeallcorner,guestallcorner:guestallcorner,homehalfcorner:homehalfcorner,guesthalfcorner:guesthalfcorner,homehalf:homehalf,guesthalf:guesthalf,homeall:homeall,guestall:guestall},
+//                            success: function(data) {
+//                                    layer.msg(data.msg);
+//                                    location. reload()//刷新当前页面
+//
+//                            }
+//                        })
+//                }
+//            })
         }
 
         //刷新赛事数据
@@ -541,15 +553,16 @@
                     //console.log(type);
                     let length = data.length;
 
-                    let html = '<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;"><div style="margin-left:-10px;"><input class="checkall" type="checkbox" onclick="oncheck()">全选</div><input id="match_id" type="hidden" value="'+match_id+'"><input id="game_type" type="hidden" value="'+type+'">';
+                    let html = '<div style="margin-left:100px;margin-top:20px;font-size:18px;line-height:150%;width:60%;"><div><input class="checkall" type="checkbox" onclick="oncheck()">全选</div><input id="match_id" type="hidden" value="'+match_id+'"><input id="game_type" type="hidden" value="'+type+'">';
                     let info = '';
+                    html += '<div style="height: 100px;"><ul>';
                     for(let i=0; i<length; i++){
 
-                        html +='<li><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
+                        html +='<li style="float: left;margin-left: 20px;"><input class="checkone" type="checkbox" value="'+data[i]['process']+'">'+data[i]['name']+'</li>';
 
                     }
 
-                    html += '<br><div><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="settleClick()"><h3>确定</h3></button>&nbsp;<button onclick="seClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
+                    html += '</div></ul><br><div><button class="layui-btn layui-btn-sm set" id="buttonClick" onclick="settleClick()"><h3>确定</h3></button>&nbsp;<button onclick="seClick()" class="layui-btn layui-btn-sm layui-btn-danger" id="reset"><h3>取消</h3></button></div></div>';
 
                     settleOpen = layer.open({
                         type: 1 //Page层类型