Merge branch 'master' of http://git.bocai108.com:10180/aqm/sports_admin

app/Http/Controllers/Admin/SportsfootController.php

@@ -127,7 +127,7 @@ class SportsfootController extends Controller {
 		}
 
 		$upapp = new \App\Models\SportsNoteList();
-        $data = $upapp->updatesimplex($match_id);//修改单式状态
+        $data = $upapp->updatesimplex($match_id,'zq');//修改单式状态
 
         //单式撤单返现
         $newapp = new \App\Models\MoneyBuyMatch();

app/Models/SportsNoteList.php

@@ -248,9 +248,9 @@ class SportsNoteList extends BaseModel {
     }
 
      //修改赛事下的所有单式下注 3199308
-    function updatesimplex($ssid){
+    function updatesimplex($ssid,$code){
         $newapp = new \App\Models\MoneyBuyMatch();
-        $data = $newapp->allsimplexorder($ssid);
+        $data = $newapp->allsimplexorder($ssid,$code);
         if($data){
             for ($i=0; $i < count($data); $i++) { 
                 $the = array(

resources/lang/zh-cn/status.php

@@ -341,6 +341,8 @@ return array(
 			'0' => '未开始',
 			'1' => '进行中',
 			'2' => '已结束',
+			'3' => '已结算',
+			'4' => '已作废',
 		),
 	),
 	'league_status' => array(

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

@@ -147,6 +147,12 @@
       @{{#} }}
       @{{#if(d.status==2){ }}
         <span>已结束</span>
+      @{{#} }}
+	  @{{#if(d.status==3){ }}
+        <span>已结算</span>
+      @{{#} }}
+	  @{{#if(d.status==4){ }}
+        <span>已作废</span>
       @{{#} }}
     </script>