Kaynağa Gözat

异常处理

彭俊 6 yıl önce
ebeveyn
işleme
2249d80069

+ 3 - 3
app/Http/Controllers/Admin/AdminrootController.php

@@ -23,9 +23,9 @@ class AdminrootController extends Controller {
 		$dt->setDataSource('/admin/Adminroot/getlist');
 		$dt->setLang('system_user');
 		$dt->addColsFields('id');
-		$dt->addColsFields('name', array('edit' => true, 'sort' => false, 'width' => '250')); //角色名称
-		$dt->addColsFields('level', array('edit' => true)); //权限等级
-		$dt->addColsFields('settingmoney', array('edit' => true, 'width' => '250')); //最大操作金额
+		$dt->addColsFields('name', array('edit' => false, 'sort' => false, 'width' => '250')); //角色名称
+		$dt->addColsFields('level', array('edit' => false)); //权限等级
+		$dt->addColsFields('settingmoney', array('edit' => false, 'width' => '250')); //最大操作金额
 		$dt->addColsFields('priv_role', array('templet' => '#waterTool', 'sort' => false, 'width' => '350'));
 		$dt->enableCheckBox();
 		$dt->setPriKey('id');

+ 3 - 0
app/Http/Controllers/Admin/SportsbkController.php

@@ -121,6 +121,9 @@ class SportsbkController extends Controller {
 		$token = session('adminInfo.token');
 		$notice = \App\Models\Comendnotice::where('match_id', $match_id)->first();
 		$noticeid = $notice['id'];
+		if(!$notice){
+			return json_encode(['status'=>5,'msg'=>'请先核对结果,并提交结果']);
+		}
 		//查询赛事单式是否有订单(篮球)
 		$newapp = new \App\Models\MoneyBuyMatch();
 		$simplex_ids = array_column($newapp->allsimplexorder($match_id,'lq'),'order_id');

+ 3 - 0
app/Http/Controllers/Admin/SportsbqController.php

@@ -125,6 +125,9 @@ class SportsbqController extends Controller {
 		$token = session('adminInfo.token');
 		$notice = \App\Models\Comendnotice::where('match_id', $match_id)->first();
 		$noticeid = $notice['id'];
+		if(!$notice){
+			return json_encode(['status'=>5,'msg'=>'请先核对结果,并提交结果']);
+		}
 		//查询赛事单式是否有订单(篮球)
 		$newapp = new \App\Models\MoneyBuyMatch();
 		$simplex_ids = array_column($newapp->allsimplexorder($match_id,'bq'),'order_id');

+ 4 - 0
app/Http/Controllers/Admin/SportsfootController.php

@@ -20,6 +20,10 @@ class SportsfootController extends Controller {
 		$type = $req->type;
 		$token = session('adminInfo.token');
 		$notice = \App\Models\Comendnotice::where('match_id', $match_id)->first();
+		
+		if(!$notice){
+			return json_encode(['status'=>5,'msg'=>'请先核对结果,并提交结果']);
+		}
 		$noticeid = $notice['id'];
 		//查询赛事单式是否有订单(足球)
 		$newapp = new \App\Models\MoneyBuyMatch();

+ 3 - 0
app/Http/Controllers/Admin/SportswqController.php

@@ -137,6 +137,9 @@ class SportswqController extends Controller {
 		$token = session('adminInfo.token');
 		$notice = \App\Models\Comendnotice::where('match_id', $match_id)->first();
 		$noticeid = $notice['id'];
+		if(!$notice){
+			return json_encode(['status'=>5,'msg'=>'请先核对结果,并提交结果']);
+		}
 		//查询赛事单式是否有订单(篮球)
 		$newapp = new \App\Models\MoneyBuyMatch();
 		$simplex_ids = array_column($newapp->allsimplexorder($match_id,'wq'),'order_id');

+ 0 - 1
app/Models/SportsNoteList.php

@@ -351,7 +351,6 @@ class SportsNoteList extends BaseModel {
             return -2021052003; //
         }
 
-        // dd($data);
         //反水
         $water_return_money = \App\Models\Money_details::where('trade_type','7')->get();
 

+ 3 - 1
resources/views/admin/AdminRole/addRole.blade.php

@@ -42,7 +42,9 @@ layui.use(['form'], function(){
 function cbFormSuccess(data){
 	layer.msg(data.msg);
 	setTimeout(function(){
-		parent.window.location.reload();
+		//parent.window.location.reload();
+        window.location.reload();
+        //window.location= "index";
 	},2500);
 }
 </script>

+ 68 - 58
resources/views/admin/AdminRole/index.blade.php

@@ -2,87 +2,97 @@
 @section('content')
 
 
-<div class="layui-row">
+    <div class="layui-row">
 
-    <div class="layui-col-xs12">
+        <div class="layui-col-xs12">
 
-        <form class="layui-form rewrite" action="" eventType=eventForm>
-            <div class="layui-form-item">
-               <!-- <div class="layui-inline">
+            <form class="layui-form rewrite" action="" eventType=eventForm>
+                <div class="layui-form-item">
+                <!-- <div class="layui-inline">
         					<label class="layui-form-label">{{ trans('system_user.admin_name') }}</label>
         					<div class="layui-input-inline">
         						<input type="text" name="admin_name"  id="admin_name"  lay-verify="" autocomplete="off" class="layui-input">
         					</div>
                 </div>-->
 
-                <div class="layui-inline">
 
-                <label class="layui-form-label">{{ trans('system_user.name') }}</label>
-                      <div class="layui-input-inline">
-                        <input type="text" name="role_name" id="role_name" lay-verify="required" autocomplete="off" class="layui-input"
-                               eventType=event-query>
-                      </div>
+                    @if  (!Request::get('id'))
+                        <div class="layui-inline">
+                            <label class="layui-form-label">{{ trans('system_user.name') }}</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="role_name" id="role_name" lay-verify="required"
+                                       autocomplete="off" class="layui-input"
+                                       eventType=event-query>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <a class="layui-btn layui-btn-sm lay-btn-diy" data-type="reload"
+                               style="opacity: 1; pointer-events: auto;"
+                               eventType=event-query-submit>提交</a>
+                        </div>
+
+                        <div class="layui-inline">
+                            <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>
+                        </div>
+                    @endif
+
+                    <div class="layui-inline"><a href="/admin/adminRole/addRole?id={{Request::get('id')}}"
+                                                 class="layui-btn layui-btn-sm  ">添加</a>
+                    </div>
+                    <div class="layui-inline"><a href="javascript:delWin('/admin/AdminRole/delete?id=');"
+                                                 class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div>
                 </div>
-
-                <div class="layui-inline">
-                <a class="layui-btn layui-btn-sm lay-btn-diy"   data-type="reload" style="opacity: 1; pointer-events: auto;"
-                   eventType=event-query-submit>提交</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>
-               </div>
-
-
-				<div class="layui-inline"><a href="/admin/adminRole/addRole?id={{Request::get('id')}}" class="layui-btn layui-btn-sm  ">添加</a>
-        </div>
-        <div class="layui-inline"><a href="javascript:delWin('/admin/AdminRole/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div>
+            </form>
         </div>
-        </form>
-    </div>
     </div>
 
     <script type="text/html" id="waterTool">
         <a href="/admin/priv_role/index?id=@{{d.id}}" class="layui-btn layui-btn-sm">权限管理</a>
         <a href="/admin/Adminroot/view?id=@{{d.id}}" class="layui-btn layui-btn-sm">修改</a>
     </script>
-@push('dataTableJS')
-/*var active = {
-    reload: function(){
-      //执行重载
-      table.reload('{{ $dataId }}', {
+    @push('dataTableJS')
+        /*var active = {
+        reload: function(){
+        //执行重载
+        table.reload('{{ $dataId }}', {
         page: {
-          curr: 1 //重新从第 1 页开始
+        curr: 1 //重新从第 1 页开始
         }
         ,where: {
-            name:$("#name").val(),
-            level:$('#level').val(),
-            money_small:$('#money_small').val(),
-            money_big:$('#money_big').val(),
+        name:$("#name").val(),
+        level:$('#level').val(),
+        money_small:$('#money_small').val(),
+        money_big:$('#money_big').val(),
         }
-      });
-    }
-  };
-$('.lay-btn-diy').on('click', function(){
-    var type = $(this).data('type');
-    active[type] ? active[type].call(this) : '';
-  });*/
-
-  //重置表单
-  $('.reset').on('click',function(){
-	  $('input').val('');
-//	  var type = $(this).data('type');
-//	  active[type] ? active[type].call(this) : '';
-  });
+        });
+        }
+        };
+        $('.lay-btn-diy').on('click', function(){
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+        });*/
+
+        //重置表单
+        $('.reset').on('click',function(){
+        $('input').val('');
+        //      var type = $(this).data('type');
+        //      active[type] ? active[type].call(this) : '';
+        });
 
-  //刷新表单
-//    $('.set').on('click',function(){
-//    var type = $(this).data('type');
-//    active[type] ? active[type].call(this) : '';
-//    });
+        //刷新表单
+        //    $('.set').on('click',function(){
+        //    var type = $(this).data('type');
+        //    active[type] ? active[type].call(this) : '';
+        //    });
 
 
-@endpush
+    @endpush
 
-<!-- <script>
+    <!-- <script>
   $(document).on('click','[eventType=event-priv_role]',function(){
     var url='/admin/priv_role/index?role_id=';
     var pid=$(this).attr('pid');
@@ -90,7 +100,7 @@ $('.lay-btn-diy').on('click', function(){
     openWin(url+id,'权限信息');
   });
 </script> -->
-@include('vip.datatable')
-<link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"  />
+    @include('vip.datatable')
+    <link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"/>
 @endsection
 

+ 4 - 3
resources/views/admin/Adminroot/view.blade.php

@@ -6,7 +6,7 @@
   <div class="layui-form-item">
     <label class="layui-form-label">* 角色等级</label>
     <div class="layui-input-block">
-      <input type="number" name="level" required  lay-verify="required" autocomplete="off" class="layui-input" value="{{$data['level']}}">
+      <input type="number" name="level" required  lay-verify="required|number" autocomplete="off" class="layui-input" value="{{$data['level']}}">
     </div>
   </div>
 
@@ -20,7 +20,7 @@
   <div class="layui-form-item">
     <label class="layui-form-label">* 最大操作金额</label>
     <div class="layui-input-inline">
-    <input type="text" name="max_money"   lay-verify="" autocomplete="off" class="layui-input" value="{{$data['settingmoney']}}">
+    <input type="text" name="max_money"  required  lay-verify="required|number" autocomplete="off"  class="layui-input" value="{{$data['settingmoney']}}">
     </div>
   </div>
 
@@ -53,7 +53,8 @@ layui.use(['form'], function(){
 function cbFormSuccess(data){
 	layer.msg(data.msg);
 	setTimeout(function(){
-		parent.window.location.reload();
+		//parent.window.location.reload();
+        window.location.href = "{{url("/admin/adminroot/index")}}";
 	},2500);
 }
 </script>

+ 2 - 1
resources/views/admin/wagent/edit.blade.php

@@ -60,7 +60,8 @@ layui.use(['form'], function(){
 function cbFormSuccess(data){
 	layer.msg(data.msg);
 	setTimeout(function(){
-		parent.window.location.reload();
+		//parent.window.location.reload();
+        window.location.href = "{{url("/admin/wagent/index")}}";
 	},2500);
 }
 </script>