异常处理

app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -249,6 +249,7 @@ class SoccerNoteListController extends Controller
         $order_status = Request::has('order_status') ? Request::get('order_status') : '';
         $sureblur = Request::has('sureblurs') ? Request::get('sureblurs') : 'off';
         $type = Request::has('type') ? Request::get('type') : 'zq';
+
         $where = array();
         $where[] = array('money_buy_simplex.is_champion', '<>', 1);
         if (!empty($account)) {

app/Models/SportsNoteList.php

@@ -33,8 +33,8 @@ class SportsNoteList extends BaseModel
             ->join('st_' . $type . '_competition', 'st_' . $type . '_competition.id', '=', 'money_buy_simplex.match_id')
             //->join('money_buy_match','money_buy_match.order_id','=','money_buy_simplex.order_id')
             ->join('st_' . $type . '_league', 'money_buy_simplex.lg_id', '=', 'st_' . $type . '_league.id')
-            ->select('money_buy_simplex.id', 'money_buy_simplex.account_name', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'st_' . $type . '_competition.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese', 'st_' . $type . '_league.last_time')
-            ->whereIn('money_buy_simplex.roll_ratify',array(0,1))
+            ->select('money_buy_simplex.id', 'money_buy_simplex.account_name', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status','money_buy_simplex.use_mark', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'st_' . $type . '_competition.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese', 'st_' . $type . '_league.last_time')
+            ->whereIn('money_buy_simplex.roll_ratify',array(0,1,-1))
             ->where($where)
             //->distinct('money_buy_match.order_id')
             ->orderby('money_buy_simplex.money_time', 'desc')
@@ -119,7 +119,8 @@ class SportsNoteList extends BaseModel
                 $data[$i]->order_status = '投注<br>'.$settle_status;
 
             } else if ($data[$i]->status == 2) {
-                $data[$i]->order_status = '作废<br>'.$settle_status;//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
+                $data[$i]->order_status = '作废<br>'.$data[$i]->use_mark;
+                // $data[$i]->order_status = '作废<br>'.$settle_status;//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
             } else if ($data[$i]->status == 3) {
                 $data[$i]->order_status = '撤单<br>'.$settle_status;//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已撤单 </a>';
             }

resources/views/admin/wagent/add.blade.php

@@ -54,7 +54,7 @@
             var agent_name = $("#agent_name").val();
             var reg = /^(\w){4,12}$/;
             if(reg.test(agent_name)==false){
-                alert('代理名称只能为4-12位数字字母组成')
+                alert('代理名称只能为4-12位数字字母组成');
                 return false;
             }