后台异常处理

app/Http/Controllers/Admin/MessageController.php

@@ -211,7 +211,7 @@ class MessageController extends Controller
             if (empty($data['type'])) {
                 return responseToJson (-3001341);
             }
-            $data['content'] = $req->desc;
+            $data['content'] = strip_tags($req->desc);//过滤html标签
             $log = array(
                 session ('adminInfo.admin_name'),
                 $data['title']

app/Http/Controllers/Admin/SystemController.php

@@ -174,7 +174,6 @@ class SystemController extends Controller {
 			$add_endtime = date('Y-m-d H:i:s', strtotime($add_endtime));
 			$where[] = array('time', '<=', $add_endtime);
 		}
-       
 		$db = new \App\Models\Article();
 		$data = $db->getlist($limit, $where);
 
@@ -196,10 +195,8 @@ class SystemController extends Controller {
                 // $act    =   isset($activity_list[$v["child_id"]])&&!empty($activity_list[$v["child_id"]])?"<b>【活动:".$activity_list[$v["child_id"]]."】</b>":"";
                 $_name= isset($type_name[$v['type']])?">".$type_name[$v['type']]:"";
 				$data['data'][$k]['type'] = isset($type[$v['type']])?$type[$v['type']].$_name:$_name;
-
 			}
 		}
-
 		return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total']);
 	}
 

app/Http/Controllers/Admin/UserController.php

@@ -58,7 +58,7 @@ class UserController extends Controller
         // $dt->addColsFields('qq', array('width'=>120, 'sort' => false));
         // $dt->addColsFields('wechat', array('width'=>120, 'sort' => false));
         //邀请码显示
-        $dt->addColsFields('open_invitation', array('templet' => '#invitation','width'=>120, 'sort' => false));
+        // $dt->addColsFields('open_invitation', array('templet' => '#invitation','width'=>120, 'sort' => false));
         // $dt->addColsFields('last_time',array('width'=>90)); //'templet' => '#selectphone',
         //$dt->addColsFields('money_num', array('templet' => '#moneynum', 'sort' => false, 'width' => 110));
         $dt->addColsFields('statuss', array('templet' => '#openstatus', 'sort' => false,'width'=>100));
@@ -388,6 +388,12 @@ class UserController extends Controller
             }
         }
 
+        //会员所属组
+        $groupname = \App\Models\Account_detailed::where('account_identity',$data['identity'])->select('group_name')->first()->toArray();
+        $data['group_name'] = $groupname['group_name'];
+        // $u_db = new \App\Models\Account();
+        $data['gradelist']=$u_db->getUserGrade();
+        // var_dump($data);die;
         $uname = $data['account'];
         unset($data['password']);
         if (!$req->isMethod('post')) {
@@ -443,6 +449,11 @@ class UserController extends Controller
             }
             $identity=$data['identity'];
             $status_type = $req->status_type;
+            $form_grade = $req->form_grade;
+            $formgrade = '|'.$form_grade.'|';
+            if($form_grade){
+                $res = \App\Models\Account_detailed::where('account_identity',$identity)->update(['group_name'=>$formgrade]);
+            }
             $data = array(
                 'remark' => $req->remark,
                 'status' => $req->status,

resources/lang/zh-cn/user.php

@@ -91,15 +91,15 @@ return array(
 	'select_type' => array(
 		'name' => '姓名',
 		//'agent_name' => '代理名称',
-		'open_invitation' => '分享邀请码',
+		// 'open_invitation' => '分享邀请码',
 		'register_ip' => '注册IP',
 		'register_url' => '注册网址',
 		'last_url' => '登录网址',
 		'last_ip' => '登录IP',
 		'phone' => '手机号码',
-		'email' => '邮箱',
-		'qq' => 'qq',
-		'wechat' => '微信',
-		'agent' => '代理邀请码',
+		// 'email' => '邮箱',
+		// 'qq' => 'qq',
+		// 'wechat' => '微信',
+		// 'agent' => '代理邀请码',
 	),
 );

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

@@ -7,7 +7,6 @@
     </style>
     <!---注单管理-->
     <div class="layui-row">
-
         <!-- <div class="layui-col-xs12 layui-col-sm2 layui-col-md2">
             <ul id="tree" class="tree-table-tree-box"></ul>
         </div>-->

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

@@ -57,8 +57,10 @@
                         <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 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>

resources/views/admin/user/editpwd.blade.php

@@ -4,7 +4,7 @@
 <form class="layui-form" action="{{ url()->full() }}" id="submitForm" name="submitForm" method="post" eventType="eventAjaxForm">
 {!! csrf_field() !!}
   <div class="layui-form-item">
-<label>修改登录密码</label>
+<label>修改登录密码及分组</label>
 </div>
   <div class="layui-form-item">
     <label class="layui-form-label">会员</label>
@@ -27,6 +27,22 @@
     </div>
   </div>
 
+  <div class="layui-form-item">
+    <label class="layui-form-label">{{ trans('user.grade') }}</label>
+    <div class="layui-input-inline" style="width: 200px">
+    <select name="form_grade" id="form_grade" lay-verify="" autocomplete="off" class="layui-input" eventType=event-query>
+      <option value="">{{ trans('user.select_grade') }}</option>
+        @foreach($data['gradelist'] as $k=>$v):
+          @if(strpos($data['group_name'],$v) !== false) 
+            <option value="{{$v}}" selected="selected">{{$v}}</option>
+          @else
+            <option value="{{$v}}">{{$v}}</option>
+          @endif
+        @endforeach
+    </select>
+    </div>
+  </div>
+
   <div class="layui-form-item">
     <div class="layui-input-block">
       <button class="layui-btn" lay-submit lay-filter="submitForm">立即提交</button>

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

@@ -293,7 +293,7 @@
                             <input type="text" name="rechargenum_big" id="form_rechargenum_big" placeholder="0" autocomplete="off" class="layui-input" eventType=event-query value="{{ $rechargenum_big }}">
                         </div>
                     </div>
-                    <div class="layui-inline">
+                    <!-- <div class="layui-inline">
                         <label class="layui-form-label">{{ trans('user.takenum_area') }}</label>
                         <div class="layui-input-inline" style="width: 100px;">
                             <input type="text" name="takenum_small" id="form_takenum_small" placeholder="0" autocomplete="off" class="layui-input" eventType=event-query value="{{ $takenum_small }}">
@@ -302,7 +302,7 @@
                         <div class="layui-input-inline" style="width: 100px;">
                             <input type="text" name="takenum_big" id="form_takenum_big" placeholder="0" autocomplete="off" class="layui-input" eventType=event-query value="{{ $takenum_big }}">
                         </div>
-                    </div>
+                    </div> -->
 					
 					<div class="layui-inline">
                         <a class="layui-btn layui-btn-sm lay-btn-diy" data-type="reload"