追加推送 6/12

app/Http/Controllers/Admin/BaseLeagueController.php

@@ -165,9 +165,13 @@ class BaseLeagueController extends Controller {
             $model = $model::find($model->id);
             if(!empty($req->input('country_id'))){
                 $model->country_id = $req->input('country_id');
+            }else{
+                $model->country_id = 0;
             }
             if(!empty($req->input('area_id'))){
                 $model->area_id = $req->input('area_id');
+            }else{
+                $model->area_id = 0;
             }
             $model->status = $req->input('status');
             $model->utime = date('Y-m-d H:i:s',time());

app/Http/Controllers/Admin/BasketLeagueController.php

@@ -165,9 +165,13 @@ class BasketLeagueController extends Controller {
             $model = $model::find($model->id);
             if(!empty($req->input('country_id'))){
                 $model->country_id = $req->input('country_id');
+            }else{
+                $model->country_id = 0;
             }
             if(!empty($req->input('area_id'))){
                 $model->area_id = $req->input('area_id');
+            }else{
+                $model->area_id = 0;
             }
             $model->status = $req->input('status');
             $model->utime = date('Y-m-d H:i:s',time());

app/Http/Controllers/Admin/SoccerLeagueController.php

@@ -164,9 +164,13 @@ class SoccerLeagueController extends Controller {
             $model = $model::find($model->id);
             if(!empty($req->input('country_id'))){
                 $model->country_id = $req->input('country_id');
+            }else{
+                $model->country_id = 0;
             }
             if(!empty($req->input('area_id'))){
                 $model->area_id = $req->input('area_id');
+            }else{
+                $model->area_id = 0;
             }
             $model->status = $req->input('status');
             $model->utime = date('Y-m-d H:i:s',time());

app/Http/Controllers/Admin/SportsbkController.php

@@ -12,7 +12,7 @@ use Request;
  *
  */
 class SportsbkController extends Controller {
-
+	//篮球结果列表
 	public function outcome(Req $req) {
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
@@ -29,7 +29,7 @@ class SportsbkController extends Controller {
 		$dt->addColsFields('csnum', array('templet' => '#csnum', 'sort' => false, 'width' => 70));
 		$dt->addColsFields('sectionone_two', array('templet' => '#sectionone_two', 'sort' => false, 'width' => 200));
 		$dt->addColsFields('sectionthere_four', array('templet' => '#sectionthere_four', 'sort' => false, 'width' => 200));
-		$dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+		$dt->addColsFields('status', array('templet' => '#matchstatus', 'sort' => false, 'width' => 100));
 		if (checkRriv('/admin/Sportsbk/edit')) {
 			$arr[] = 'edit';
 		}
@@ -41,7 +41,7 @@ class SportsbkController extends Controller {
 
 	function info() {
 		$page = Request::has('page') ? Request::get('page') : '';
-		$list = Request::has('limit') ? Request::get('limit') : 10;
+		$list = Request::has('limit') ? Request::get('limit') : 1;
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$sureblurs = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$status = Request::has('status') ? Request::get('status') : '';
@@ -66,9 +66,77 @@ class SportsbkController extends Controller {
 		$newapp = new \App\Models\Stlqresult();
 		$data = $newapp->resultbklist($list, $page, $where, $orwhere);
 		
+		for ($i=0; $i < count($data['data']); $i++) { 
+			$match_id = $data['data'][$i]['match_id'];
+			$score = $newapp->allscore($match_id,5);
+
+			if(!empty($score[0])){
+				$data['data'][$i]['okteamscore'] = $score[0]['guest_score']?$score[0]['guest_score']:0;//第一节客队比分
+				$data['data'][$i]['ozteamscore'] = $score[0]['home_score']?$score[0]['home_score']:0;//第一节主队比分
+			}else{
+				$data['data'][$i]['okteamscore'] = 0;//第一节客队比分
+				$data['data'][$i]['ozteamscore'] = 0;//第一节主队比分
+			}
+			if(!empty($score[1])){
+				$data['data'][$i]['tkteamscore'] = $score[1]['guest_score']?$score[1]['guest_score']:0;//第二节客队比分
+				$data['data'][$i]['tzteamscore'] = $score[1]['home_score']?$score[1]['home_score']:0;//第二节主队比分
+			}else{
+				$data['data'][$i]['tkteamscore'] = 0;//第二节客队比分
+				$data['data'][$i]['tzteamscore'] = 0;//第二节主队比分
+			}
+			if(!empty($score[2])){
+				$data['data'][$i]['skteamscore'] = $score[2]['guest_score']?$score[2]['guest_score']:0;//第三节客队比分
+				$data['data'][$i]['szteamscore'] = $score[2]['home_score']?$score[2]['home_score']:0;//第三节主队比分
+			}else{
+				$data['data'][$i]['skteamscore'] = 0;//第三节客队比分
+				$data['data'][$i]['szteamscore'] = 0;//第三节主队比分
+			}
+			if(!empty($score[3])){
+				$data['data'][$i]['akteamscore'] = $score[3]['guest_score']?$score[3]['guest_score']:0;//第四节客队比分
+				$data['data'][$i]['azteamscore'] = $score[3]['home_score']?$score[3]['home_score']:0;//第四节主队比分
+			}else{
+				$data['data'][$i]['akteamscore'] = 0;//第四节客队比分
+				$data['data'][$i]['azteamscore'] = 0;//第四节主队比分
+			}
+		    // unset($data['data'][$i]['match_process'],$data['data'][$i]['id'],$data['data'][$i]['home_score'],$data['data'][$i]['guest_score'],$data['data'][$i]['update_time']); //去重
+		}
+
+		// $data['data'] = array_unique($data['data'], SORT_REGULAR); //去重
 		return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}
 
+	//修改添加赛事比分
+	function updatascore(Req $req){
+		$only = $req->only;//节数唯一标识
+		$num = $req->num;//比分
+		$match_id = $req->match_id;//节数唯一标识
+		$okteamscore = $req->okteamscore;//第一节客队比分
+		$ozteamscore = $req->ozteamscore;//第一节主队比分
+		$tkteamscore = $req->tkteamscore;//第二节客队比分
+		$tzteamscore = $req->tzteamscore;//第二节主队比分
+		$skteamscore = $req->skteamscore;//第三节客队比分
+		$szteamscore = $req->szteamscore;//第三节主队比分
+		$akteamscore = $req->akteamscore;//第四节客队比分
+		$azteamscore = $req->azteamscore;//第四节主队比分
+
+		$newapp = new \App\Models\Stlqresult();
+		$alldata = $newapp->onlyselect($match_id);
+		
+		if($only==1 || $only==2){
+			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>1],array_merge($alldata,['home_score'=>intval($ozteamscore),'guest_score'=>intval($okteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>1]));
+		}
+		if($only==3 || $only==4){
+			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>2],array_merge($alldata,['home_score'=>intval($tzteamscore),'guest_score'=>intval($tkteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>2]));
+		}
+		if($only==5 || $only==6){
+			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>3],array_merge($alldata,['home_score'=>intval($szteamscore),'guest_score'=>intval($skteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>3]));
+		}
+		if($only==7 || $only==8){
+			$ret = \App\Models\Stlqresult::updateOrCreate(['match_id'=>$match_id,'match_process'=>4],array_merge($alldata,['home_score'=>intval($azteamscore),'guest_score'=>intval($akteamscore),'update_time'=>date('Y-m-d H:i:s'),'match_process'=>4]));
+		}
+		return responseToJson(1); 
+	}
+
 	function saislist(){
 		$lgid = $_POST['lgid'];//赛事id
 		$newstzqcompetition = new \App\Models\SportsBasket();

app/Http/Controllers/Admin/SportsfootController.php

@@ -58,7 +58,7 @@ class SportsfootController extends Controller {
 		$ssid = $req->match_id;//赛事id
 		$type = $req->type;//是否再结算1,首次结算2,再次结算
 		$newapp = new \App\Models\MoneyBuyMatch();
-		$simplex_ids = array_column($newapp->allsimplexorder($ssid),'order_id');
+		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
 		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
 
 		$update = $this->addcomendnotice($ssid);

app/Http/Controllers/Admin/TennisLeagueController.php

@@ -166,9 +166,13 @@ class TennisLeagueController extends Controller {
             $model = $model::find($model->id);
             if(!empty($req->input('country_id'))){
                 $model->country_id = $req->input('country_id');
+            }else{
+                $model->country_id = 0;
             }
             if(!empty($req->input('area_id'))){
                 $model->area_id = $req->input('area_id');
+            }else{
+                $model->area_id = 0;
             }
             $model->status = $req->input('status');
             $model->utime = date('Y-m-d H:i:s',time());

app/Http/Controllers/Api/WriteSportsController.php

@@ -551,7 +551,6 @@ class WriteSportsController extends BaseController{
             $ret = $model['model_result_record']::insert($set_match_r);
             if($ret != true) throw new \Exception(Response::generate(gameModel::getGameName($game_code).'赛事-match_id:'.$data['match_id'].';',Response::ADD_MATCH_R_R_ERROR));//Render([], '10022', lang('Tips','Sports')->get('add_match_r_r_error'));
         }
-//        return Response::success();
     }
 
     //写入赔率记录
@@ -715,7 +714,7 @@ class WriteSportsController extends BaseController{
                 "match_process"=> $data['match_process']?:'',
                 "tag"=> $data['tag']?:0,
                 "match_id"=> $match_id,
-                "all_inning"=>$data['all_inning']?:0,
+                "all_inning"=>$data['all_inning']?:9,
                 "update_time"=>date('Y-m-d H:m:i'),
                 "result_mark" =>$data['result_mark']?:'',
             ];

app/Lib/Settlement/Adapter/RulePlus.php

@@ -292,8 +292,8 @@ trait RulePlus
             $tmp_home_rate = intval($val->home_rate);
             $tmp_guest_rate = intval($val->guest_rate);
 
-            $return['all']['home'] += $tmp_guest;
-            $return['all']['guest'] += $tmp_home;
+            $return['all']['home'] += $tmp_home;
+            $return['all']['guest'] += $tmp_guest;
             $return['all']['home_rate'] += $tmp_home_rate;
             $return['all']['guest_rate'] += $tmp_guest_rate;
 

app/Models/BaseLeague.php

@@ -19,13 +19,15 @@ class BaseLeague extends BaseModel {
         if (is_array ($where) && count ($where) > 0){
             $data = $this
                 ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.status','st_bq_league.utime')
+                ->orderby('st_bq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
                 ->join('st_bq_local_league','st_bq_league.id','=','st_bq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_bq_league.id','st_bq_league.name_chinese','st_bq_league.area_id','st_bq_league.country_id','st_bq_league.status','st_bq_league.utime')
+                ->orderby('st_bq_league.utime','desc')
                 ->paginate ($list);
         }
         if (!$data) {

app/Models/BasketLeague.php

@@ -21,13 +21,15 @@ class BasketLeague extends BaseModel {
         if (is_array ($where) && count ($where) > 0){
             $data = $this
                 ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.status','st_lq_league.utime')
+                ->orderby('st_lq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
                 ->join('st_lq_local_league','st_lq_league.id','=','st_lq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_lq_league.id','st_lq_league.name_chinese','st_lq_league.area_id','st_lq_league.country_id','st_lq_league.status','st_lq_league.utime')
+                ->orderby('st_lq_league.utime','desc')
                 ->paginate ($list);
         }
         if (!$data) {

app/Models/SoccerLeague.php

@@ -21,13 +21,14 @@ class SoccerLeague extends BaseModel {
         if (is_array ($where) && count ($where) > 0){
             $data = $this
                 ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_zq_league.id','st_zq_league.name_chinese','st_zq_league.area_id','st_zq_league.country_id','st_zq_league.status','st_zq_league.utime')
+                ->orderby('st_zq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
-                ->join('st_zq_local_league','st_zq_league.id','=','st_zq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_zq_league.id','st_zq_league.name_chinese','st_zq_league.area_id','st_zq_league.country_id','st_zq_league.status','st_zq_league.utime')
+                ->orderby('st_zq_league.utime','desc')
                 ->paginate ($list);
         }
         if (!$data) {
@@ -86,7 +87,7 @@ class SoccerLeague extends BaseModel {
     //所有赛事id
     function allleague()
     {
-        $data = $this->select('lg_id','name_chinese')->get();
+        $data = $this->select('id','name_chinese')->get();
         if (!$data) {
 			return -5040000102; //无相关信息
 		}

app/Models/Stlqresult.php

@@ -6,32 +6,44 @@ class Stlqresult extends BaseModel
 {
 	protected $table = 'st_lq_result';
 	public $timestamps = false;
+    protected $fillable = ['lg_id','home_team','guest_team','home_rate','guest_rate','home_score','status','first_score','last_score','match_score','guest_score','match_winer','update_time','match_time','match_process','tag','u_home_score','u_guest_score','match_id','all_goal','source'];
 
     function resultbklist($list = 10, $page, $where = '', $orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) { 
-            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.lg_id')->distinct($this->table.'.lg_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->orwhere($orwhere)->paginate ($list); 
+            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->where($where)->orwhere($orwhere)->paginate ($list); 
         } else {
-            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.lg_id')->distinct($this->table.'.lg_id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->paginate ($list); 
+            $data = $this->join('st_lq_league','st_lq_result.lg_id','=','st_lq_league.id')->select($this->table.'.id',$this->table.'.lg_id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.home_rate',$this->table.'.guest_rate',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.all_goal',$this->table.'.status',$this->table.'.first_score',$this->table.'.last_score',$this->table.'.match_score',$this->table.'.match_winer',$this->table.'.update_time',$this->table.'.match_time',$this->table.'.match_process',$this->table.'.tag',$this->table.'.match_id',$this->table.'.u_home_score',$this->table.'.u_guest_score','st_lq_league.name_chinese')->orderby($this->table.'.id','desc')->paginate ($list); 
         }
 
-        for($i=0;$i<count($data);$i++){ 
-            if($data[$i]->status==0){
-                $data[$i]->status = '未开始';
-            }else if($data[$i]->status==1){
-                $data[$i]->status = '进行中';
-            }else if($data[$i]->status==2){
-                $data[$i]->status = '已结束';
-            }
-            $data[$i]->home_guest_team = $data[$i]->home_team.' <br> '.$data[$i]->guest_team;
-            $data[$i]->u_home_guest_score = $data[$i]->u_home_score.' <br> '.$data[$i]->u_guest_score;
+        return $data->toArray ();
+
+	}
+
+    //根据match_id查询比赛1-4节比分
+    function allscore($match_id,$count=4){
+        for ($i=1; $i < $count; $i++) { 
+            $where = array(
+                'match_id'=>$match_id,
+                'match_process'=>$i,
+            );
+            $data[] = $this->where($where)->select($this->table.'.home_score',$this->table.'.guest_score')->first();
         }
+        return $data;
+    }
+
+    //根据match_id查询
+    function onlyselect($match_id){
+        $data = $this->where('match_id',$match_id)->select('lg_id','home_team','guest_team','home_rate','guest_rate','all_goal','status','first_score','last_score','match_score','match_winer','match_time','tag','match_id','u_home_score','u_guest_score','source')->first();
+        if (!$data) {
+            return -5040000102; //无相关信息
+        }
+        return $data->toArray();
+    }
 
 
 
-        return $data->toArray ();
 
-	}
 
 
 }

app/Models/Stzqresult.php

@@ -11,9 +11,9 @@ class Stzqresult extends BaseModel
     function resultlist($list = 10, $page, $where = '',$orwhere = '')
     {
         if (is_array ($where) && count ($where) > 0) {
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
+            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->where($where)->orwhere($orwhere)->paginate ($list);
         } else { 
-            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.lg_id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->paginate ($list);
+            $data = $this->join('st_zq_league','st_zq_result.lg_id','=','st_zq_league.id')->join('st_zq_competition','st_zq_competition.match_id','=','st_zq_result.match_id')->select($this->table.'.id',$this->table.'.home_team',$this->table.'.guest_team',$this->table.'.match_id','st_zq_result.guest_team','st_zq_result.home_rate','st_zq_result.guest_rate','st_zq_result.first_score','st_zq_result.status','st_zq_result.last_score','st_zq_result.match_score','st_zq_result.match_winer','st_zq_result.update_time','st_zq_competition.match_time','st_zq_result.match_process',$this->table.'.home_score',$this->table.'.guest_score',$this->table.'.u_guest_score',$this->table.'.u_home_score','st_zq_league.name_chinese as saisname')->orderby('st_zq_result.id','desc')->paginate ($list);
         }
 
         return $data->toArray ();

app/Models/TennisLeague.php

@@ -21,12 +21,15 @@ class TennisLeague extends BaseModel {
         if (is_array ($where) && count ($where) > 0){
             $data = $this
                 ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
-                ->orderby('utime','desc')
+                ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.status','st_wq_league.utime')
+                ->orderby('st_wq_league.utime','desc')
                 ->where($where)
                 ->paginate ($list);
         }else{
             $data = $this
                 ->join('st_wq_local_league','st_wq_league.id','=','st_wq_local_league.lg_id')
+                ->select('st_wq_league.id','st_wq_league.name_chinese','st_wq_league.area_id','st_wq_league.country_id','st_wq_league.status','st_wq_league.utime')
+                ->orderby('st_wq_league.utime','desc')
                 ->orderby('utime','desc')
                 ->paginate ($list);
         }

resources/lang/zh-cn/sportsbk.php

@@ -45,6 +45,7 @@ return array(
 	'overtimefour' => '第四加时',
 	'firsthalf' => '上半场',
 	'fullcourt' => '全场', 
+	'operation' => '操作',
 	
 	
 );

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

@@ -21,6 +21,7 @@
             width: auto;
         }
     </style>
+
     <script type="text/html" id="liansai">
       @{{#if(d.match_id!=null){ }}
         <span>@{{ d.match_id}}</span>
@@ -29,27 +30,31 @@
         <span>@{{ d.name_chinese}}</span>
       @{{#} }}
     </script>
-    
-    <script type="text/html" id="sectionone_two">
-      @{{#if(d.match_time!=null){ }}
-        <!-- <span>@{{ d.match_time}}</span> -->
-        <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> 
-        <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.id}}" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="inputTunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> / 
-        <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.id}}" name="home_score" value="@{{d.home_score}}" onchange="inputSunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
-        <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.id}}" name="guest_score" value="@{{d.guest_score}}" onchange="inputAunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
 
+    <script type="text/html" id="matchstatus">
+      @{{#if(d.status==0){ }}
+        <span>未开始</span>
+      @{{#} }}<br>
+      @{{#if(d.status==1){ }}
+        <span>进行中</span>
+      @{{#} }}
+      @{{#if(d.status==2){ }}
+        <span>已结束</span>
       @{{#} }}
     </script>
+    
+    <script type="text/html" id="sectionone_two">
+        <input type="text" style="width:30px;heigth:20px" id="okteamscore@{{d.match_id}}" name="okteamscore" value="@{{d.okteamscore}}" onchange="teamscore(1, event.target.value,@{{ d.match_id}})"> 
+        <input type="text" style="width:30px;heigth:20px" id="ozteamscore@{{d.match_id}}" name="ozteamscore" value="@{{d.ozteamscore}}" onchange="teamscore(2, event.target.value,@{{ d.match_id}})"> / 
+        <input type="text" style="width:30px;heigth:20px" id="tkteamscore@{{d.match_id}}" name="tkteamscore" value="@{{d.tkteamscore}}" onchange="teamscore(3, event.target.value,@{{ d.match_id}})">
+        <input type="text" style="width:30px;heigth:20px" id="tzteamscore@{{d.match_id}}" name="tzteamscore" value="@{{d.tzteamscore}}" onchange="teamscore(4, event.target.value,@{{ d.match_id}})">
+    </script>
 
     <script type="text/html" id="sectionthere_four">
-      @{{#if(d.match_time!=null){ }}
-        <!-- <span>@{{ d.match_time}}</span> -->
-        <input type="text" style="width:30px;heigth:20px" id="u_home_score@{{d.id}}" name="u_home_score" value="@{{d.u_home_score}}" onchange="inputFunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> 
-        <input type="text" style="width:30px;heigth:20px" id="u_guest_score@{{d.id}}" name="u_guest_score" value="@{{d.u_guest_score}}" onchange="inputTunc(@{{d.id}}, event.target.value,@{{d.match_id}})"> / 
-        <input type="text" style="width:30px;heigth:20px" id="home_score@{{d.id}}" name="home_score" value="@{{d.home_score}}" onchange="inputSunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
-        <input type="text" style="width:30px;heigth:20px" id="guest_score@{{d.id}}" name="guest_score" value="@{{d.guest_score}}" onchange="inputAunc(@{{d.id}}, event.target.value,@{{d.match_id}})">
-
-      @{{#} }}
+        <input type="text" style="width:30px;heigth:20px" id="skteamscore@{{d.match_id}}" name="skteamscore" value="@{{d.skteamscore}}" onchange="teamscore(5, event.target.value,@{{ d.match_id}})"> 
+        <input type="text" style="width:30px;heigth:20px" id="szteamscore@{{d.match_id}}" name="szteamscore" value="@{{d.szteamscore}}" onchange="teamscore(6, event.target.value,@{{ d.match_id}})"> / 
+        <input type="text" style="width:30px;heigth:20px" id="akteamscore@{{d.match_id}}" name="akteamscore" value="@{{d.akteamscore}}" onchange="teamscore(7, event.target.value,@{{ d.match_id}})">
+        <input type="text" style="width:30px;heigth:20px" id="azteamscore@{{d.match_id}}" name="azteamscore" value="@{{d.azteamscore}}" onchange="teamscore(8, event.target.value,@{{ d.match_id}})">
     </script>
 
     <script type="text/html" id="status">
@@ -111,7 +116,7 @@
             </form>
         </div>
     </div>
-	<script>
+	<script type="text/javascript">
         $(function () {
             $('body').on('click', 'a[eventtype="event-delete"]', function () {
                 var span = $(this).prev();
@@ -128,6 +133,42 @@
             })
         })
 
+        //修改赛事比分  only:唯一 num:inputval match_id:match_id
+        function teamscore(only,num,match_id){
+            var only = only;
+            var num = num;
+            var match_id = match_id;
+            var reg = /^[0-99]\d*$/;
+            var okteamscore = $("#okteamscore"+match_id).val();
+            var ozteamscore = $("#ozteamscore"+match_id).val();
+            var tkteamscore = $("#tkteamscore"+match_id).val();
+            var tzteamscore = $("#tzteamscore"+match_id).val();
+            var skteamscore = $("#skteamscore"+match_id).val();
+            var szteamscore = $("#szteamscore"+match_id).val();
+            var akteamscore = $("#akteamscore"+match_id).val();
+            var azteamscore = $("#azteamscore"+match_id).val();
+            // alert(azteamscore);
+            // alert(akteamscore);
+
+            if(reg.test(num)==false){ 
+                layer.msg('不能为空值');
+                reloadDataTable();return;
+            }
+
+            $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: '/admin/Sportsbk/updatascore',
+                data: {only:only,num:num,match_id:match_id,okteamscore:okteamscore,ozteamscore:ozteamscore,tkteamscore:tkteamscore,tzteamscore:tzteamscore,skteamscore:skteamscore,szteamscore:szteamscore,akteamscore:akteamscore,azteamscore:azteamscore},
+                success: function(data) {
+                    if(data.status==1){
+                        layer.msg(data.msg);
+                        location. reload()//刷新当前页面
+                    }
+                }
+            })
+        }
+
         //刷新赛事数据
         function refreshall(game_code){ 
             var game_code = game_code;

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

@@ -148,7 +148,7 @@
                     <select name="lg_id"  id="lg_id" lay-filter = 'sect'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
                         <option value="">{{ trans('sportsfoot.lg_select') }}</option>
                         @foreach($data as $k=>$v)
-                            <option value="{{$v['lg_id']}}">{{$v['name_chinese']}}</option>
+                            <option value="{{$v['id']}}">{{$v['name_chinese']}}</option>
                         @endforeach
                     </select>
                 </div>

resources/views/sports/base_league_form.blade.php

@@ -26,7 +26,7 @@
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">所属国家</label>
             <div class="layui-input-block">
-                <select name="country_id" id="country" lay-filter = 'sect_country'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                <select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>
                     <option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>
                 </select>
             </div>

resources/views/sports/basket_league_form.blade.php

@@ -26,7 +26,7 @@
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">所属国家</label>
             <div class="layui-input-block">
-                <select name="country_id" id="country" lay-filter = 'sect_country'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                <select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>
                     <option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>
                 </select>
             </div>

resources/views/sports/soccer_league_form.blade.php

@@ -26,7 +26,7 @@
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">所属国家</label>
             <div class="layui-input-block">
-                <select name="country_id" id="country" lay-filter = 'sect_country'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                <select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>
                     <option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>
                 </select>
             </div>

resources/views/sports/tennis_league_form.blade.php

@@ -26,7 +26,7 @@
         <div class="layui-form-item layui-form">
             <label class="layui-form-label">所属国家</label>
             <div class="layui-input-block">
-                <select name="country_id" id="country" lay-filter = 'sect_country'  lay-verify="required" autocomplete="off" class="layui-input"  eventType=event-query>
+                <select name="country_id" id="country" lay-filter = 'sect_country' autocomplete="off" class="layui-input"  eventType=event-query>
                     <option value="{{ isset($country_id)?$country_id:'' }}">{{ isset($country)?$country:'' }}</option>
                 </select>
             </div>