异常处理

app/Http/Controllers/Admin/MoneyController.php

@@ -645,11 +645,11 @@ class MoneyController extends Controller
         $sureblur = Request::has('sureblur') ? Request::get('sureblur') : '';
         if (empty($account)) {
             $data = array(
-                array(
+                /*array(
                     'account_name' => '',
                     'account_identity' => '',
                     'cash' => '',
-                ),
+                ),*/
             );
             return \App\Lib\DataTable\DataTable::init()->toJson($data, 1);
         }

app/Http/Controllers/Admin/SportsfootController.php

@@ -803,7 +803,11 @@ class SportsfootController extends Controller {
 		return responseToJson(1); 
 	}
 
-	//更新赛事比分
+	
+	/**
+	 * 更新赛事比分
+	 * 追加 赛事及所属注单作废处理
+	 */
 	function updatenum(Req $req){
 		$match_id = $req->match_id;
 		$newapp = new \App\Models\Stzqresult();
@@ -819,28 +823,11 @@ class SportsfootController extends Controller {
 
 		//更新比分 默认 status
 		$status = 2;
-		//追加判断比分 如果都== -1，则作废该赛事
-		if($data['u_home_score'] < 0 and $data['u_guest_score'] < 0 and $data['home_score'] < 0 and $data['guest_score'] < 0){
-			//已结算作废赛事处理
-			if($match_status == 3){
-				$url = 'http://stadmin.bocai108.com:9094/UnSettelement';
-				$data_up = [
-					'token'=>session('adminInfo.token'),
-					'game_code'=>'zq',
-					'match_id'=>$match_id,
-				];
-				$ret_json = commonFunction::https_request($url,$data_up);
-				// $ret_json = '{"status":1,"msg":"撤销成功!2019-10-26 16:28:30 取消赛事处理--结束end：game_code= zq  match_id= 40986 \n","data":[]}';
 
-				$ret_arr = json_decode($ret_json,true);
-				if($ret_arr['status'] != 1){
-					return responseToJson(-20003);
-				}
-			}
-			//赛事下单式注单作废，串关注单下此赛事按平局处理
-			$upapp = new \App\Models\SportsNoteList();
-			$upapp->delorder($match_id,'zq');
-			$status = 4;
+		//赛事下注单作废 处理
+		if(in_array(-1,$data)){
+			commonFunction::HandleInvalid($data,$match_id,$match_status,'zq');
+			// $this->HandleInvalid($data,$match_id,$match_status,'zq');
 		}
 
 		$newapp->updateInfo($data,$match_id);//联赛id
@@ -875,6 +862,103 @@ class SportsfootController extends Controller {
 
 		return responseToJson(1);
 	}
+
+	/**
+	 * 赛事下注单作废处理
+	 * 弃用 保留备份
+	 */
+	function HandleInvalid($data=[],$match_id='',$match_status='',$game_code=''){
+		//===作废处理===
+		$moneyBuyMatch = new \App\Models\MoneyBuyMatch();
+
+		//获取赛事下所有单式注单
+		$select = ['money_buy_simplex.order_id', 'money_buy_simplex.match_id', 'money_buy_simplex.account_identity', 'money_buy_simplex.account_name','money_buy_simplex.money', 'money_buy_simplex.gain_money','money_buy_match.odds_code','st_odds_code.odds_name'];		
+		//obj
+		$match_order_sim_obj = $moneyBuyMatch->allsimplexorder($match_id,$game_code,$select);
+
+		//获取赛事下所有串式注单
+		$select = ['money_buy_str.order_id', 'money_buy_match.match_id', 'money_buy_str.account_identity', 'money_buy_str.account_name','money_buy_str.money', 'money_buy_str.gain_money','st_odds_code.odds_name','money_buy_match.odds_code'];		
+		//obj
+		$match_order_str_obj = $moneyBuyMatch->allstrorder($match_id,$game_code,$select);
+
+		//如果赛事下有 单式 注单
+		if(!empty($match_order_sim_obj)){
+			//获取单式注单中 待处理注单
+			$oddsData_sim = $this->getOrderData($data,$match_order_sim_obj,$game_code);
+		}
+
+		//如果赛事下有 串式 注单
+		if(!empty($match_order_str_obj)){
+			//获取串式注单中 待处理注单
+			$oddsData_str = $this->getOrderData($data,$match_order_str_obj,$game_code);
+		}
+
+		//如果是已结算赛事 
+		if($match_status == 3){
+			//合并上半场/全场 待处理 单式+串式订单
+			$oddsData = array_merge($oddsData_sim,$oddsData_str);
+			//去重
+			$oddsData = commonFunction::uniquArrV2($oddsData,'order_id');
+
+			$url = 'http://stadmin.bocai108.com:9094/UnsetOneOrder';
+			$data_up = [
+				'token'=>session('adminInfo.token'),
+				'game_code'=>$game_code,
+				'match_id'=>$match_id,
+			];
+
+			//返回请求状态码
+			$set_status = [];
+			foreach($oddsData as $k=>$v){
+				$data_up['order_id'] = $v['order_id'];
+				$ret_json = commonFunction::https_request($url,$data_up);
+				$ret_arr = json_decode($ret_json,true);
+				$set_status[] = $ret_arr['status'];
+			}
+			if(in_array(0,$set_status)){
+				return responseToJson(-20003);
+			}
+		}else{
+			//未结算赛事 处理 下单式注单作废，串关注单下此赛事按平局处理
+			$oddsData_str = $oddsData_str->toArray();
+			$upapp = new \App\Models\SportsNoteList();
+			$upapp->delorder($match_id,$game_code,$match_order_sim_obj,$oddsData_str);
+		}
+		//=== end ===
+	}
+	/**
+	 * 获取赛事下 符合条件 待处理注单
+	 * 弃用 保留备份
+	 */
+	function getOrderData($data,$match_order,$game_code){
+		//足球 获取 上半场/全场
+		if($game_code == 'zq'){
+			// 获取上半场作废 需处理 单式注单
+			$matchOdds_h = [];
+			if($data['u_home_score'] == -1 and $data['u_guest_score'] == -1){
+				foreach($match_order as $k=>$v){
+					$tmparray = explode('上半场',$v->odds_name);
+					if(count($tmparray) > 1){
+						$matchOdds_h[] = $v;
+					}
+				}
+			}
+			//获取全场作废 需处理 单式注单
+			$matchOdds_f = [];
+			if($data['home_score'] == -1 and $data['guest_score'] == -1){
+				foreach($match_order as $k=>$v){
+					$tmparray = explode('全场',$v->odds_name);
+					if(count($tmparray) > 1){
+						$matchOdds_f[] = $v;
+					}
+				}
+			}
+
+			$orderData = array_merge($matchOdds_h,$matchOdds_f);
+		}
+		
+		return $orderData;
+	}
  		
 	//添加赛事结束纪录
 	function addcomendnotice($match_id){

app/Http/Controllers/Api/WriteSportsController.php

@@ -1962,7 +1962,7 @@ class WriteSportsController extends BaseController
             $model = commonFunction::getModels($game_code, 1);
             //获取所有赛事 match_id
             $local_match = $model['model_local_match']::SELECT('others_match_id', 'match_id')
-                ->where(['source' => $source])
+                // ->where(['source' => $source])
                 ->whereIn('identity',$match_uuids)
                 ->get()->toArray();
             if (empty($local_match)) throw new \Exception(Response::generate('', Response::MATCHID_NULL));

app/Lib/Biz/Sport/Common.php

@@ -1319,7 +1319,6 @@ class Common
                 $temp[$key] = $array[$key][$index];
 
                 if ($temp[$key] == $value) {
-
                     $newarray = $array[$key];
                     return $newarray;
 
@@ -1350,7 +1349,123 @@ class Common
     }
 
 
+     //根据球类追加限定玩法
+     public static function getOddsPcode($game_code = 'zq'){
+
+        $p_code = [];
+
+        if($game_code == 'zq'){
+            $p_code = ['C','B','TG','CB','TB','GS','CO','TS'];
+        }
+        if($game_code == 'lq'){
+            $p_code = ['LN','C','TN','TS','TB','CO'];
+        }
+        if($game_code == 'wq'){
+            $p_code = ['LB','TN','TS','B','LD','C'];
+        }
+        if($game_code == 'bq'){
+            $p_code = ['CO','C','TN','TS'];
+        }
+
+        return $p_code;
+    }
 
+    /**
+	 * 赛事下注单作废处理
+	 */
+	public static function HandleInvalid($data=[],$match_id='',$match_status='',$game_code=''){
+		//===作废处理===
+		$moneyBuyMatch = new \App\Models\MoneyBuyMatch();
+
+		//获取赛事下所有单式注单
+		$select = ['money_buy_simplex.order_id', 'money_buy_simplex.match_id', 'money_buy_simplex.account_identity', 'money_buy_simplex.account_name','money_buy_simplex.money', 'money_buy_simplex.gain_money','money_buy_match.odds_code','st_odds_code.odds_name'];		
+		//obj
+		$match_order_sim_obj = $moneyBuyMatch->allsimplexorder($match_id,$game_code,$select);
+
+		//获取赛事下所有串式注单
+		$select = ['money_buy_str.order_id', 'money_buy_match.match_id', 'money_buy_str.account_identity', 'money_buy_str.account_name','money_buy_str.money', 'money_buy_str.gain_money','st_odds_code.odds_name','money_buy_match.odds_code'];		
+		//obj
+		$match_order_str_obj = $moneyBuyMatch->allstrorder($match_id,$game_code,$select);
+
+		//如果赛事下有 单式 注单
+		if(!empty($match_order_sim_obj)){
+			//获取单式注单中 待处理注单
+			$oddsData_sim = self::getOrderData($data,$match_order_sim_obj,$game_code);
+		}
+
+		//如果赛事下有 串式 注单
+		if(!empty($match_order_str_obj)){
+			//获取串式注单中 待处理注单
+			$oddsData_str = self::getOrderData($data,$match_order_str_obj,$game_code);
+		}
+
+		//如果是已结算赛事 
+		if($match_status == 3){
+			//合并上半场/全场 待处理 单式+串式订单
+			$oddsData = array_merge($oddsData_sim,$oddsData_str);
+			//去重
+			$oddsData = self::uniquArrV2($oddsData,'order_id');
+
+			$url = 'http://stadmin.bocai108.com:9094/UnsetOneOrder';
+			$data_up = [
+				'token'=>session('adminInfo.token'),
+				'game_code'=>$game_code,
+				'match_id'=>$match_id,
+			];
+
+			//返回请求状态码
+			$set_status = [];
+			foreach($oddsData as $k=>$v){
+				$data_up['order_id'] = $v['order_id'];
+				$ret_json = self::https_request($url,$data_up);
+				$ret_arr = json_decode($ret_json,true);
+				$set_status[] = $ret_arr['status'];
+			}
+			if(in_array(0,$set_status)){
+				return responseToJson(-20003);
+			}
+		}else{
+			//未结算赛事 处理 下单式注单作废，串关注单下此赛事按平局处理
+			$oddsData_str = $oddsData_str->toArray();
+			$upapp = new \App\Models\SportsNoteList();
+			$upapp->delorder($match_id,$game_code,$match_order_sim_obj,$oddsData_str);
+		}
+		//=== end ===
+	}
+	/**
+	 * 获取赛事下 符合条件 待处理注单
+	 */
+	public static function getOrderData($data,$match_order,$game_code){
+		//足球 获取 上半场/全场
+		if($game_code == 'zq'){
+			// 获取上半场作废 需处理 单式注单
+			$matchOdds_h = [];
+			if($data['u_home_score'] == -1 and $data['u_guest_score'] == -1){
+				foreach($match_order as $k=>$v){
+					$tmparray = explode('上半场',$v->odds_name);
+					if(count($tmparray) > 1){
+						$matchOdds_h[] = $v;
+					}
+				}
+			}
+			//获取全场作废 需处理 单式注单
+			$matchOdds_f = [];
+			if($data['home_score'] == -1 and $data['guest_score'] == -1){
+				foreach($match_order as $k=>$v){
+					$tmparray = explode('全场',$v->odds_name);
+					if(count($tmparray) > 1){
+						$matchOdds_f[] = $v;
+					}
+				}
+			}
+
+			$orderData = array_merge($matchOdds_h,$matchOdds_f);
+		}
+		
+		return $orderData;
+	}
+
+   
 }
 
 ?>

app/Lib/Settlement/Adapter/WqRule.php

@@ -19,7 +19,9 @@ class WqRule
         $odds_code = $model->odds_code;
         $home_team = trim($model->home_team);
         $guest_team = trim($model->guest_team);
+        $all_winner = $resultModel['0']->match_winer_player;
 
+        /*
         if (in_array($odds_code, ['ch', 'cg'])) {
             $resultModel = DB::table('st_wq_league_result')->where(['lg_id' => $model->lg_id, 'status' => 1])->first();
             $all_winner = trim($resultModel->result);
@@ -32,9 +34,16 @@ class WqRule
                 return $this->wq_gj_all($all_winner, $guest_team);
             }
         }
+        */
 
         $stand_datas = $this->wq_scoreDatas($resultModel);
         switch ($odds_code) {
+            case 'ch':
+                $return = $this->wq_gj_all($all_winner, $home_team);
+                break;
+            case 'cg':
+                $return = $this->wq_gj_all($all_winner, $guest_team);
+                break;
             case 'ch_1':
                 $return = $this->wq_gj_sine($home_team, $guest_team, $stand_datas['list']['1'], 1);
                 break;

app/Models/MoneyBuyMatch.php

@@ -27,19 +27,25 @@ class MoneyBuyMatch extends Model
     }
 
     //赛事下所有下注单式下单
-    function allsimplexorder($ssid, $code)
+    function allsimplexorder($ssid='', $code='',$select=[])
     {
         //单式下单
         $where = array();
         $where[] = array('money_buy_match.match_id', '=', $ssid);
         $where[] = array('money_buy_match.bet_type', '=', 1);
         $where[] = array('money_buy_match.game_code', '=', $code);
-        $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->select('money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.account_identity', 'money_buy_simplex.info_identity', 'money_buy_simplex.match_id')->where($where)->get()->toArray();
+
+        if(empty($select)){
+            $select = ['money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.account_identity', 'money_buy_simplex.info_identity', 'money_buy_simplex.match_id'];
+            $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->select($select)->where($where)->get()->toArray();
+        }else{
+            $data = $this->join('money_buy_simplex', 'money_buy_match.batch_id', '=', 'money_buy_simplex.batch_id')->join('st_odds_code', 'money_buy_match.odds_code', '=', 'st_odds_code.odds_code')->select($select)->where($where)->get();
+        }
         return $data;
     }
 
     //赛事下所有下注串式下单
-    function allstrorder($ssid,$game_code = '')
+    function allstrorder($ssid='',$game_code = '',$select=[])
     {
         //串式下单
         $where = array();
@@ -48,7 +54,12 @@ class MoneyBuyMatch extends Model
         if(!empty($game_code)){
             $where[] = array('money_buy_match.game_code', '=', $game_code);
         }
-        $data = $this->join('money_buy_str', 'money_buy_match.batch_id', '=', 'money_buy_str.batch_id')->select('money_buy_str.order_id')->where($where)->distinct('money_buy_match.batch_id')->get()->toArray();
+        if(empty($select)){
+            $select = ['money_buy_str.order_id'];
+            $data = $this->join('money_buy_str', 'money_buy_match.batch_id', '=', 'money_buy_str.batch_id')->select($select)->where($where)->distinct('money_buy_match.batch_id')->get()->toArray();
+        }else{
+            $data = $this->join('money_buy_str', 'money_buy_match.batch_id', '=', 'money_buy_str.batch_id')->join('st_odds_code', 'money_buy_match.odds_code', '=', 'st_odds_code.odds_code')->select($select)->where($where)->distinct('money_buy_match.batch_id')->get();
+        }
         return $data;
     }
 

app/Models/SportsNoteList.php

@@ -953,15 +953,27 @@ class SportsNoteList extends BaseModel
 
     }
 
-    //作废赛事下注单处理
-    function delorder($matchid,$type){
+    /**
+     * 作废赛事下注单处理
+     * $matchid int 赛事id
+     * $type str 球类代码 zq lq wq bq
+     * $orders_sim obj 待处理单式注单数据 非必须
+     * $orders_str obj 待处理串式注单数据 非必须
+     */
+    function delorder($matchid,$type,$orders_sim=[],$orders_str=[]){
         //该赛事的单式注单
         $account_identitys = array();
+        if(empty($orders_sim)){
+            //无注单时，按整个赛事查询
+            $orders = $this->where(['match_id'=>$matchid,'game_code'=>$type])->get();
+        }else{
+            //有注单时 按注单处理
+            $orders = $orders_sim;
+        }
         $order_ids = array();
-        $orders = $this->where(['match_id'=>$matchid,'game_code'=>$type])->get();
         if(!empty($orders)){
             for ($c=0; $c < count($orders); $c++){
-                $account_identitys[] = $orders[$c]['account_identitys'];
+                $account_identitys[] = $orders[$c]['account_identity'];
                 $order_ids[] = $orders[$c]['order_id'];
             }
             //用戶账户金额
@@ -1005,7 +1017,7 @@ class SportsNoteList extends BaseModel
                 $models->status = '1';
                 try {
                     DB::beginTransaction();//开启事务
-                    $this->where('id', $orders[$i]['id'])->update(['status' => '2','use_mark'=>'注单所属赛事作废']);
+                    $this->where('id', $orders[$i]['id'])->update(['status' => '2','use_mark'=>'通过设置赛事比分作废']);
                     \App\Models\Account_detailed::where('account_identity', $orders[$i]->account_identity)->update(['available_cash' => $new_available_cash, 'cash' => $new_available_cash]);
                     $models->save();
 
@@ -1018,9 +1030,14 @@ class SportsNoteList extends BaseModel
         }
 
         //该赛事相关的的串关注单做平局处理
-        \App\Models\MoneyBuyMatch::where('match_id',$matchid)->where('game_code',$type)->where('bet_type',2)->update(['result'=>2]);
-
-
+        if(empty($orders_str)){
+            //无注单时，按整个赛事处理
+            \App\Models\MoneyBuyMatch::where('match_id',$matchid)->where('game_code',$type)->where('bet_type',2)->update(['result'=>2]);
+        }else{
+            //有串式注单时 按注单id处理
+            $order_ids_str = array_column($orders_str,'order_id');
+            \App\Models\MoneyBuyMatch::where('match_id',$matchid)->where('game_code',$type)->whereIn('order_id',$order_ids_str)->where('bet_type',2)->update(['result'=>2]);
+        }
     }
 
 

resources/views/admin/Manager/arictle.blade.php

@@ -52,6 +52,7 @@
                 </div>
             </form>
         </div>
+    </div>
         @push('dataTableJS')
 
             //重置表单
@@ -72,7 +73,5 @@
 
         @include('vip.datatable')
         <link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"  />
-    </div>
-    </div>
 
 @endsection

resources/views/admin/Regulation/index.blade.php

@@ -39,9 +39,7 @@
     {{--</script>--}}
     <div class="layui-row">
 
-        <div class="layui-col-xs12">
-
-            <div class="layui-form-item">
+        <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
 
                 <form class="layui-form rewrite" action="" eventType=eventForm>
                     <div class="layui-inline">
@@ -67,7 +65,6 @@
 
 
                 </form>
-            </div>
         </div>
     </div>
     @push('dataTableJS')
@@ -116,7 +113,7 @@
     </script>
 
     @include('vip.datatable')
-    <div id="content_iframe" style="width: 1000px;height: 500px">
+    <div id="content_iframe" style="width: 1000px;">
 
     </div>
 @endsection

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

@@ -78,7 +78,7 @@
         @{{#} }}
         -->
 
-        <a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">赛事结果比分记录</a>
+        <a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">比分记录</a>
     </script>
 
     <script type="text/html" id="status">
@@ -129,11 +129,11 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-xs layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('bq')">刷新赛事</i></a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('bq')">刷新赛事</i></a>
                         <!--@if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif-->
                         @if(checkRriv('/admin/sportsbq/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbq/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                         @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
-                        @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
                         @if(checkRriv('/admin/sportsbq/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbq/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
                     </div>
                 </div>
@@ -360,7 +360,7 @@
                 success: function(data) {
                     let length = data.list.length;
                     if(length <= 0){
-                        layer.alert('该赛事还没有赛事结果比分记录');
+                        layer.alert('该赛事还没有比分记录');
                         return false;
                     }
 
@@ -406,7 +406,7 @@
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['900px', '500px']
-                        ,title: '<h2>赛事结果比分记录<h2>'
+                        ,title: '<h2>比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化
                         ,anim: 1 //0-6的动画形式，-1不开启

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

@@ -70,7 +70,7 @@
         <a href="javascript:;" onclick="revoke(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-danger">已作废</a>
         @{{#} }}
         -->
-		<a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">赛事结果比分记录</a>
+		<a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">比分记录</a>
     </script>
 
     <script type="text/html" id="status">
@@ -121,11 +121,11 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-xs layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('wq')">刷新赛事</i></a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('wq')">刷新赛事</i></a>
                         <!--@if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif-->
                         @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                         @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
-                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
                         @if(checkRriv('/admin/sportsbk/Settlement'))<a href="javascript:allbalance('/admin/sportsbk/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
                     </div>
                 </div>
@@ -338,7 +338,7 @@
                 success: function(data) {
                     let length = data.list.length;
                     if(length <= 0){
-                        layer.alert('该赛事还没有赛事结果比分记录');
+                        layer.alert('该赛事还没有比分记录');
                         return false;
                     }
 
@@ -373,7 +373,7 @@
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['660px', '500px']
-                        ,title: '<h2>赛事结果比分记录<h2>'
+                        ,title: '<h2>比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化
                         ,anim: 1 //0-6的动画形式，-1不开启

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

@@ -182,7 +182,7 @@
         <a href="javascript:;" onclick="lqrevoke(@{{d.match_id}})" class="layui-btn layui-btn-sm layui-btn-danger">已作废</a>
         @{{#} }}
         -->
-        <a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">赛事结果比分记录</a>
+        <a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">比分记录</a>
     </script>
     
     <script type="text/html" id="sectionone_two">
@@ -249,11 +249,11 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-xs layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('lq')">刷新赛事</i></a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('lq')">刷新赛事</i></a>
                         <!-- @if(checkRriv('/admin/sportsbk/addoutcome'))<a href="/admin/sportsbk/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsbk/deleteoutcome'))<a href="javascript:delWin('/admin/sportsbk/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                         @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
-                        @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
                         @if(checkRriv('/admin/sportsbk/Settlementlq'))<a href="javascript:allbalance('/admin/sportsbk/Settlementlq?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
                     </div>
                 </div>
@@ -580,7 +580,7 @@
                 success: function(data) {
                     let length = data.list.length;
                     if(length <= 0){
-                        layer.alert('该赛事还没有赛事结果比分记录');
+                        layer.alert('该赛事还没有比分记录');
                         return false;
                     }
 
@@ -612,7 +612,7 @@
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['640px', '500px']
-                        ,title: '<h2>赛事结果比分记录<h2>'
+                        ,title: '<h2>比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化
                         ,anim: 1 //0-6的动画形式，-1不开启

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

@@ -51,7 +51,7 @@
             @{{#if(d.status==5){ }}
             <a href="javascript:;" class="layui-btn layui-btn-sm layui-btn-danger">结算中</a>
             @{{#} }}
-            <a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">赛事结果比分记录</a>
+            <a href="javascript:;" onclick="resultLog(@{{d.match_id}})" class="layui-btn layui-btn-sm">比分记录</a>
     </script>
 
     <script type="text/html" id="statusmatch">
@@ -138,11 +138,11 @@
                     <div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" eventType="event-query-submit" style="opacity: 1; pointer-events: auto;">提交</a>
                         <a  class="layui-btn   layui-btn-sm layui-btn-normal reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
-                        <a class="layui-btn layui-btn-xs layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('zq')">刷新赛事</i></a>
+                        <a class="layui-btn layui-btn-sm layui-btn-green" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon" onclick="refreshall('zq')">刷新赛事</i></a>
                         <!-- @if(checkRriv('/admin/sportsfoot/addoutcome'))<a href="/admin/sportsfoot/addoutcome" class="layui-btn layui-btn-sm ">添加</a>@endif -->
                         @if(checkRriv('/admin/sportsfoot/deleteoutcome'))<a href="javascript:delWin('/admin/sportsfoot/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif
                         @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=1&id=');" class="layui-btn layui-btn-sm set">结算全场</a>@endif
-                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-xs">结算上半场</a>@endif
+                        @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm">结算上半场</a>@endif
                         @if(checkRriv('/admin/sportsfoot/Settlement'))<a href="javascript:allbalance('/admin/sportsfoot/Settlement?allhalf=2&id=');" class="layui-btn layui-btn-sm set">重新结算上半场</a>@endif
                         {{--@if(checkRriv('/admin/sportsfoot/revokeft'))<a href="javascript:allrevoke('/admin/sportsfoot/revokeft?iszf=1&id=');" class="layui-btn layui-btn-sm  layui-btn-danger">作废</a>@endif--}}
                     </div>
@@ -406,7 +406,7 @@
                 success: function(data) {
                     let length = data.list.length;
                     if(length <= 0){
-                        layer.alert('该赛事还没有赛事结果比分记录');
+                        layer.alert('该赛事还没有比分记录');
                         return false;
                     }
 
@@ -466,7 +466,7 @@
                     resultLogOpen = layer.open({
                         type: 1 //Page层类型
                         ,area: ['900px', '85%']
-                        ,title: '<h2>赛事结果比分记录<h2>'
+                        ,title: '<h2>比分记录<h2>'
                         ,shade: 0.6 //遮罩透明度
                         ,maxmin: true //允许全屏最小化
                         ,anim: 1 //0-6的动画形式，-1不开启

resources/views/admin/user/index.blade.php

@@ -186,8 +186,8 @@
 							</div>
 						</div>
 					
-						 <div class="layui-inline" style="width: 30%">
-							<div class="layui-input-inline"  style="width: 200px">
+						 <div class="layui-inline">
+							<div class="layui-input-inline"  style="width: 140px">
 								<select name="select_type" id="form_select_type" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
 									<option value="">{{ trans('user.select_option') }}</option>
 									@foreach(trans('user.select_type') as $k=>$v):
@@ -204,9 +204,9 @@
 							</div>
 						</div>
 					
-						<div class="layui-inline" style="width: 20%">
+						<div class="layui-inline">
 							<label class="layui-form-label">{{ trans('user.grade') }}</label>
-							<div class="layui-input-inline"  style="width: 200px">
+							<div class="layui-input-inline"  style="width: 150px">
 								<select name="grade" id="form_grade" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
 									<option value="">{{ trans('user.select_grade') }}</option>
 									@foreach($gradelist as $k=>$v):
@@ -236,9 +236,9 @@
 							</div>
 						</div> -->
 
-						<div class="layui-inline" style="width: 20%">
+						<div class="layui-inline">
 							<label class="layui-form-label">{{ trans('user.statuss') }}</label>
-							<div class="layui-input-inline" style="width: 200px">
+							<div class="layui-input-inline" style="width: 178px">
 								<select name="statuss" id="form_statuss" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
 									<option value="">{{ trans('user.select_statuss') }}</option>
 									@foreach(trans('status.account_detailed.statuss') as $k=>$v):

resources/views/admin/welcome.blade.php

@@ -311,7 +311,7 @@
             legend: {
                 data: []
             },
-            color:['red','black','blue','yellow','#15f77a','#02f1d0','#ed02f1'],
+            color:['red','#b39d7d','blue','yellow','#15f77a','#02f1d0','#ed02f1'],
             grid: {
                 left: '3%',
                 right: '4%',

resources/views/sports/base_league.blade.php

@@ -104,7 +104,7 @@
                             <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
                             <div class="layui-input-inline" style="width: 200px">
                                 <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
-                                    <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                                    <option value="{{ isset($country_id)?$country_id:'' }}">请先选择地区</option>
                                 </select>
                             </div>
                         </div>
@@ -273,7 +273,11 @@
                     var option = '';
                     option += '<option value></option>';
                     for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
-                        option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        if("{{$country_id }}" == data[i]["id"]){
+                            option += "<option value="+data[i]["id"]+" selected='selected'>"+data[i]["name"]+"</option>";
+                        }else{
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
                     }
                     $("#country_id").html(option);
                     //重新渲染select

resources/views/sports/basket_league.blade.php

@@ -105,7 +105,7 @@
                         <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                                <option value="{{ isset($country_id)?$country_id:'' }}">请先选择地区</option>
                             </select>
                         </div>
                     </div>
@@ -274,7 +274,11 @@
                     var option = '';
                     option += '<option value></option>';
                     for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
-                        option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        if("{{$country_id }}" == data[i]["id"]){
+                            option += "<option value="+data[i]["id"]+" selected='selected'>"+data[i]["name"]+"</option>";
+                        }else{
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
                     }
                     $("#country_id").html(option);
                     //重新渲染select

resources/views/sports/soccer_league.blade.php

@@ -106,7 +106,7 @@
                         <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                                <option value="{{ isset($country_id)?$country_id:'' }}">请先选择地区</option>
                             </select>
                         </div>
                     </div>
@@ -155,7 +155,7 @@
                 var span = $(this).prev();
                 var id = span.attr('data-id');
                 // openWin('/admin/system/AddMenu','{{ trans("menu.menu_edit")}}','600px','500px',id);
-            })
+            });
             $('body').on('click','#form_sureblur~.layui-form-switch',function(){
                 var sus = $('#form_sureblur').next().text();
                 if(sus=='精确'){
@@ -163,7 +163,7 @@
                 }else{
                     $('#form_sureblurs').val('off');
                 }
-            })
+            });
         })
     </script>
     @push('dataTableJS')
@@ -262,6 +262,7 @@
     @include('vip.datatable')
     <script>
         var id = $('#form_area_id').val();
+        var country_id = "{{$country_id }}";
         if(id != ''){
             $.ajax({
                 type:'get',
@@ -272,7 +273,11 @@
                     var option = '';
                     option += '<option value></option>';
                     for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
-                        option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        if(country_id == data[i]["id"]){
+                            option += "<option value="+data[i]["id"]+" selected='selected'>"+data[i]["name"]+"</option>";
+                        }else{
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
                     }
                     $("#country_id").html(option);
                     //重新渲染select
@@ -306,7 +311,8 @@
                         form.render('select');
                     },
                 });
-            })
+            });
+
             //监听提交
             form.on('submit(submitForm)', function(data){
                 return true;

resources/views/sports/tennis_league.blade.php

@@ -104,7 +104,7 @@
                         <label class="layui-form-label">{{ trans('sportssoccer.country_search') }}</label>
                         <div class="layui-input-inline" style="width: 200px">
                             <select name="country_id"  id="country_id" lay-filter="sect_country" autocomplete="off" class="layui-input"  eventType=event-query>
-                                <option value="{{ isset($country_id)?$country_id:'' }}"></option>
+                                <option value="{{ isset($country_id)?$country_id:'' }}">请先选择地区</option>
                             </select>
                         </div>
                     </div>
@@ -276,7 +276,11 @@
                     var option = '';
                     option += '<option value></option>';
                     for(var i=0;i<data.length;i++){  //循环获取返回值，并组装成html代码
-                        option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        if("{{$country_id }}" == data[i]["id"]){
+                            option += "<option value="+data[i]["id"]+" selected='selected'>"+data[i]["name"]+"</option>";
+                        }else{
+                            option += "<option value="+data[i]["id"]+">"+data[i]["name"]+"</option>";
+                        }
                     }
                     $("#country_id").html(option);
                     //重新渲染select

resources/views/vip/datatablev254.blade.php

@@ -30,6 +30,12 @@
 </style>
 <script>
 
+    function initcss(){
+        let height = $(".container .layui-col-xs12 .layui-row form").height();
+        $(".container .layui-border-box").css('margin-top', height+2);
+        //$(".layui-tab-content").height("100%");
+    }
+
     function loadCols() {
         var cols = @json($dataCols);
         try {
@@ -86,7 +92,7 @@
             , limits: [5, 7, 10, 20, 30, 50, 100, 200, 500, 1000, 2000]
             , limit: 50 //每页默认显示的数量
             , done: function (res, curr, count) {
-
+                initcss();
 //          var width = $('.layui-table').find('th .layui-table-cell').width();
 //
 //          width = parseFloat(width);