追加异常 处理

app/Http/Controllers/Admin/AdminRoleController.php

@@ -119,7 +119,7 @@ class AdminRoleController extends Controller {
 		return responseToJson(1); //id����
 	}
 
-	//添加角色
+	//添加角色1
 	function addRole(Req $req){
         $id = $req->id;
         if(intval($id)<0){
@@ -135,7 +135,7 @@ class AdminRoleController extends Controller {
                 unset($role_data[$k]);
             }
         }
-        $admin_info=$admin_db->getAdminInfo($id,1);
+		$admin_info=$admin_db->getAdminInfo($id,1);
         if (!$req->isMethod('post')) {
             return view('admin.AdminRole/addRole',['admin'=>$admin_info,'data'=>$role_data]);
         }else{

app/Http/Controllers/Admin/AdminmanageController.php

@@ -119,11 +119,18 @@ class AdminmanageController extends Controller {
 	function Add(Req $req) {
 		$root_db = new \App\Models\System_root;
 		$list = isset($req->limit) ? $req->limit : 10;
+
+		$admin_db=new \App\Models\System_user;
+		$role_db=new \App\Models\Role;
+		$system_role=new \App\Models\System_root;
+		$role_data=$system_role->getAllRole();
+
 		if (!$req->isMethod('post')) {
 			$root = $root_db->getlist($list);
 			$data['root_id'] = '';
 			$data['status'] = 1;
-			return view('admin.Adminmanage/add', ['data' => $data, 'root' => $root['data'], 'dis' => 1]);
+			return view('admin.Adminmanage/add', ['data' => $data, 'root' => $root['data'], 'dis' => 1,'role'=>$role_data]);
+			//['admin'=>$admin_info,'data'=>$role_data]
 		} else {
 			$loginname = $req->loginname;
 			$pwd = $req->password;
@@ -132,12 +139,18 @@ class AdminmanageController extends Controller {
 			$retwopwd = $req->repassword_2;
 			$level = $req->root_id?intval($req->root_id):4;
 			$status = $req->status;
+			$role_id=$req->role_id;
+
+            if(intval($role_id)<0){
+                return responseToJson(-7082000322);//请选择添加角色
+            }
 			if (empty($loginname) || empty($pwd) || empty($twopwd)) {
 				return responseToJson(-7010007022); //必填不能为空
 			}
 			if ($pwd != $repwd || $twopwd != $retwopwd) {
 				return responseToJson(-7010000522); //两次密码不一致
 			}
+
 			$data['loginname'] = $loginname;
 			$data['status'] = $status;
 			$data['root_id'] = $level;
@@ -153,14 +166,31 @@ class AdminmanageController extends Controller {
 				return responseToJson($checkname);
 			}
 			$db = new \App\Models\System_user;
-			$res = $db->addAdmin($data);
+			$admin_id = $db->addAdmin($data);
+
+			if($admin_id<0){
+                return responseToJson($admin_id);
+			}
+			//===写角色===
+			$role_info=$system_role->getInfo($role_id,1);
+			$admin_info=$admin_db->getAdminInfo($admin_id,1);
+			
+			$inset_data['role_id']=$role_info['id'];
+            $inset_data['role_name']=$role_info['name'];
+            $inset_data['admin_id']=$admin_id;
+            $inset_data['admin_name']=$admin_info['loginname'];
+			$res=$role_db->addRole($inset_data);
+            if($res<0){
+                return responseToJson($res);
+            }
+			//===end===
+
 			$log = array(
 				session('adminInfo.admin_name'),
 				$loginname,
 			);
 			OperationLog(session('adminInfo.admin_id'), 'addAdmin', $log);
-			return responseToJson($res);
-
+			return responseToJson(1);
 		}
 
 	}

app/Models/System_user.php

@@ -126,11 +126,11 @@ class System_user extends BaseModel {
 	}
 
 	function addAdmin($data) {
-		$res = $this->insert($data);
+		$res = $this->insertGetId($data);
 		if (!$res) {
 			return -7050001022; //添加失败
 		}
-		return 1;
+		return $res;
 	}
 
 	//开关

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

@@ -39,6 +39,18 @@
     </div>
   </div>
 
+  <div class="layui-form-item">
+    <label class="layui-form-label">*设置角色</label>
+    <div class="layui-input-block">
+      <select name="role_id">
+        <option value=""></option>
+        @foreach($role as $k=>$v)
+          <option value="{{$v['id']}}">{{$v['name']}}</option>
+          @endforeach
+      </select>
+    </div>    
+  </div>
+
   <div class="layui-form-item">
     <label class="layui-form-label">允许开奖</label>
     <div class="layui-input-block">

resources/views/admin/systemSet/arictle.blade.php

@@ -7,7 +7,7 @@
     </style>
     <script type="text/html" id="title">
         @{{d.title}}
-       
+
     </script>
     <!---注单管理-->
     <div class="layui-row">
@@ -22,7 +22,8 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('notice.title') }}</label>
                         <div class="layui-input-inline">
-                            <input type="text" name="title" id="title" eventType="event-query"  value="{{ $title }}" lay-verify="required" autocomplete="off"
+                            <input type="text" name="title" id="title" eventType="event-query" value="{{ $title }}"
+                                   lay-verify="required" autocomplete="off"
                                    class="layui-input">
                         </div>
                     </div>
@@ -30,100 +31,109 @@
                         <label class="layui-form-label">{{ trans('notice.type') }}</label>
                         <div class="layui-input-inline" id="layui-sel">
                             <select name="type" id="type" lay-verify="" autocomplete="off" eventType="event-query">
-                                    <option value="">{{ trans('menu.select_menutype') }}</option>
+                                <option value="">{{ trans('menu.select_menutype') }}</option>
                                 @foreach(trans('status.article.type') as $k=>$v):
-                                    <option value="{{$k}}" @if($k==$type) selected @endif>{{$v}}</option>
+                                <option value="{{$k}}" @if($k==$type) selected @endif>{{$v}}</option>
                                 @endforeach
                             </select>
                         </div>
                     </div>
-                   {{--<!--  <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('notice.add_startime') }}</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="add_startime" id="add_startime" placeholder=" - " lay-verify=""
-                                   autocomplete="off" class="layui-input test-item" value="{{trans('status.default_time.atime')}}" eventType=event-query>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">{{ trans('notice.add_endtime') }}</label>
-                        <div class="layui-input-inline">
-                            <input type="text" name="add_endtime" id="add_endtime" placeholder=" - " lay-verify=""
-                                   autocomplete="off" class="layui-input test-item" value="{{trans('status.default_time.etime')}}" eventType=event-query>
-                        </div>
-                    </div> -->--}}
+                    {{--<!--  <div class="layui-inline">
+                         <label class="layui-form-label">{{ trans('notice.add_startime') }}</label>
+                         <div class="layui-input-inline">
+                             <input type="text" name="add_startime" id="add_startime" placeholder=" - " lay-verify=""
+                                    autocomplete="off" class="layui-input test-item" value="{{trans('status.default_time.atime')}}" eventType=event-query>
+                         </div>
+                     </div>
+                     <div class="layui-inline">
+                         <label class="layui-form-label">{{ trans('notice.add_endtime') }}</label>
+                         <div class="layui-input-inline">
+                             <input type="text" name="add_endtime" id="add_endtime" placeholder=" - " lay-verify=""
+                                    autocomplete="off" class="layui-input test-item" value="{{trans('status.default_time.etime')}}" eventType=event-query>
+                         </div>
+                     </div> -->--}}
                     <div class="layui-inline">
                         <!--<a class="layui-btn layui-btn-sm lay-btn-diy" id="sub"  eventType="event-query-submit"
                            style="opacity: 1; pointer-events: auto;">提交</a>-->
