异常处理

app/Http/Controllers/Admin/IndexController.php

@@ -97,13 +97,14 @@ class IndexController extends Controller
             $str = $db->countUser($timearea);
             //单式投注
             $simplex = $db1->countUser($timearea);
+
             if($str && $simplex){
                 for($i=0;$i<count($str);$i++){
                     for($j=0;$j<count($simplex);$j++){
                         if($str[$i]['account_identity'] == $simplex[$j]['account_identity']){
                             unset($str[$i]);
+                            unset($simplex[$j]);
                         }
-
                     }
                 }
             }

app/Http/Controllers/Admin/SportsfootController.php

@@ -434,7 +434,7 @@ class SportsfootController extends Controller {
 		return responseToJson(1);
 	}
 
-	//足球结果列表
+	//足球结果列表 1
 	function outcome(Req $req) {
 		$request=array();
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;

app/Http/Model/StZqResult.php

@@ -517,7 +517,7 @@ class StZqResult extends Model
         //获取当前赛事已有危险球数据 json
         $warn_json = self::where(['match_id' => $match_id])->SELECT('warn_more')->first()->warn_more;
         //转数组
-        $warn_arr = json_decode($warn_json,true);
+        $warn_arr = json_decode($warn_json,true); 
         //删除初始 危险球 数据
         foreach($warn_arr as $k=>$v){
             if($v['rtype'] == 0) unset($warn_arr[$k]);

resources/lang/zh-cn/status.php

@@ -361,6 +361,8 @@ return array(
 			'2' => '已结束',
 			'3' => '已结算',
 			'4' => '已作废',
+			'5' => '待结算',
+			'6' => '已取消',
 		),
 	),
 	'league_status' => array(

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

@@ -51,6 +51,12 @@
       @{{#if(d.status==4){ }}
         <span>已作废</span>
       @{{#} }}
+      @{{#if(d.status==5){ }}
+        <span>待结算</span>
+      @{{#} }}
+      @{{#if(d.status==6){ }}
+        <span>已取消</span>
+      @{{#} }}
     </script>
 
     <script type="text/html" id="operation">

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

@@ -44,6 +44,12 @@
       @{{#if(d.status==4){ }}
         <span>已作废</span>
       @{{#} }}
+      @{{#if(d.status==5){ }}
+        <span>待结算</span>
+      @{{#} }}
+      @{{#if(d.status==6){ }}
+        <span>已取消</span>
+      @{{#} }}
     </script>
 
     <script type="text/html" id="operation">

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

@@ -154,6 +154,12 @@
       @{{#if(d.status==4){ }}
         <span>已作废</span>
       @{{#} }}
+      @{{#if(d.status==5){ }}
+        <span>待结算</span>
+      @{{#} }}
+      @{{#if(d.status==6){ }}
+        <span>已取消</span>
+      @{{#} }}
     </script>
 
     <script type="text/html" id="operation">

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

@@ -70,6 +70,12 @@
       @{{#if(d.status==4){ }}
         <span>已作废</span>
       @{{#} }}
+      @{{#if(d.status==5){ }}
+        <span>待结算</span>
+      @{{#} }}
+      @{{#if(d.status==6){ }}
+        <span>已取消</span>
+      @{{#} }}
     </script>
 
     <script type="text/html" id="sxalfcourt">