异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -87,32 +87,32 @@ class SportsbkController extends Controller {
 
 		$data = array(
 			"1" => array(
-				'home' => intval($req->homeo)?intval($req->homeo):0,
-				'guest' => intval($req->guesto)?intval($req->guesto):0,
+				'home' => strlen($req->homeo)?$req->homeo:'',
+				'guest' => strlen($req->guesto)?$req->guesto:'',
 			),
 			"2" => array(
-				'home' => intval($req->homet)?intval($req->homet):0,
-				'guest' => intval($req->guestt)?intval($req->guestt):0,
+				'home' => strlen($req->homet)?$req->homet:'',
+				'guest' => strlen($req->guestt)?$req->guestt:'',
 			),
 			"3" => array(
-				'home' => intval($req->homes)?intval($req->homes):0,
-				'guest' => intval($req->guests)?intval($req->guests):0,
+				'home' => strlen($req->homes)?$req->homes:'',
+				'guest' => strlen($req->guests)?$req->guests:'',
 			),
 			"4" => array(
-				'home' => intval($req->homef)?intval($req->homef):0,
-				'guest' => intval($req->guestf)?intval($req->guestf):0,
+				'home' => strlen($req->homef)?$req->homef:'',
+				'guest' => strlen($req->guestf)?$req->guestf:'',
 			),
 			"5" => array(
-				'home' => intval($req->homeu)?intval($req->homeu):0,
-				'guest' => intval($req->guestu)?intval($req->guestu):0,
+				'home' => strlen($req->homeu)?$req->homeu:'',
+				'guest' => strlen($req->guestu)?$req->guestu:'',
 			),
 			"6" => array(
-				'home' => intval($req->homeb)?intval($req->homeb):0,
-				'guest' => intval($req->guestb)?intval($req->guestb):0,
+				'home' => strlen($req->homeb)?$req->homeb:'',
+				'guest' => strlen($req->guestb)?$req->guestb:'',
 			),
 			"all" => array(
-				'home' => intval($req->homen)?intval($req->homen):0,
-				'guest' => intval($req->guestn)?intval($req->guestn):0,
+				'home' => strlen($req->homen)?$req->homen:'',
+				'guest' => strlen($req->guestn)?$req->guestn:'',
 			),
 		);
 //		$array = array();
@@ -123,7 +123,7 @@ class SportsbkController extends Controller {
 
 		//修改蓝球比分前的比分数据
 		$res = \App\Models\Stlqresult::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';
@@ -151,28 +151,28 @@ class SportsbkController extends Controller {
 			//赛事下注单作废 处理
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'lq',$process);
 
-			$guestscore =array(
-				'1' => $data[1]['guest'],//第一节客队比分
-				'2' => $data[2]['guest'],//第二节客队比分
-				'3' => $data[3]['guest'],//第三节客队比分
-				'4' => $data[4]['guest'],//第四节客队比分
-			);
-			$homescore =array(
-				'1' => $data[1]['home'],//第一节客队比分
-				'2' => $data[2]['home'],//第二节客队比分
-				'3' => $data[3]['home'],//第三节客队比分
-				'4' => $data[4]['home'],//第四节客队比分
-			);
+//			$guestscore =array(
+//				'1' => $data[1]['guest'],//第一节客队比分
+//				'2' => $data[2]['guest'],//第二节客队比分
+//				'3' => $data[3]['guest'],//第三节客队比分
+//				'4' => $data[4]['guest'],//第四节客队比分
+//			);
+//			$homescore =array(
+//				'1' => $data[1]['home'],//第一节客队比分
+//				'2' => $data[2]['home'],//第二节客队比分
+//				'3' => $data[3]['home'],//第三节客队比分
+//				'4' => $data[4]['home'],//第四节客队比分
+//			);
 			$updatainfo = [
-				"home_score"=>json_encode($homescore),
-				"guest_score"=>json_encode($guestscore),
+//				"home_score"=>json_encode($homescore),
+//				"guest_score"=>json_encode($guestscore),
 				"inning"=>json_encode($data),
 				"manual_result"=>json_encode($data),
-				"u_home_score"=>$data[5]['home'],
-				"u_guest_score"=>$data[5]['guest'],
-				"s_home_score"=>$data[6]['home'],
-				"s_guest_score"=>$data[6]['guest'],
-				"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
+//				"u_home_score"=>$data[5]['home'],
+//				"u_guest_score"=>$data[5]['guest'],
+//				"s_home_score"=>$data[6]['home'],
+//				"s_guest_score"=>$data[6]['guest'],
+//				"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
 				'is_correct'=>1
 			];
 
@@ -182,11 +182,11 @@ class SportsbkController extends Controller {
 			$addnew->addcomendnotice($match_id,'lq');
 
 			//赛事下所有注单状态都改变时，修改赛事，赛事结果状态
-			if(count($process) == count($data)){
+			if($match_status != 0 && $match_status != 1){
 				$twoapp = new \App\Models\SportsBasket();
-				$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+				$twoapp->updatestatus('id',$match_id,['status'=>0,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
 				$newapp = new \App\Models\Stlqresult();
-				$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
+				$newapp->updatestatus('match_id',$match_id,['status'=>0,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
 			}
 
 			//添加赛事结果记录
@@ -197,8 +197,8 @@ class SportsbkController extends Controller {
 			if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
 				\App\Models\Stlqresultlog::insert([
 					'match_id' => $match_id,
-					'home_score' => json_encode($homescore),
-					'guest_score' => json_encode($guestscore),
+//					'home_score' => json_encode($homescore),
+//					'guest_score' => json_encode($guestscore),
 					'inning' => json_encode($data),
 					'user_id' => session('adminInfo.admin_id'),
 					'type' => 1,

app/Http/Controllers/Admin/SportsbqController.php

@@ -364,52 +364,52 @@ class SportsbqController extends Controller {
 
 		$uscore = array(
             "1" => array(
-                'home' => intval($req->homea)?intval($req->homea):1,
-                'guest' => intval($req->guesta)?intval($req->guesta):0,
+                'home' => strlen($req->homea)?$req->homea:'',
+                'guest' => strlen($req->guesta)?$req->guesta:'',
             ),
             "2" => array(
-                'home' => intval($req->homeb)?intval($req->homeb):0,
-                'guest' => intval($req->guestb)?intval($req->guestb):0,
+                'home' => strlen($req->homeb)?$req->homeb:'',
+                'guest' => strlen($req->guestb)?$req->guestb:'',
             ),
             "3" => array(
-                'home' => intval($req->homec)?intval($req->homec):0,
-                'guest' => intval($req->guestc)?intval($req->guestc):0,
+                'home' => strlen($req->homec)?$req->homec:'',
+                'guest' => strlen($req->guestc)?$req->guestc:'',
             ),
             "4" => array(
-                'home' => intval($req->homed)?intval($req->homed):0,
-                'guest' => intval($req->guestd)?intval($req->guestd):0,
+                'home' => strlen($req->homed)?$req->homed:'',
+                'guest' => strlen($req->guestd)?$req->guestd:'',
             ),
             "5" => array(
-                'home' => intval($req->homee)?intval($req->homee):0,
-                'guest' => intval($req->gueste)?intval($req->gueste):0,
+                'home' => strlen($req->homee)?$req->homee:'',
+                'guest' => strlen($req->gueste)?$req->gueste:'',
             ),
             "6" => array(
-                'home' => intval($req->homef)?intval($req->homef):0,
-                'guest' => intval($req->guestf)?intval($req->guestf):0,
+                'home' => strlen($req->homef)?$req->homef:'',
+                'guest' => strlen($req->guestf)?$req->guestf:'',
             ),
             "7" => array(
-                'home' => intval($req->homeg)?intval($req->homeg):0,
-                'guest' => intval($req->guestg)?intval($req->guestg):0,
+                'home' => strlen($req->homeg)?$req->homeg:'',
+                'guest' => strlen($req->guestg)?$req->guestg:'',
             ),
             "8" => array(
-                'home' => intval($req->homeh)?intval($req->homeh):0,
-                'guest' => intval($req->guesth)?intval($req->guesth):0,
+                'home' => strlen($req->homeh)?$req->homeh:'',
+                'guest' => strlen($req->guesth)?$req->guesth:'',
             ),
             "9" => array(
-                'home' => intval($req->homei)?intval($req->homei):0,
-                'guest' => intval($req->guesti)?intval($req->guesti):0,
+                'home' => strlen($req->homei)?$req->homei:'',
+                'guest' => strlen($req->guesti)?$req->guesti:'',
             ),
             "other" => array(
-                'home' => intval($req->homej)?intval($req->homej):0,
-                'guest' => intval($req->guestj)?intval($req->guestj):0,
+                'home' => strlen($req->homej)?$req->homej:'',
+                'guest' => strlen($req->guestj)?$req->guestj:'',
             ),
 			"five" => array(
-				'home' => intval($req->homek)?intval($req->homek):0,
-				'guest' => intval($req->guestk)?intval($req->guestk):0,
+				'home' => strlen($req->homek)?$req->homek:'',
+				'guest' => strlen($req->guestk)?$req->guestk:'',
 			),
 			"all" => array(
-				'home' => intval($req->homel)?intval($req->homel):0,
-				'guest' => intval($req->guestl)?intval($req->guestl):0,
+				'home' => strlen($req->homel)?$req->homel:'',
+				'guest' => strlen($req->guestl)?$req->guestl:'',
 			),
         );
 //		foreach($uscore as $key){
@@ -462,13 +462,13 @@ class SportsbqController extends Controller {
 			commonFunction::HandleInvalid($uscore,$match_id,$match_status,'bq',$process);
 
 			$updatainfo = [
-				"home_score"=>$uscore['all']['home'],
-				"guest_score"=>$uscore['all']['guest'],
-				"match_score_t"=>json_encode($uscore),
+//				"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'],
+//				"match_score"=>$uscore['all']['home'].':'.$uscore['all']['guest'],
+//				"u_home_score"=>$uscore['five']['home'],
+//				"u_guest_score"=>$uscore['five']['guest'],
 				'is_correct'=>1,
 			];
 			\App\Models\Stbqresult::where('match_id', $match_id)->update($updatainfo);

app/Http/Controllers/Admin/SportsfootController.php

@@ -608,42 +608,41 @@ class SportsfootController extends Controller {
 		$model = \App\Models\Stzqresult::where('match_id', $match_id)->first();
 		$match = \App\Models\SportsSoccer::where('id', $match_id)->first();
 		$match_status = $match['status'];
-
 		$data = array(
 			//上半场角球
 			"half_corner" => array(
-				'home' => intval($req->homehalfcorner)?intval($req->homehalfcorner):'',
-				'guest' => intval($req->guesthalfcorner)?intval($req->guesthalfcorner):'',
+				'home' => strlen($req->homehalfcorner)?$req->homehalfcorner:'',
+				'guest' => strlen($req->guesthalfcorner)?$req->guesthalfcorner:'',
 			),
 			//全场角球
 			"all_corner" => array(
-				'home' => intval($req->homeallcorner)?intval($req->homeallcorner):'',
-				'guest' => intval($req->guestallcorner)?intval($req->guestallcorner):'',
+				'home' => strlen($req->homeallcorner)?$req->homeallcorner:'',
+				'guest' => strlen($req->guestallcorner)?$req->guestallcorner:'',
 			),
 			//上半场罚牌
 			"half_penalty" => array(
-				'home' => intval($req->homehalfcard)?intval($req->homehalfcard):'',
-				'guest' => intval($req->guesthalfcard)?intval($req->guesthalfcard):'',
+				'home' => strlen($req->homehalfcard)?$req->homehalfcard:'',
+				'guest' => strlen($req->guesthalfcard)?$req->guesthalfcard:'',
 			),
 			//全场罚牌
 			"all_penalty" => array(
-				'home' => intval($req->homeallcard)?intval($req->homeallcard):'',
-				'guest' => intval($req->guestallcard)?intval($req->guestallcard):'',
+				'home' => strlen($req->homeallcard)?$req->homeallcard:'',
+				'guest' => strlen($req->guestallcard)?$req->guestallcard:'',
 			),
 			//首进球时间
 			"first_score" => array(
-				'time' => intval($req->onescoretime)?intval($req->onescoretime):'',
+				'time' => strlen($req->onescoretime)?$req->onescoretime:'',
 			),
 
 			//上半场比分
 			"half" => array(
-				'home' => intval($req->homehalf)?intval($req->homehalf):'',
-				'guest' => intval($req->guesthalf)?intval($req->guesthalf):'',
+				'home' => strlen($req->homehalf)?$req->homehalf:'',
+				'guest' => strlen($req->guesthalf)?$req->guesthalf:'',
 			),
 			//全场比分
 			"all" => array(
-				'home' => intval($req->homeall)?intval($req->homeall):'',
-				'guest' => intval($req->guestall)?intval($req->guestall):'',
+				'home' => strlen($req->homeall)>0?$req->homeall:'',
+				'guest' => strlen($req->guestall)>0?$req->guestall:'',
 			),
 		);
 //		foreach($data as $key){
@@ -740,7 +739,7 @@ class SportsfootController extends Controller {
 			$update = $this->addcomendnotice($match_id);
 
 			//赛事下所有注单状态都改变时，修改赛事，赛事结果状态
-			if(count($process) == count($data)){
+			if($match_status != 0 && $match_status != 1){
 				$twoapp = new \App\Models\SportsSoccer();
 				$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
 				$newapp = new \App\Models\Stzqresult();
@@ -752,27 +751,12 @@ class SportsfootController extends Controller {
 				['match_id', $match_id],
 				['type', 1]
 			])->orderBy('id', 'desc')->first();
-			if(empty($lastLog) || !($lastLog['penalty_card'] == $model->penalty_card
-					&& $lastLog['corner_ball'] == $model->corner_ball
-					&& $lastLog['first_score'] == $model->first_score
-					&& $lastLog['last_score'] == $model->last_score
-					&& $lastLog['match_winer'] == $model->match_winer
-					&& $lastLog['u_home_score'] == $data['half']['home']
-					&& $lastLog['u_guest_score'] == $data['half']['guest']
-					&& $lastLog['home_score'] == $data['all']['home']
-					&& $lastLog['guest_score'] == $data['all']['guest']
-				)){
+			if(empty($lastLog) || $lastLog['manual_result'] != json_encode($data)){
 				\App\Models\Stzqresultlog::insert([
-					'u_home_score' => $data['half']['home'],
-					'u_guest_score' => $data['half']['guest'],
-					'home_score' => $data['all']['home'],
-					'guest_score' => $data['all']['guest'],
 					'match_id' => $match_id,
-					'penalty_card' => $model->penalty_card ,
-					'corner_ball' => $model->corner_ball,
-					'first_score' => $model->first_score,
-					'last_score' => $model->last_score,
-					'match_winer' => $model->match_winer,
+//					'home_score' => json_encode($homescore),
+//					'guest_score' => json_encode($guestscore),
+					'manual_result' => json_encode($data),
 					'user_id' => session('adminInfo.admin_id'),
 					'type' => 1,
 					'create_at' => now()
@@ -806,6 +790,7 @@ class SportsfootController extends Controller {
             $list[$key]['penalty_card'] = json_decode($value['penalty_card'], true);
             $list[$key]['corner_ball'] = json_decode($value['corner_ball'], true);
             $list[$key]['first_score'] = empty($value['first_score']) ? '' : json_decode($value['first_score'], true);
+			$list[$key]['manual_result'] = empty($value['manual_result']) ? '' : json_decode($value['manual_result'], true);
         }
         $result =array(
             'status' => 200,

app/Http/Controllers/Admin/SportswqController.php

@@ -375,28 +375,28 @@ class SportswqController extends Controller {
 
 		$data = array(
 			"1" => array(
-				'home' => intval($req->homeo)?intval($req->homeo):'',
-				'guest' => intval($req->guesto)?intval($req->guesto):'',
+				'home' => strlen($req->homeo)?$req->homeo:'',
+				'guest' => strlen($req->guesto)?$req->guesto:'',
 			),
 			"2" => array(
-				'home' => intval($req->homet)?intval($req->homet):'',
-				'guest' => intval($req->guestt)?intval($req->guestt):'',
+				'home' => strlen($req->homet)?$req->homet:'',
+				'guest' => strlen($req->guestt)?$req->guestt:'',
 			),
 			"3" => array(
-				'home' => intval($req->homes)?intval($req->homes):'',
-				'guest' => intval($req->guests)?intval($req->guests):'',
+				'home' => strlen($req->homes)?$req->homes:'',
+				'guest' => strlen($req->guests)?$req->guests:'',
 			),
 			"4" => array(
-				'home' => intval($req->homef)?intval($req->homef):'',
-				'guest' => intval($req->guestf)?intval($req->guestf):'',
+				'home' => strlen($req->homef)?$req->homef:'',
+				'guest' => strlen($req->guestf)?$req->guestf:'',
 			),
 			"5" => array(
-				'home' => intval($req->homee)?intval($req->homee):'',
-				'guest' => intval($req->gueste)?intval($req->gueste):''
+				'home' => strlen($req->homee)?$req->homee:'',
+				'guest' => strlen($req->gueste)?$req->gueste:''
 			),
 			"all" => array(
-				'home' => intval($req->homen)?intval($req->homen):'',
-				'guest' => intval($req->guestn)?intval($req->guestn):'',
+				'home' => strlen($req->homen)?$req->homen:'',
+				'guest' => strlen($req->guestn)?$req->guestn:'',
 			),
 		);
 
@@ -427,20 +427,18 @@ class SportswqController extends Controller {
 		if($scores['all']['home'] != $data['all']['home'] || $scores['all']['guest'] != $data['all']['guest']){
 			$process[] = 'all';
 		}
-
 		if(!empty($process)){
 			//赛事下注单作废 处理
 			commonFunction::HandleInvalid($data,$match_id,$match_status,'wq',$process);
-
 			$updatainfo = [
-				"home_player_score"=>$data['all']['home'],
-				"guest_player_score"=>$data['all']['guest'],
+//			"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'],
-				"third_inning_score"=>$data[3]['home'].':'.$data[3]['guest'],
+//			"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'],
+//			"third_inning_score"=>$data[3]['home'].':'.$data[3]['guest'],
 				'is_correct'=>1
 			];
 
@@ -472,7 +470,6 @@ class SportswqController extends Controller {
 				]);
 			}
 		}
-
         return responseToJson(1);
 	}
 

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

@@ -226,9 +226,9 @@
                       ,anim: 1 //0-6的动画形式，-1不开启
                       ,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('');
+//                    }
                 }
             }) 
         }

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

@@ -218,9 +218,9 @@
                       ,anim: 1 //0-6的动画形式，-1不开启
                       ,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('');
+//                    }
                 }
             }) 
         }

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

@@ -406,9 +406,9 @@
                         ,anim: 1 //0-6的动画形式，-1不开启
                         ,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('');
+//                    }
                 }
             })
         }

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

@@ -298,7 +298,6 @@
             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;
@@ -459,7 +458,7 @@
                 url: '/admin/Sportsfoot/resultLog',
                 data: {match_id:match_id},
                 success: function(data) {
-                    //console.log(data);
+                    console.log(data);
                     let length = data.list.length;
                     if(length <= 0){
                         layer.alert('该赛事还没有比分记录');
@@ -486,14 +485,14 @@
                                 '<td>客队半场罚球</td>' +
                                 '</tr>' +
                                 '<tr>' +
-                                '<td>'+info['corner_ball']['home']+'</td>' +
-                                '<td>'+info['corner_ball']['guest']+'</td>' +
-                                '<td>'+info['corner_ball']['home_half']+'</td>' +
-                                '<td>'+info['corner_ball']['guest_half']+'</td>' +
-                                '<td>'+info['penalty_card']['home']+'</td>' +
-                                '<td>'+info['penalty_card']['guest']+'</td>' +
-                                '<td>'+info['penalty_card']['home_half']+'</td>' +
-                                '<td>'+info['penalty_card']['guest_half']+'</td>' +
+                                '<td>'+info['manual_result']['all_corner']['home']+'</td>' +
+                                '<td>'+info['manual_result']['all_corner']['guest']+'</td>' +
+                                '<td>'+info['manual_result']['half_corner']['home']+'</td>' +
+                                '<td>'+info['manual_result']['half_corner']['guest']+'</td>' +
+                                '<td>'+info['manual_result']['all_penalty']['home']+'</td>' +
+                                '<td>'+info['manual_result']['all_penalty']['guest']+'</td>' +
+                                '<td>'+info['manual_result']['half_penalty']['home']+'</td>' +
+                                '<td>'+info['manual_result']['half_penalty']['guest']+'</td>' +
                                 '</tr>' +
                                 '<tr>' +
                                 '<td>首进球时间</td>' +
@@ -505,19 +504,19 @@
                                 '<td>全场比分</td>' +
                                 '</tr>' +
                                 '<tr>' +
-                                '<td>'+info['first_score']['scoretime']+'</td>' +
+                                '<td>'+info['manual_result']['first_score']['time']+'</td>' +
 //                                '<td>'+info['match_winer']+'</td>' +
 //                                '<td>'+info['first_score']['teamscore']+'</td>' +
 //                                '<td>'+info['first_score']['scoretype']+'</td>' +
 //                                '<td>'+info['match_winer']+'</td>' +
-                                '<td>'+info['u_home_score']+' / '+info['u_guest_score']+'</td>' +
-                                '<td>'+info['home_score']+' / '+info['guest_score']+'</td>' +
+                                '<td>'+info['manual_result']['half']['home']+' / '+info['manual_result']['half']['guest']+'</td>' +
+                                '<td>'+info['manual_result']['all']['home']+' / '+info['manual_result']['all']['guest']+'</td>' +
                                 '</tr>' +
                                 '</table></div></div><hr>';
                         }else{ //结果
                             html +='<div style="margin-left: 20px"><div class="log_head_div"><span class="log_title">修改人</span>：'+info['loginname']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加时间：</span>'+info['create_at']+'&nbsp;&nbsp;&nbsp;<span class="log_title">添加类型</span>：赛事比分</div>'
-                                +'<div>上半场比分(主/客)：'+info['u_home_score']+'&nbsp;/&nbsp;'+info['u_guest_score']+'</div>'
-                                +'<div>整场比分(主/客)：'+info['home_score']+'&nbsp;/&nbsp;'+info['guest_score']+'</div></div><hr>';
+                                +'<div>上半场比分(主/客)：'+info['manual_result']['half']['home']+'&nbsp;/&nbsp;'+info['manual_result']['half']['guest']+'</div>'
+                                +'<div>整场比分(主/客)：'+info['manual_result']['all']['home']+'&nbsp;/&nbsp;'+info['manual_result']['all']['guest']+'</div></div><hr>';
                         }
                     }