-                        <a class="layui-btn layui-btn-sm lay-btn-diy" id="sub" style="opacity: 1; pointer-events: auto;">提交</a>
+                        <a class="layui-btn layui-btn-sm lay-btn-diy" id="sub"
+                           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 " href="javascript:window.location.reload()" 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>
 
                     </div>
-                    @if(checkRriv('/admin/Notice/addNotice'))<div class="layui-inline">
-                        <a href="/admin/Notice/addNotice" class="layui-btn layui-btn-sm  ">添加</a>
-
-                    </div>@endif
-                    @if(checkRriv('/admin/Notice/delete'))<div class="layui-inline"><a href="javascript:delWin('/admin/Notice/delete?id=');" class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div>@endif
+                    @if(checkRriv('/admin/Notice/addNotice'))
+                        <div class="layui-inline">
+                            <a href="/admin/Notice/addNotice" class="layui-btn layui-btn-sm  ">添加</a>
+
+                        </div>@endif
+                    @if(checkRriv('/admin/Notice/delete'))
+                        <div class="layui-inline"><a href="javascript:delWin('/admin/Notice/delete?id=');"
+                                                     class="layui-btn layui-btn-sm  layui-btn-danger">删除</a></div>@endif
                 </div>
             </form>
-    </div>
+        </div>
         <script type="text/html" id="closeTool">
             <!-- 这里的 checked 的状态只是演示 -->
