后台异常处理

app/Http/Controllers/Admin/AdminmanageController.php

@@ -11,17 +11,16 @@ use Request;
  */
 class AdminmanageController extends Controller {
 	/**
-	 * @return 管理员管理
+	 * @return 管理员管理 
 	 */
 	function index(Req $req) {
 		$request=array();
 		$request['loginname'] = isset($req->loginname) ? trim($req->loginname) : null;
 		$request['role_name'] = isset($req->role_name) ? trim($req->role_name) : null;
-		
-			$request['sureblur'] = isset($req->sureblur) ? $req->sureblur : 'on';
-		// }else{
-		// 	$request['sureblur'] = isset($req->sureblur) ? $req->sureblur : $_GET['sureblur'];
-		// }
+		$request['status'] = isset($req->status) ? $req->status : '-1';
+		$request['sureblur'] = isset($req->sureblur) ? $req->sureblur : 'on';
+		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.zt_day_three') ;
+        $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
 
 		$dt = \App\Lib\DataTable\DataTable::init();
 		$dt->setDataSource('/admin/manager/adminInfo');

app/Http/Controllers/Admin/ManagerController.php

@@ -76,12 +76,11 @@ class ManagerController extends Controller {
             if (!empty($name)) {
                 $where[] = array('name', 'like', '%' . $name . '%');
             }
-            if (!empty($status)) {
-                $where[] = array('status', '=', $status);
-                if ($status != 1) {
-                    $where[] = array('status', '<>', 1);
-                }
+
+            if ($status != -1) {
+                $where[] = array('status', $status);
             }
+
             if (!empty($star_time)) {
                 $star_time = date('Y-m-d H:i:s', strtotime($star_time));
                 $where[] = array('add_time', '>=', $star_time);

app/Http/Controllers/Admin/SportsfootController.php

@@ -241,88 +241,6 @@ class SportsfootController extends Controller {
 		return $newapp;
 	}
 
-	//结算 allhalf全场1,半场0
-	// function Settlement(Req $req){
-	// 	$allhalf = $req->allhalf?$req->allhalf:'';
-	// 	if(intval($allhalf)){
-	// 		//赛事id
-	// 		$id = $req->input('id');
-	// 		if (empty($id)) {
-	// 			return responseToJson(-2001); //
-	// 		}
-	// 		$ids = explode(',', $id);
-	// 		if (!is_array($ids) && intval($ids) < 0) {
-	// 			return responseToJson(-2002); //
-	// 		}
-	// 		if (is_array($ids) && count($ids) > 0) {
-	// 			foreach ($ids as $k => $v) {
-	// 				if (intval($v) < 1) {
-	// 					unset($ids[$k]);
-	// 				}
-	// 			}
-	// 		}
-	// 		for ($i=0; $i < count($ids); $i++) { 
-	// 			$model = \App\Models\Stzqresult::where('id', $ids[$i])->select("match_id","status")->first();
-	// 			//查询赛事下所有订单
-	// 			$ssid = $model['match_id'];//赛事id
-	// 			if($model['status']==2){
-	// 				$type = 1;;//是否再结算1,首次结算2,再次结算
-	// 			}else{
-	// 				$type = 2;
-	// 			}
-				
-	// 			$newapp = new \App\Models\MoneyBuyMatch();
-	// 			$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
-	// 			$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-	// 			$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->first();
-	// 			if($data){
-	// 				$tapp = new \App\Lib\Settlement\SettlementWinFail();
-	// 	            \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>0]);
-	// 				$ret = $tapp->doRun($data->toArray()['id']);
-	// 				$ret2 =$data->toArray()['id'];
-	// 	            if ($ret2['status']==1){
-	// 	                \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>4]);
-	// 	            }
-	// 	        }
-				
-	// 			$SettlementOrder = new SettlementOrder();
-	// 		    $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid,$allhalf);//串式
-	// 		    $data = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid,$allhalf);//单式注单
-	// 		}
-	// 		return responseToJson(1);
-	// 	}else{
-	// 		//查询赛事下所有订单
-	// 		$ssid = $req->match_id;//赛事id
-	// 		$type = $req->type;//是否再结算1,首次结算2,再次结算
-			
-	// 		$newapp = new \App\Models\MoneyBuyMatch();
-	// 		$simplex_ids = array_column($newapp->allsimplexorder($ssid,'zq'),'order_id');
-	// 		$str_ids = array_column($newapp->allstrorder($ssid),'order_id');
-
-	// 		$data = \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->first();
-	// 		if($data){
-	// 			$tapp = new \App\Lib\Settlement\SettlementWinFail();
-	//             \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>0]);
-	// 			$ret = $tapp->doRun($data->toArray()['id']);
-			
-	// 			$ret2 =$data->toArray()['id'];
-	//             if ($ret2['status']==1){
-	//                 \App\Models\Comendnotice::where(['match_id'=>$ssid,'game_code'=>'zq'])->update(['status'=>4]);
-	//             }
-
-	//             if($ret['status']==1){
-	// 				$SettlementOrder = new SettlementOrder();
-	// 		        $SettlementOrder->reSettlement($str_ids, 2,$type,'zq',$ssid);//串式
-	// 		        $nda = $SettlementOrder->reSettlement($simplex_ids, 1,$type,'zq',$ssid);//单式注单
-	// 		        return responseToJson($nda);
-	// 		    }else{
-	// 		    	return responseToJson($ret);
-	// 		    }
-	//         }
-	//     }
-	// }
-
 	//作废
 	function revokeft(Req $req){
 		$iszf = $req->iszf?$req->iszf:'';//赛事id

app/Http/Controllers/Admin/WagentController.php

@@ -19,7 +19,7 @@ class WagentController extends Controller {
 		$request['home_team'] = isset($req->home_team) ? trim($req->home_team) : null;
 		$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) :trans('status.default_time.seven_day') ;
+		$request['star_time'] = isset($req->star_time) ? trim($req->star_time) :trans('status.default_time.zt_day_three') ;
         $request['end_time'] = isset($req->end_time) ? trim($req->end_time) : trans('status.default_time.etime');
 
 		$dt = \App\Lib\DataTable\DataTable::init();
@@ -140,6 +140,15 @@ class WagentController extends Controller {
 				$where[] = array('wagent.agent_name', '=', $home_team);
 			}
 		}
+		//追加时间范围条件
+		if (!empty($star_time)) {
+			$star_time = date('Y-m-d H:i:s', strtotime($star_time));
+			$where[] = array('create_time', '>=', $star_time);
+		}
+		if (!empty($end_time)) {
+			$end_time = date('Y-m-d H:i:s', strtotime($end_time));
+			$where[] = array('create_time', '<=', $end_time);
+		}
 
 		$newapp = new \App\Models\Wagent();
         $data = $newapp->wagentlist($list, $page, $where);

resources/lang/zh-cn/status.php

@@ -157,6 +157,12 @@ return array(
 			'1' => '可用',
 		),
 	),
+	'system_users' => array(
+		'status' => array(
+			'0' => '禁用',
+			'1' => '可用',
+		),
+	),
 	'game_buy' => array(
 		'status' => array(
 			'1' => '中奖',

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

@@ -55,53 +55,59 @@
 
     <div class="layui-col-xs12">
 
-		<form class="layui-form rewrite" eventType="eventForm" action="">
+        <form class="layui-form rewrite" eventType="eventForm" action="">
             <div class="layui-form-item">
                 <div class="layui-inline">
-					<label class="layui-form-label" >{{ trans('system_user.loginname') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="loginname" id="loginname" lay-verify="required" eventType="event-query" value="{{ $loginname }}" autocomplete="off" class="layui-input">
-					</div>
+                    <label class="layui-form-label" >{{ trans('system_user.loginname') }}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" name="loginname" id="loginname" lay-verify="required" eventType="event-query" value="{{ $loginname }}" 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($sureblur) || $sureblur=='on') checked @endif  class="layui-input" eventType=event-query>
                         <input type="hidden" name="sureblur" id="form_sureblurs" lay-verify="required" autocomplete="off" class="layui-input" eventType=event-query  value="{{ $sureblur }}">
                     </div>
                 </div>
+
                 <div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.status') }}</label>
-					<div class="layui-input-inline" style="width:150px;">
-						<select name="status"  id="status"  lay-verify="" autocomplete="off" class="layui-input" style="width:150px;">
-							<option value="">{{ trans('system_user.select_status') }}</option>
-							@foreach(trans('status.system_user.status') as $k=>$v):
-								<option value="{{$k}}">{{$v}}</option>
-							@endforeach
-						</select>
-					</div>
+                        <label class="layui-form-label">{{ trans('system_user.status') }}</label>
+                        <div class="layui-input-inline" style="width: 200px">
+                            <select name="status"  id="status"  lay-verify="" autocomplete="off" class="layui-input"  eventType=event-query>
+                                <option value="-1">{{ trans('system_user.select_status') }}</option>
+                                @foreach(trans('status.system_users.status') as $k=>$v):
+                                    @if($status==$k))
+                                        <option value="{{$k}}" selected="selected">{{$v}}</option>
+                                    @else
+                                        <option value="{{$k}}">{{$v}}</option>
+                                    @endif
+                                @endforeach
+                            </select>
+                        </div>
+                   </div>
+
+               <div class="layui-inline">
+                    <label class="layui-form-label">{{ trans('system_user.star_time') }}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" name="star_time" value="{{ $star_time }}" id="star_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('system_user.star_time') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="star_time"  id="star_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item">
-					</div>
+                    <label class="layui-form-label">{{ trans('system_user.end_time') }}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" name="end_time"  value="{{$end_time}}" id="end_time" placeholder=" - " word-break: break-all; lay-verify="" autocomplete="off" class="layui-input test-item" eventType=event-query>
+                    </div>
                 </div>
-                <div class="layui-inline">
-					<label class="layui-form-label">{{ trans('system_user.end_time') }}</label>
-					<div class="layui-input-inline">
-						<input type="text" name="end_time"  id="end_time" placeholder=" - "  lay-verify="" autocomplete="off" class="layui-input test-item">
-					</div>
-               </div>
 
                 <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-normol reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
+                <a  class="layui-btn   layui-btn-sm  layui-btn-normol reset" data-type="reload" style="opacity: 1; pointer-events: auto;">重置</a>
                 <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
                </div>
                 @if(checkRriv('/admin/Adminmanage/Add'))<div class="layui-inline"><a href="/admin/Adminmanage/Add" class="layui-btn layui-btn-sm ">添加</a></div>@endif
 {{--                @if(checkRriv('/admin/Adminmanage/delete'))<div class="layui-inline"><a href="javascript:delWin('/admin/Adminmanage/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div>@endif--}}
             </div>
 
-		</form>
+        </form>
     </div>
     </div>
     
@@ -136,7 +142,7 @@
             status:$('#status').val(),
             star_time:$('#star_time').val(),
             end_time:$('#end_time').val(),
-			sureblur:$('#sureblur').next().text(),
+            sureblur:$('#sureblur').next().text(),
         }
       });
     }
@@ -148,10 +154,10 @@ $('.lay-btn-diy').on('click', function(){
 
   //重置表单
   $('.reset').on('click',function(){
-	  $('input').val('');
-	  $('#status').val('');
-//	  var type = $(this).data('type');
-//	  active[type] ? active[type].call(this) : '';
+      $('input').val('');
+      $('#status').val('');
+//    var type = $(this).data('type');
+//    active[type] ? active[type].call(this) : '';
   });
 
   //刷新表单

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

@@ -73,7 +73,8 @@
                     <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-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
+                        <!-- <a class="layui-btn layui-btn-sm layui-btn-green set" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a> -->
+                        <a class="layui-btn layui-btn-sm layui-btn-green " href="javascript:window.location.reload()" data-type="reload" style="opacity: 1; pointer-events: auto;"><i class="layui-icon">ဂ</i></a>
                         @if(checkRriv('/admin/wagent/add'))<a href="/admin/wagent/add" class="layui-btn layui-btn-sm ">添加</a>@endif
                         <!-- @if(checkRriv('/admin/wagent/deleteoutcome'))<a href="javascript:delWin('/admin/wagent/deleteoutcome?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a>@endif -->
                     </div>