1

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -38,16 +38,16 @@ class SoccerNoteListController extends Controller
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('match_id_order', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
         $dt->addColsFields('league', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
-        $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
+        $dt->addColsFields('home_guest', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('content', array('templet' => '#userdetail', 'sort' => false, 'width' => 250));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
         $dt->addColsFields('money_match_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
-        $dt->addColsFields('order_status', array('sort' => false, 'width' => 90));
+        $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 110));
-        $dt->addColsFields('game_status', array('sort' => false, 'width' =>70));
+        $dt->addColsFields('game_status', array('sort' => false, 'width' =>90));
         //$arr[] = 'view';
 //        if (checkRriv('/admin/SoccerNoteList/edit')) {
 //            $arr[] = 'edit';

app/Http/Controllers/Admin/SoccerStringNoteListController.php

@@ -35,14 +35,14 @@ class SoccerStringNoteListController extends Controller
         $dt->setLang('sportsnotelist');
         //$dt->addColsFields('id', array('templet' => '#userdetail', 'sort' => true, 'width' => 80));
         $dt->addColsFields('order_id', array('templet' => '#userdetail', 'sort' => true, 'width' => 200));
-        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 70));
+        $dt->addColsFields('str_type', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('detail_content', array('sort' => false, 'width' => 140));
         $dt->addColsFields('money', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('water_return', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('prize_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 120));
         $dt->addColsFields('result', array('templet' => '#userdetail', 'sort' => false, 'width' => 90));
         $dt->addColsFields('money_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 200));
-        $dt->addColsFields('order_status', array('sort' => false, 'width' => 90));
+        $dt->addColsFields('order_status', array('sort' => false, 'width' => 80));
         $dt->addColsFields('account_money', array('templet' => '#userdetail', 'sort' => false, 'width' => 230));
         $dt->addColsFields('settle_status', array('sort' => false, 'width' => 90));
 //        if (checkRriv('/admin/SoccerStringNoteList/edit')) {

app/Http/Controllers/Admin/SportsBaseController.php

@@ -15,12 +15,20 @@ use Request;
 class SportsBaseController extends Controller {
 
     public function score(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
         $request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
         $request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+
+        $request['is_rollball'] = isset($req->is_rollball) ? trim($req->is_rollball) : '0';
+        $request['is_today'] = isset($req->is_today) ? trim($req->is_today) : '0';
+        $request['is_morningplate'] = isset($req->is_morningplate) ? trim($req->is_morningplate) : '0';
+        $request['is_stringscene'] = isset($req->is_stringscene) ? trim($req->is_stringscene) : '0';
 
 //        $source = \App\Models\Setinfo::where('id','1000')->first();
 //        if($source->infocontent != '混合数据'){
@@ -60,6 +68,8 @@ class SportsBaseController extends Controller {
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
         $home_team = Request::has('home_team') ? Request::get('home_team') : '';
         $match_date = Request::has('match_date') ? Request::get('match_date') : '';
+        $star_time = Request::get('star_time') ? Request::get('star_time') : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time') : '';
         //$match_date = $req->input('match_date');
 //        if(!empty($match_date)){
 //            return 2;
@@ -68,9 +78,17 @@ class SportsBaseController extends Controller {
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
         $orwhere = array();
-        if (!empty($name_chinese) && $name_chinese!=-1) {
-            $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+//        if (!empty($name_chinese) && $name_chinese!=-1) {
+//            $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+//        }
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_bq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            } else {
+                $where[] = array('st_bq_league.name_chinese', '=', $name_chinese);
+            }
         }
+
         if (!empty($home_team)) {
             if (empty($sureblur) || $sureblur == 'off') {
                 $where[] = array('st_bq_competition.home_team', 'like', '%' . $home_team . '%');
@@ -80,9 +98,24 @@ class SportsBaseController extends Controller {
                 $orwhere[] = array('st_bq_competition.guest_team', '=', $home_team);
             }
         }
-        if (!empty($match_date)) {
-            $where[] = array('st_bq_competition.match_date', '=', $match_date);
+
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('st_bq_competition.match_date', '>=', $star_time);
+                $where[] = array('st_bq_competition.match_date', '<=', $end_time);
+            }else{
+                $where[] = array('st_bq_competition.match_date', '>=', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('st_bq_competition.match_date', '<=', $end_time);
+            }
         }
+
+//        if (!empty($match_date)) {
+//            $where[] = array('st_bq_competition.match_date', '=', $match_date);
+//        }
         if ($status != -1) {
             $where[] = array('st_bq_competition.status', '=', $status);
         }
@@ -176,6 +209,26 @@ class SportsBaseController extends Controller {
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
             $model->status = $req->input('status');
+            if($req->input('is_rollball') == true){
+                $model->is_rollball = 1;
+            }else{
+                $model->is_rollball = 0;
+            }
+            if($req->input('is_today') == true){
+                $model->is_today = 1;
+            }else{
+                $model->is_today = 0;
+            }
+            if($req->input('is_morningplate') == true){
+                $model->is_morningplate = 1;
+            }else{
+                $model->is_morningplate = 0;
+            }
+            if($req->input('is_stringscene') == true){
+                $model->is_stringscene = 1;
+            }else{
+                $model->is_stringscene = 0;
+            }
             $model->match_id = time() ;
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
@@ -282,6 +335,26 @@ class SportsBaseController extends Controller {
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
             $model->status = $req->input('status');
+            if($req->input('is_rollball') == true){
+                $model->is_rollball = 1;
+            }else{
+                $model->is_rollball = 0;
+            }
+            if($req->input('is_today') == true){
+                $model->is_today = 1;
+            }else{
+                $model->is_today = 0;
+            }
+            if($req->input('is_morningplate') == true){
+                $model->is_morningplate = 1;
+            }else{
+                $model->is_morningplate = 0;
+            }
+            if($req->input('is_stringscene') == true){
+                $model->is_stringscene = 1;
+            }else{
+                $model->is_stringscene = 0;
+            }
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
             $model->save();
@@ -378,6 +451,7 @@ class SportsBaseController extends Controller {
         $dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('source', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         if (checkRriv('/admin/SportsBase/oddsedit?id='.$cp_id.'')) {
             $arr[] = 'oddsedit';
         }

app/Http/Controllers/Admin/SportsBasketController.php

@@ -15,12 +15,20 @@ use Request;
 class SportsBasketController extends Controller {
 
 	public function score(Req $req) {
-		$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+		//$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+		$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
 		$request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
 		$request['status'] = isset($req->status) ? trim($req->status) : '-1';
 		$request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+		$request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+
+		$request['is_rollball'] = isset($req->is_rollball) ? trim($req->is_rollball) : '0';
+		$request['is_today'] = isset($req->is_today) ? trim($req->is_today) : '0';
+		$request['is_morningplate'] = isset($req->is_morningplate) ? trim($req->is_morningplate) : '0';
+		$request['is_stringscene'] = isset($req->is_stringscene) ? trim($req->is_stringscene) : '0';
 
 //        $source = \App\Models\Setinfo::where('id','1000')->first();
 //        if($source->infocontent != '混合数据'){
@@ -61,6 +69,8 @@ class SportsBasketController extends Controller {
 		$name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
 		$home_team = Request::has('home_team') ? Request::get('home_team') : '';
 		$match_date = Request::has('match_date') ? Request::get('match_date') : '';
+		$star_time = Request::get('star_time') ? Request::get('star_time') : '';
+		$end_time = Request::get('end_time') ? Request::get('end_time') : '';
 		//$match_date = $req->input('match_date');
 //        if(!empty($match_date)){
 //            return 2;
@@ -69,9 +79,17 @@ class SportsBasketController extends Controller {
 		$sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
 		$where = array();
 		$orwhere = array();
-		if (!empty($name_chinese) && $name_chinese!=-1) {
-			$where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+//		if (!empty($name_chinese) && $name_chinese!=-1) {
+//			$where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+//		}
+		if (!empty($name_chinese)) {
+			if (empty($sureblur) || $sureblur == 'off') {
+				$where[] = array('st_lq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+			} else {
+				$where[] = array('st_lq_league.name_chinese', '=', $name_chinese);
+			}
 		}
+
 		if (!empty($home_team)) {
 			if (empty($sureblur) || $sureblur == 'off') {
 				$where[] = array('st_lq_competition.home_team', 'like', '%' . $home_team . '%');
@@ -81,9 +99,24 @@ class SportsBasketController extends Controller {
 				$orwhere[] = array('st_lq_competition.guest_team', '=', $home_team);
 			}
 		}
-		if (!empty($match_date)) {
-			$where[] = array('st_lq_competition.match_date', '=', $match_date);
+
+		if (!empty($star_time)) {
+			if (!empty($end_time)){
+				$where[] = array('st_lq_competition.match_date', '>=', $star_time);
+				$where[] = array('st_lq_competition.match_date', '<=', $end_time);
+			}else{
+				$where[] = array('st_lq_competition.match_date', '>=', $star_time);
+			}
+		}else if(empty($star_time)){
+			if (!empty($end_time)){
+
+				$where[] = array('st_lq_competition.match_date', '<=', $end_time);
+			}
 		}
+
+//		if (!empty($match_date)) {
+//			$where[] = array('st_lq_competition.match_date', '=', $match_date);
+//		}
 		if ($status != -1) {
 			$where[] = array('st_lq_competition.status', '=', $status);
 		}
@@ -178,6 +211,26 @@ class SportsBasketController extends Controller {
 			$model->match_date = $req->input('match_date');
 			$model->match_time = $req->input('match_time');
 			$model->status = $req->input('status');
+			if($req->input('is_rollball') == true){
+				$model->is_rollball = 1;
+			}else{
+				$model->is_rollball = 0;
+			}
+			if($req->input('is_today') == true){
+				$model->is_today = 1;
+			}else{
+				$model->is_today = 0;
+			}
+			if($req->input('is_morningplate') == true){
+				$model->is_morningplate = 1;
+			}else{
+				$model->is_morningplate = 0;
+			}
+			if($req->input('is_stringscene') == true){
+				$model->is_stringscene = 1;
+			}else{
+				$model->is_stringscene = 0;
+			}
 			$model->match_id = time() ;
 			$model->ctime = date('Y-m-d H:i:s',time());
 			$model->utime = date('Y-m-d H:i:s',time());
@@ -283,6 +336,26 @@ class SportsBasketController extends Controller {
 			$model->match_date = $req->input('match_date');
 			$model->match_time = $req->input('match_time');
 			$model->status = $req->input('status');
+			if($req->input('is_rollball') == true){
+				$model->is_rollball = 1;
+			}else{
+				$model->is_rollball = 0;
+			}
+			if($req->input('is_today') == true){
+				$model->is_today = 1;
+			}else{
+				$model->is_today = 0;
+			}
+			if($req->input('is_morningplate') == true){
+				$model->is_morningplate = 1;
+			}else{
+				$model->is_morningplate = 0;
+			}
+			if($req->input('is_stringscene') == true){
+				$model->is_stringscene = 1;
+			}else{
+				$model->is_stringscene = 0;
+			}
 			$model->ctime = date('Y-m-d H:i:s',time());
 			$model->utime = date('Y-m-d H:i:s',time());
 			$model->save();
@@ -377,6 +450,7 @@ class SportsBasketController extends Controller {
 		$dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		$dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
 		$dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+		$dt->addColsFields('source', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
 		if (checkRriv('/admin/SportsBasket/oddsedit?id='.$cp_id.'')) {
 			$arr[] = 'oddsedit';
 		}

app/Http/Controllers/Admin/SportsSoccerController.php

@@ -15,12 +15,20 @@ use Request;
 class SportsSoccerController extends Controller {
 
     public function score(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
         $request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
         $request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+
+        $request['is_rollball'] = isset($req->is_rollball) ? trim($req->is_rollball) : '0';
+        $request['is_today'] = isset($req->is_today) ? trim($req->is_today) : '0';
+        $request['is_morningplate'] = isset($req->is_morningplate) ? trim($req->is_morningplate) : '0';
+        $request['is_stringscene'] = isset($req->is_stringscene) ? trim($req->is_stringscene) : '0';
 
 //        $source = \App\Models\Setinfo::where('id','1000')->first();
 //        if($source->infocontent != '混合数据'){
@@ -61,13 +69,23 @@ class SportsSoccerController extends Controller {
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
         $home_team = Request::has('home_team') ? Request::get('home_team') : '';
         $match_date = Request::has('match_date') ? Request::get('match_date') : '';
+        $star_time = Request::get('star_time') ? Request::get('star_time') : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time') : '';
         $status = Request::has('status') ? Request::get('status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
         $orwhere = array();
-        if (!empty($name_chinese) && $name_chinese!=-1) {
-            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+//        if (!empty($name_chinese) && $name_chinese!=-1) {
+//            $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+//        }
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_zq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            } else {
+                $where[] = array('st_zq_league.name_chinese', '=', $name_chinese);
+            }
         }
+
         if (!empty($home_team)) {
             if (empty($sureblur) || $sureblur == 'off') {
                 $where[] = array('st_zq_competition.home_team', 'like', '%' . $home_team . '%');
@@ -78,9 +96,23 @@ class SportsSoccerController extends Controller {
             }
         }
 
-        if(!empty($match_date)){
-            $where[] = array('st_zq_competition.match_date', '=', $match_date);
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('st_zq_competition.match_date', '>=', $star_time);
+                $where[] = array('st_zq_competition.match_date', '<=', $end_time);
+            }else{
+                $where[] = array('st_zq_competition.match_date', '>=', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('st_zq_competition.match_date', '<=', $end_time);
+            }
         }
+
+//        if(!empty($match_date)){
+//            $where[] = array('st_zq_competition.match_date', '=', $match_date);
+//        }
         if($status != -1){
             $where[] = array('st_zq_competition.status', '=', $status);
         }
@@ -175,6 +207,26 @@ class SportsSoccerController extends Controller {
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
             $model->status = $req->input('status');
+            if($req->input('is_rollball') == true){
+                $model->is_rollball = 1;
+            }else{
+                $model->is_rollball = 0;
+            }
+            if($req->input('is_today') == true){
+                $model->is_today = 1;
+            }else{
+                $model->is_today = 0;
+            }
+            if($req->input('is_morningplate') == true){
+                $model->is_morningplate = 1;
+            }else{
+                $model->is_morningplate = 0;
+            }
+            if($req->input('is_stringscene') == true){
+                $model->is_stringscene = 1;
+            }else{
+                $model->is_stringscene = 0;
+            }
             $model->match_id = time() ;
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
@@ -281,6 +333,26 @@ class SportsSoccerController extends Controller {
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
             $model->status = $req->input('status');
+            if($req->input('is_rollball') == true){
+                $model->is_rollball = 1;
+            }else{
+                $model->is_rollball = 0;
+            }
+            if($req->input('is_today') == true){
+                $model->is_today = 1;
+            }else{
+                $model->is_today = 0;
+            }
+            if($req->input('is_morningplate') == true){
+                $model->is_morningplate = 1;
+            }else{
+                $model->is_morningplate = 0;
+            }
+            if($req->input('is_stringscene') == true){
+                $model->is_stringscene = 1;
+            }else{
+                $model->is_stringscene = 0;
+            }
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
             $model->save();
@@ -375,6 +447,7 @@ class SportsSoccerController extends Controller {
         $dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('source', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         if (checkRriv('/admin/SportsSoccer/oddsedit?id='.$cp_id.'')) {
             $arr[] = 'oddsedit';
         }

app/Http/Controllers/Admin/SportsTennisController.php

@@ -15,12 +15,20 @@ use Request;
 class SportsTennisController extends Controller {
 
     public function score(Req $req) {
-        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        //$request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '-1';
+        $request['name_chinese'] = isset($req->name_chinese) ? trim($req->name_chinese) : '';
         $request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
         $request['match_date'] = isset($req->match_date) ? trim($req->match_date) : null;
         $request['recommend'] = isset($req->recommend) ? trim($req->recommend) : '';
         $request['status'] = isset($req->status) ? trim($req->status) : '-1';
         $request['sureblurs'] = isset($req->sureblurs) ? $req->sureblurs : 'on';
+        $request['star_time'] = isset($req->star_time) ? trim($req->star_time) :null ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) :null ;
+
+        $request['is_rollball'] = isset($req->is_rollball) ? trim($req->is_rollball) : '0';
+        $request['is_today'] = isset($req->is_today) ? trim($req->is_today) : '0';
+        $request['is_morningplate'] = isset($req->is_morningplate) ? trim($req->is_morningplate) : '0';
+        $request['is_stringscene'] = isset($req->is_stringscene) ? trim($req->is_stringscene) : '0';
 
 //        $source = \App\Models\Setinfo::where('id','1000')->first();
 //        if($source->infocontent != '混合数据'){
@@ -61,6 +69,8 @@ class SportsTennisController extends Controller {
         $name_chinese = Request::has('name_chinese') ? Request::get('name_chinese') : '';
         $home_team = Request::has('home_team') ? Request::get('home_team') : '';
         $match_date = Request::has('match_date') ? Request::get('match_date') : '';
+        $star_time = Request::get('star_time') ? Request::get('star_time') : '';
+        $end_time = Request::get('end_time') ? Request::get('end_time') : '';
         //$match_date = $req->input('match_date');
 //        if(!empty($match_date)){
 //            return 2;
@@ -69,9 +79,17 @@ class SportsTennisController extends Controller {
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $where = array();
         $orwhere = array();
-        if (!empty($name_chinese) && $name_chinese!=-1) {
-            $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+//        if (!empty($name_chinese) && $name_chinese!=-1) {
+//            $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+//        }
+        if (!empty($name_chinese)) {
+            if (empty($sureblur) || $sureblur == 'off') {
+                $where[] = array('st_wq_league.name_chinese', 'like', '%' . $name_chinese . '%');
+            } else {
+                $where[] = array('st_wq_league.name_chinese', '=', $name_chinese);
+            }
         }
+
         if (!empty($home_team)) {
             if (empty($sureblur) || $sureblur == 'off') {
                 $where[] = array('st_wq_competition.home_team', 'like', '%' . $home_team . '%');
@@ -81,9 +99,24 @@ class SportsTennisController extends Controller {
                 $orwhere[] = array('st_wq_competition.guest_team', '=', $home_team);
             }
         }
-        if (!empty($match_date)) {
-            $where[] = array('st_wq_competition.match_date', '=', $match_date);
+
+        if (!empty($star_time)) {
+            if (!empty($end_time)){
+                $where[] = array('st_wq_competition.match_date', '>=', $star_time);
+                $where[] = array('st_wq_competition.match_date', '<=', $end_time);
+            }else{
+                $where[] = array('st_wq_competition.match_date', '>=', $star_time);
+            }
+        }else if(empty($star_time)){
+            if (!empty($end_time)){
+
+                $where[] = array('st_wq_competition.match_date', '<=', $end_time);
+            }
         }
+
+//        if (!empty($match_date)) {
+//            $where[] = array('st_wq_competition.match_date', '=', $match_date);
+//        }
         if ($status != -1) {
             $where[] = array('st_wq_competition.status', '=', $status);
         }
@@ -177,6 +210,26 @@ class SportsTennisController extends Controller {
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
             $model->status = $req->input('status');
+            if($req->input('is_rollball') == true){
+                $model->is_rollball = 1;
+            }else{
+                $model->is_rollball = 0;
+            }
+            if($req->input('is_today') == true){
+                $model->is_today = 1;
+            }else{
+                $model->is_today = 0;
+            }
+            if($req->input('is_morningplate') == true){
+                $model->is_morningplate = 1;
+            }else{
+                $model->is_morningplate = 0;
+            }
+            if($req->input('is_stringscene') == true){
+                $model->is_stringscene = 1;
+            }else{
+                $model->is_stringscene = 0;
+            }
             $model->match_id = time() ;
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
@@ -283,6 +336,26 @@ class SportsTennisController extends Controller {
             $model->match_date = $req->input('match_date');
             $model->match_time = $req->input('match_time');
             $model->status = $req->input('status');
+            if($req->input('is_rollball') == true){
+                $model->is_rollball = 1;
+            }else{
+                $model->is_rollball = 0;
+            }
+            if($req->input('is_today') == true){
+                $model->is_today = 1;
+            }else{
+                $model->is_today = 0;
+            }
+            if($req->input('is_morningplate') == true){
+                $model->is_morningplate = 1;
+            }else{
+                $model->is_morningplate = 0;
+            }
+            if($req->input('is_stringscene') == true){
+                $model->is_stringscene = 1;
+            }else{
+                $model->is_stringscene = 0;
+            }
             $model->ctime = date('Y-m-d H:i:s',time());
             $model->utime = date('Y-m-d H:i:s',time());
             $model->save();
@@ -377,6 +450,7 @@ class SportsTennisController extends Controller {
         $dt->addColsFields('min', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         $dt->addColsFields('status', array('templet' => '#userdetail', 'sort' => false, 'width' => 80));
         $dt->addColsFields('expire_time', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
+        $dt->addColsFields('source', array('templet' => '#userdetail', 'sort' => false, 'width' => 100));
         if (checkRriv('/admin/SportsTennis/oddsedit?id='.$cp_id.'')) {
             $arr[] = 'oddsedit';
         }

app/Models/MoneyBuyStr.php

@@ -104,7 +104,7 @@ class MoneyBuyStr extends BaseModel {
 
             //$str_type = str_replace('*', '串', $data[$i]->str_type);
             $mun = explode('串',$data[$i]->str_type);
-            $data[$i]->detail_content = $data[$i]->settle_status.'：'.$mun[0].' [<a class="detail" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/detail/?id=" href="/admin/SoccerStringNoteList/detail/?id='.$data[$i]->id.'"> 详情 </a>]';
+            $data[$i]->detail_content = $data[$i]->settle_status.':'.$mun[0].' [<a class="detail" lay-event="detail" pid="id" uri="/admin/SoccerStringNoteList/detail/?id=" href="/admin/SoccerStringNoteList/detail/?id='.$data[$i]->id.'"> 详情 </a>]';
             $data[$i]->str_type = $data[$i]->str_type.'<br>(<span>'.$data[$i]->account_name.'</span>)';
 
             //反水
@@ -268,6 +268,10 @@ class MoneyBuyStr extends BaseModel {
             }else if($data[$i]->result == 4){
                 $data[$i]->result = '输半平半';
             }
+
+            if($data[$i]->result != '未处理'){
+                $data[$i]->result = $data[$i]->result.'<br>('.$data[$i]->matchResult.')';
+            }
         }
         return $data->toArray();
     }

app/Models/SportsBase.php

@@ -57,7 +57,7 @@ class SportsBase extends BaseModel {
 
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.lg_id')
-                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
+                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend','st_bq_competition.is_rollball','st_bq_competition.is_today','st_bq_competition.is_morningplate','st_bq_competition.is_stringscene')
                 ->orderby('st_bq_competition.match_date','desc')
                 ->orderby('st_bq_competition.match_time','desc')
                 ->where($where)
@@ -65,7 +65,7 @@ class SportsBase extends BaseModel {
                 ->paginate ($list);
         } else {
             $data = $this->join('st_bq_league','st_bq_competition.lg_id','=','st_bq_league.lg_id')
-                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend')
+                ->select('st_bq_competition.id','st_bq_competition.match_id','st_bq_competition.lg_id','st_bq_league.name_chinese','st_bq_league.last_time','st_bq_competition.home_team','st_bq_competition.guest_team','st_bq_competition.match_date','st_bq_competition.match_time','st_bq_competition.status','st_bq_competition.recommend','st_bq_competition.is_rollball','st_bq_competition.is_today','st_bq_competition.is_morningplate','st_bq_competition.is_stringscene')
                 ->orderby('st_bq_competition.match_date','desc')
                 ->orderby('st_bq_competition.match_time','desc')
                 ->paginate ($list);

app/Models/SportsBasket.php

@@ -57,7 +57,7 @@ class SportsBasket extends BaseModel {
 
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_lq_league','st_lq_competition.lg_id','=','st_lq_league.lg_id')
-                ->select('st_lq_competition.id','st_lq_competition.match_id','st_lq_competition.lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend')
+                ->select('st_lq_competition.id','st_lq_competition.match_id','st_lq_competition.lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend','st_lq_competition.is_rollball','st_lq_competition.is_today','st_lq_competition.is_morningplate','st_lq_competition.is_stringscene')
                 ->orderby('st_lq_competition.match_date','desc')
                 ->orderby('st_lq_competition.match_time','desc')
                 ->where($where)
@@ -65,7 +65,7 @@ class SportsBasket extends BaseModel {
                 ->paginate ($list);
         } else {
             $data = $this->join('st_lq_league','st_lq_competition.lg_id','=','st_lq_league.lg_id')
-                ->select('st_lq_competition.id','st_lq_competition.match_id','st_lq_competition.lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend')
+                ->select('st_lq_competition.id','st_lq_competition.match_id','st_lq_competition.lg_id','st_lq_league.name_chinese','st_lq_league.last_time','st_lq_competition.home_team','st_lq_competition.guest_team','st_lq_competition.match_date','st_lq_competition.match_time','st_lq_competition.status','st_lq_competition.recommend','st_lq_competition.is_rollball','st_lq_competition.is_today','st_lq_competition.is_morningplate','st_lq_competition.is_stringscene')
                 ->orderby('st_lq_competition.match_date','desc')
                 ->orderby('st_lq_competition.match_time','desc')
                 ->paginate ($list);

app/Models/SportsNoteList.php

@@ -164,7 +164,7 @@ class SportsNoteList extends BaseModel {
                             if($content[$b]->result=='未处理'){
                                 $data[$i]->content = $data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
                             }else{
-                                $data[$i]->content = $data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span><br>';
+                                $data[$i]->content = $data[$i]->content.$result[$c]->odds_name.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchResult.')<br>';
                             }
 
                         }
@@ -173,7 +173,7 @@ class SportsNoteList extends BaseModel {
                         if($content[$b]->result=='未处理'){
                             $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br>';
                         }else{
-                            $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span><br>';
+                            $data[$i]->content = $data[$i]->content.$content[$b]->odds_code.'<br>'.$content[$b]->condition.' '.$data[$i]->team.'@'.$content[$b]->odds.' ￥'.$content[$b]->bet_money.'<br><span>'.$content[$b]->result.'</span>('.$content[$b]->matchResult.')<br>';
                         }
 
                     }

app/Models/SportsSoccer.php

@@ -56,7 +56,7 @@ class SportsSoccer extends BaseModel {
 
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
-                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend','st_zq_competition.is_rollball','st_zq_competition.is_today','st_zq_competition.is_morningplate','st_zq_competition.is_stringscene')
                 ->orderby('st_zq_competition.match_date','desc')
                 ->orderby('st_zq_competition.match_time','desc')
                 ->where($where)
@@ -64,7 +64,7 @@ class SportsSoccer extends BaseModel {
                 ->paginate ($list);
         } else {
             $data = $this->join('st_zq_league','st_zq_competition.lg_id','=','st_zq_league.lg_id')
-                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend')
+                ->select('st_zq_competition.id','st_zq_competition.match_id','st_zq_competition.lg_id','st_zq_league.name_chinese','st_zq_league.last_time','st_zq_competition.home_team','st_zq_competition.guest_team','st_zq_competition.match_date','st_zq_competition.match_time','st_zq_competition.status','st_zq_competition.recommend','st_zq_competition.is_rollball','st_zq_competition.is_today','st_zq_competition.is_morningplate','st_zq_competition.is_stringscene')
                 ->orderby('st_zq_competition.match_date','desc')
                 ->orderby('st_zq_competition.match_time','desc')
                 ->paginate ($list);

app/Models/SportsTennis.php

@@ -57,7 +57,7 @@ class SportsTennis extends BaseModel {
 
         if (is_array ($where) && count ($where) > 0) {
             $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.lg_id')
-                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
+                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend','st_wq_competition.is_rollball','st_wq_competition.is_today','st_wq_competition.is_morningplate','st_wq_competition.is_stringscene')
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
                 ->where($where)
@@ -65,7 +65,7 @@ class SportsTennis extends BaseModel {
                 ->paginate ($list);
         } else {
             $data = $this->join('st_wq_league','st_wq_competition.lg_id','=','st_wq_league.lg_id')
-                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend')
+                ->select('st_wq_competition.id','st_wq_competition.match_id','st_wq_competition.lg_id','st_wq_league.name_chinese','st_wq_league.last_time','st_wq_competition.home_team','st_wq_competition.guest_team','st_wq_competition.match_date','st_wq_competition.match_time','st_wq_competition.status','st_wq_competition.recommend','st_wq_competition.is_rollball','st_wq_competition.is_today','st_wq_competition.is_morningplate','st_wq_competition.is_stringscene')
                 ->orderby('st_wq_competition.match_date','desc')
                 ->orderby('st_wq_competition.match_time','desc')
                 ->paginate ($list);

resources/lang/zh-cn/sportssoccer.php

@@ -27,6 +27,7 @@ return array(
     'p_code_search' => '父级赔率代码查询',
     'league_status_search' => '联赛状态查询',
     'odds_status_search' => '赔率状态查询',
+    'source' => '赛事来源',
 
 
 

resources/views/sports/base_form.blade.php

@@ -128,6 +128,24 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label">赛事属性</label>
+            <div class="layui-input-block">
+                @if(isset($is_rollball) && isset($is_today) && isset($is_morningplate) && isset($is_stringscene))
+                    <input type="checkbox" name="is_rollball" title="是否滚球" @if($is_rollball=='1') checked @endif >
+                    <input type="checkbox" name="is_today" title="是否今日" @if($is_today=='1') checked @endif>
+                    <input type="checkbox" name="is_morningplate" title="是否早盘" @if($is_morningplate=='1') checked @endif>
+                    <input type="checkbox" name="is_stringscene" title="是否串场" @if($is_stringscene=='1') checked @endif>
+                @else
+                    <input type="checkbox" name="is_rollball" title="是否滚球">
+                    <input type="checkbox" name="is_today" title="是否今日">
+                    <input type="checkbox" name="is_morningplate" title="是否早盘">
+                    <input type="checkbox" name="is_stringscene" title="是否串场">
+                @endif
+
+            </div>
+        </div>
+
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">

resources/views/sports/base_match.blade.php

@@ -54,35 +54,52 @@
                         <div class="layui-input-inline">
                             <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="name_chinese" id="home_team" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
                             <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
-                                @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
-                                @endif
-                                @endforeach
-                            </select>
+                        <label class="layui-form-label">{{ trans('sportsnotelist.date') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
-                    </div>
-
+                    </div>~
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">

resources/views/sports/basket_form.blade.php

@@ -128,6 +128,24 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label">赛事属性</label>
+            <div class="layui-input-block">
+                @if(isset($is_rollball) && isset($is_today) && isset($is_morningplate) && isset($is_stringscene))
+                    <input type="checkbox" name="is_rollball" title="是否滚球" @if($is_rollball=='1') checked @endif >
+                    <input type="checkbox" name="is_today" title="是否今日" @if($is_today=='1') checked @endif>
+                    <input type="checkbox" name="is_morningplate" title="是否早盘" @if($is_morningplate=='1') checked @endif>
+                    <input type="checkbox" name="is_stringscene" title="是否串场" @if($is_stringscene=='1') checked @endif>
+                @else
+                    <input type="checkbox" name="is_rollball" title="是否滚球">
+                    <input type="checkbox" name="is_today" title="是否今日">
+                    <input type="checkbox" name="is_morningplate" title="是否早盘">
+                    <input type="checkbox" name="is_stringscene" title="是否串场">
+                @endif
+
+            </div>
+        </div>
+
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">

resources/views/sports/basket_match.blade.php

@@ -54,35 +54,52 @@
                         <div class="layui-input-inline">
                             <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="name_chinese" id="home_team" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
                             <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
-                                @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
-                                @endif
-                                @endforeach
-                            </select>
+                        <label class="layui-form-label">{{ trans('sportsnotelist.date') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
-                    </div>
-
+                    </div>~
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">

resources/views/sports/soccer_form.blade.php

@@ -128,6 +128,24 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label">赛事属性</label>
+            <div class="layui-input-block">
+                @if(isset($is_rollball) && isset($is_today) && isset($is_morningplate) && isset($is_stringscene))
+                    <input type="checkbox" name="is_rollball" title="是否滚球" @if($is_rollball=='1') checked @endif >
+                    <input type="checkbox" name="is_today" title="是否今日" @if($is_today=='1') checked @endif>
+                    <input type="checkbox" name="is_morningplate" title="是否早盘" @if($is_morningplate=='1') checked @endif>
+                    <input type="checkbox" name="is_stringscene" title="是否串场" @if($is_stringscene=='1') checked @endif>
+                @else
+                    <input type="checkbox" name="is_rollball" title="是否滚球">
+                    <input type="checkbox" name="is_today" title="是否今日">
+                    <input type="checkbox" name="is_morningplate" title="是否早盘">
+                    <input type="checkbox" name="is_stringscene" title="是否串场">
+                @endif
+
+            </div>
+        </div>
+
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">

resources/views/sports/soccer_match.blade.php

@@ -54,35 +54,52 @@
                         <div class="layui-input-inline">
                             <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="name_chinese" id="home_team" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
                             <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
-                                @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
-                                @endif
-                                @endforeach
-                            </select>
+                        <label class="layui-form-label">{{ trans('sportsnotelist.date') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
-                    </div>
-
+                    </div>~
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">

resources/views/sports/tennis_form.blade.php

@@ -128,6 +128,24 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label">赛事属性</label>
+            <div class="layui-input-block">
+                @if(isset($is_rollball) && isset($is_today) && isset($is_morningplate) && isset($is_stringscene))
+                    <input type="checkbox" name="is_rollball" title="是否滚球" @if($is_rollball=='1') checked @endif >
+                    <input type="checkbox" name="is_today" title="是否今日" @if($is_today=='1') checked @endif>
+                    <input type="checkbox" name="is_morningplate" title="是否早盘" @if($is_morningplate=='1') checked @endif>
+                    <input type="checkbox" name="is_stringscene" title="是否串场" @if($is_stringscene=='1') checked @endif>
+                @else
+                    <input type="checkbox" name="is_rollball" title="是否滚球">
+                    <input type="checkbox" name="is_today" title="是否今日">
+                    <input type="checkbox" name="is_morningplate" title="是否早盘">
+                    <input type="checkbox" name="is_stringscene" title="是否串场">
+                @endif
+
+            </div>
+        </div>
+
         @if(S('ACTION')!='view')
             <div class="layui-form-item">
                 <div class="layui-input-block">

resources/views/sports/tennis_match.blade.php

@@ -54,35 +54,52 @@
                         <div class="layui-input-inline">
                             <input type="text" name="home_team" id="home_team" eventType="event-query"  value="{{ $home_team }}" lay-verify="required" autocomplete="off" class="layui-input">
                         </div>
+                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="name_chinese" id="home_team" eventType="event-query"  value="{{ $name_chinese }}" lay-verify="required" autocomplete="off" class="layui-input">
+                        </div>
                         <div class="layui-input-inline checkbox">
                             <input type="checkbox" name="sureblur" id="form_sureblur" lay-skin="switch" lay-text="精确|模糊" @if(!isset($sureblurs) || $sureblurs=='on') checked @endif  class="layui-input" eventType=event-query>
                             <input type="hidden" name="sureblurs" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblurs }}">
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>--}}
+                        {{--<div class="layui-input-inline" style="width: 200px">--}}
+                            {{--<select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>--}}
+                                {{--<option value="-1"></option>--}}
+                                {{--@foreach($league as $k=>$v):--}}
+                                {{--@if($name_chinese==$v['name_chinese']))--}}
+                                {{--<option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>--}}
+                                {{--@else--}}
+                                    {{--<option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>--}}
+                                {{--@endif--}}
+                                {{--@endforeach--}}
+                            {{--</select>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.league_search') }}</label>
-                        <div class="layui-input-inline" style="width: 200px">
-                            <select name="name_chinese"  id="form_name_chinese"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="-1"></option>
-                                @foreach($league as $k=>$v):
-                                @if($name_chinese==$v['name_chinese']))
-                                <option value="{{$v['name_chinese']}}" selected="selected">{{$v['name_chinese']}}</option>
-                                @else
-                                    <option value="{{$v['name_chinese']}}">{{$v['name_chinese']}}</option>
-                                @endif
-                                @endforeach
-                            </select>
+                        <label class="layui-form-label">{{ trans('sportsnotelist.date') }}</label>
+                        <div class="layui-input-inline">
+                            <input type="text" name="star_time" value="{{ $star_time }}" id="form_star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
-                    </div>
-
+                    </div>~
                     <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>
+                        {{--<label class="layui-form-label">{{ trans('sportsnotelist.end_time') }}</label>--}}
                         <div class="layui-input-inline">
-                            <input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                            <input type="text" name="end_time" value="{{ $end_time }}" id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
                         </div>
                     </div>
 
+                    {{--<div class="layui-inline">--}}
+                        {{--<label class="layui-form-label">{{ trans('sportssoccer.date_search') }}</label>--}}
+                        {{--<div class="layui-input-inline">--}}
+                            {{--<input type="text" name="match_date" value="{{ $match_date }}" id="match_date" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>--}}
+                        {{--</div>--}}
+                    {{--</div>--}}
+
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('sportssoccer.match_status_search') }}</label>
                         <div class="layui-input-inline" style="width: 100px">