-            @if(checkRriv('/admin/BankInfo/GameClose'))<input type="checkbox" name="status" value="@{{d.id}}" lay-skin="switch" lay-text="开启|禁用" lay-filter="openStatus"  @{{ d.status == '1' ? 'checked' : '' }}>@endif
+            @if(checkRriv('/admin/BankInfo/GameClose'))<input type="checkbox" name="status" value="@{{d.id}}"
+                                                              lay-skin="switch" lay-text="开启|禁用" lay-filter="openStatus"
+                                                              @{{ d.status== '1' ? 'checked' : '' }}>@endif
         </script>
 
-            @push('dataTableJS')
-//                var active = {
-//                reload: function(){
-//                //执行重载
-//                table.reload('{{ $dataId }}', {
-//            page: {
-//                curr: 1 //重新从第 1 页开始
-//                }
-//                ,where: {
-///                title:$("#title").val(),
-//                type:$('#type').val(),
-//                add_startime:$('#add_startime').val(),
-//                add_endtime:$('#add_endtime').val(),
-//                }
-//                });
-//                }
-//                };
-//                $('.lay-btn-diy').on('click', function(){
-//                var type = $(this).data('type');
-//                active[type] ? active[type].call(this) : '';
-//                });
-
-                $('#sub').on('click', function(){
-                    var title = $('#title').val();
-                    var type = $('#type').val();
-
-                    if((title == '' || title == null) && (type == '' || type == null) )
-                    {
-                        layer.tips('请填写标题','#title',{
-                            tips: 3
-                        });
-                    }
-                    else
-                    {
-                        $('#layui-form').submit();
-                    }
-                });
-
-                //重置表单
-                $('.reset').on('click',function(){
-                $('input').val('');
-                $('#type').val('');
-               // var type = $(this).data('type');
-               // active[type] ? active[type].call(this) : '';
-                });
-
-                //刷新表单
-              //  $('.set').on('click',function(){
-             //   var type = $(this).data('type');
+        @push('dataTableJS')
+            //                var active = {
+            //                reload: function(){
+            //                //执行重载
+            //                table.reload('{{ $dataId }}', {
+            //            page: {
+            //                curr: 1 //重新从第 1 页开始
+            //                }
+            //                ,where: {
+            ///                title:$("#title").val(),
+            //                type:$('#type').val(),
+            //                add_startime:$('#add_startime').val(),
+            //                add_endtime:$('#add_endtime').val(),
+            //                }
+            //                });
+            //                }
+            //                };
+            //                $('.lay-btn-diy').on('click', function(){
+            //                var type = $(this).data('type');
+            //                active[type] ? active[type].call(this) : '';
+            //                });
+
+            $('#sub').on('click', function(){
+            var title = $('#title').val();
+            var type = $('#type').val();
+
+            if((title == '' || title == null) && (type == '' || type == null) )
+            {
+            layer.msg('手动搜索时，类型不能为空!', {icon: 6});
+
+            // layer.tips('手动搜索时，类型不能为空！','#type',{
+            //     tips: 4
+            // });
+            }
+            else
+            {
+            $('#layui-form').submit();
+            }
+            });
+
+            //重置表单
+            $('.reset').on('click',function(){
+            $('input').val('');
+            $('#type').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) : '';
             //    });
             form.on('switch(openStatus)', function(obj){
@@ -133,7 +143,7 @@
             }
 
             setcolumn('/admin/Notice/activeClose',this.name,status,this.value,obj);
-        console.log(obj);
+            console.log(obj);
             //layer.tips(msg, obj.othis);
             });
 
@@ -164,9 +174,9 @@
 
         @endpush
 
-            @include('vip.datatable')
-            <link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"  />
-        </div>
+        @include('vip.datatable')
+        <link rel="stylesheet" href="{{ asset('/css/untablelist.css') }}"/>
+    </div>
     </div>
 
 @endsection