增加管理端用户模块

app/admin/controller/Batch.php

@@ -13,7 +13,7 @@ use app\common\api\BatchApi;
 class Batch extends AdminController {
 
     /**
-     * @@auth {{/batch}}
+     * @auth {{/batch}}
      * @return type
      */
     public function index() {
@@ -22,7 +22,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/list}}
+     * @auth {{/batch/list}}
      * @return type
      */
     public function list() {
@@ -30,7 +30,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/add}}
+     * @auth {{/batch/add}}
      * @return type
      */
     public function add() {
@@ -41,7 +41,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/update}}
+     * @auth {{/batch/update}}
      * @return type
      */
     public function edit() {
@@ -53,7 +53,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/delete}}
+     * @auth {{/batch/delete}}
      * @return type
      */
     public function delete() {
@@ -63,7 +63,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/setActive}}
+     * @auth {{/batch/setActive}}
      * @return type
      */
     public function setActive() {
@@ -73,7 +73,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/setNotActive}}
+     * @auth {{/batch/setNotActive}}
      * @return type
      */
     public function setNotActive() {
@@ -83,7 +83,7 @@ class Batch extends AdminController {
     }
 
     /**
-     * @@auth {{/batch/detail}}
+     * @auth {{/batch/detail}}
      * @return type
      */
     public function detail() {

app/admin/controller/Person.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\common\AdminController;
+use app\common\model\Person as PsModel;
+
+/**
+ * Description of Person
+ *
+ * @author sgq
+ */
+class Person extends AdminController {
+
+    /**
+     * @@auth {{/person/gotoPersonPage}}
+     * @return type
+     */
+    public function index() {
+        return view("");
+    }
+
+    public function list() {
+        $where = [];
+        $params = $this->request;
+        $order = trim($params["order"]) ?: "desc";
+        $offset = trim($params["offset"]) ?: 0;
+        $limit = trim($params["limit"]) ?: 10;
+        $where[] = ["type", "=", $this->user["type"]];
+        if (\StrUtil::isNotEmpAndNull($params["username"])) {
+            $where[] = ["username", "like", "%" . $params["username"] . "%"];
+        }
+        if (\StrUtil::isNotEmpAndNull($params["name"])) {
+            $where[] = ["name", "like", "%" . $params["name"] . "%"];
+        }
+        if ($params["sex"]) {
+            $where[] = ["sex", "=", $params["sex"]];
+        }
+        if (\StrUtil::isNotEmpAndNull($params["idCard"])) {
+            $where[] = ["idCard", "like", "%" . $params["idCard"] . "%"];
+        }
+        if (\StrUtil::isNotEmpAndNull($params["phone"])) {
+            $where[] = ["phone", "like", "%" . $params["phone"] . "%"];
+        }
+        $count = PsModel::where($where)->count();
+        $rows = PsModel::where($where)->limit($offset, $limit)->order("createTime " . $order)->select()->toArray();
+        $res = ["total" => $count, "rows" => $rows];
+        return json($res);
+    }
+
+    /**
+     * @@auth {{/person/gotoPersonDetailPage}}
+     * @return type
+     */
+    public function detail() {
+        $id = \StrUtil::getRequestDecodeParam($this->request, "id");
+        $person = PsModel::find($id);
+        if ($person["sex"]) {
+            $person["sexName"] = $person["sex"] == 1 ? "男" : "女";
+        }
+        if ($person["active"]) {
+            $person["activeName"] = $person["active"] == 1 ? "账号有效" : "冻结/拉黑";
+        }
+        return view("", ["person" => $person]);
+    }
+
+    /**
+     * @auth {{/person/setActive}}
+     * @return type
+     */
+    public function setActive() {
+        if ($this->request->isAjax()) {
+            $response = new \stdClass();
+            $response->code = 500;
+
+            $id = \StrUtil::getRequestDecodeParam($this->request, "id");
+            $active = \StrUtil::getRequestDecodeParam($this->request, "active");
+            $activeMsg = \StrUtil::getRequestDecodeParam($this->request, "activeMsg");
+            //校验 ID 是否为空
+            if (\StrUtil::isEmpOrNull($id)) {
+                $response->msg = "ID不能为空!";
+                return json($response);
+            }
+            //校验 是否为账号有效 或者 账号拉黑/冻结
+            if (!$active) {
+                $response->msg = "请选择账号状态!";
+                return json($response);
+            }
+            if (!in_array($active, [1, 2])) {
+                $response->msg = "账号状态有误!";
+                return json($response);
+            }
+            //如果审核状态为拉黑/冻结  需要填写冻结原因
+            if ($active == 2) {
+                if (\StrUtil::isEmpOrNull($activeMsg)) {
+                    $response->msg = "请填写冻结/拉黑原因!!";
+                    return json($response);
+                }
+                if (mb_strlen($activeMsg) > 100) {
+                    $response->msg = "冻结/拉黑原因最多100个字符!";
+                    return json($response);
+                }
+            }
+            $old = PsModel::find($id);
+            if (!$old) {
+                $response->msg = "用户信息不存在!";
+                return json($response);
+            }
+            try {
+                $data["id"] = $id;
+                $data["active"] = $active;
+                $data["activeMsg"] = $activeMsg;
+                $data["updateUser"] = $this->user["uid"];
+                $data["updateTime"] = date("Y-m-d H:i:s");
+                PsModel::update($data);
+                $response->msg = "操作成功!";
+                $response->code = 200;
+                return json($response);
+            } catch (\Exception $e) {
+                $response->msg = $e->getMessage();
+                return json($response);
+            }
+        }
+        $id = \StrUtil::getRequestDecodeParam($this->request, "id");
+        $person = PsModel::find($id);
+        return view("", ["person" => $person]);
+    }
+
+    /**
+     * @auth {{/person/resetPassword}}
+     * @return type
+     */
+    public function resetPassword() {
+        $response = new \stdClass();
+        $response->code = 500;
+        $defaultPassword = "JJrc@123";
+        $id = \StrUtil::getRequestDecodeParam($this->request, "id");
+        if (\StrUtil::isEmpOrNull($id)) {
+            $response->msg = "ID不能为空!";
+            return json($response);
+        }
+        $person = PsModel::find($id);
+        if (!$person) {
+            $response->msg = "数据不存在!";
+            return json($response);
+        }
+        try {
+            $data["id"] = $id;
+            $data["updateUser"] = $this->user["uid"];
+            $data["updateTime"] = date("Y-m-d H:i:s");
+            $data["password"] = md5($defaultPassword);
+            PsModel::update($data);
+            $response->msg = "操作成功!";
+            $response->code = 200;
+            return json($response);
+        } catch (\Exception $e) {
+            $response->msg = $e->getMessage();
+            return json($response);
+        }
+    }
+
+}

app/admin/view/person/detail.html

@@ -0,0 +1,104 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <div id="person_detail" class="form-horizontal">
+            <input type="text" class="form-control" id="id" name="id" value="{$person.id}" style="display: none;" />
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">用户名/账号</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$person.username}"  />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">姓名</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$person.name}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">性别</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="sex" name="sex" value="{$person.sexName}"  />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">证件号码</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$person.idCard}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">电话号码</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="phone" name="phone" value="{$person.phone}"  />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">联系地址</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="address" name="address" value="{$person.address}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">邮箱</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="email" name="email" value="{$person.email}"  />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">账号状态</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="active" name="active" value="{$person.activeName}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">拉黑/冻结原因</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="activeMsg" name="activeMsg" value="{$person.activeMsg}"  />
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-3 control-label">备注</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" readonly="readonly" id="description" name="description" value="{$person.description}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{/block}

app/admin/view/person/index.html

@@ -0,0 +1,108 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox float-e-margins">
+            <div class="ibox-title">
+                <h5>个人用户</h5>
+            </div>
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="col-sm-3">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    用户名/账号
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="username"/>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    姓名
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="name"/>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    性别
+                                </button>
+                            </div>
+                            <select class="form-control" id="sex">
+                                <option value="">请选择</option>
+                                <option value="1">男</option>
+                                <option value="2">女</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    证件号码
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="idCard"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-3">
+                        <div class="input-group input-group-sm">
+                            <div class="input-group-btn">
+                                <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+                                    电话号码
+                                </button>
+                            </div>
+                            <input type="text" class="form-control" id="phone"/>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
+                        <button type="button" class="btn btn-sm btn-primary" onclick="Person.search()">
+                            <i class="fa fa-search"></i>&nbsp;搜索
+                        </button>
+                        <button type="button" class="btn btn-sm btn-primary" onclick="Person.reset()">
+                            <i class="fa fa-trash"></i>&nbsp;重置
+                        </button>
+                    </div>
+                </div>
+                <div class="hidden-xs" id="tableToolbar" role="group">
+                    {if condition="chkCommission('/admin/person/detail','/person/gotoPersonDetailPage')"}
+                    <button type="button" class="btn btn-sm btn-primary" onclick="Person.gotoPersonDetailPage()">
+                        <i class="fa fa-info"></i>&nbsp;查看详情
+                    </button>
+                    {/if}
+                    {if condition="chkCommission('/admin/person/setActive','/person/setActive')"}
+                    <button type="button" class="btn btn-sm btn-primary" onclick="Person.setActive()">
+                        <i class="fa fa-edit"></i>&nbsp;设置冻结
+                    </button>
+                    {/if}
+                    {if condition="chkCommission('/admin/person/resetPassword','/person/resetPassword')"}
+                    <button type="button" class="btn btn-sm btn-primary" onclick="Person.resetPassword()">
+                        <i class="fa fa-edit"></i>&nbsp;重置密码
+                    </button>
+                    {/if}
+                </div>
+                <table id="table" class="table-condensed" style="font-size: 10px;table-layout: fixed!important;" data-mobile-responsive="true" data-click-to-select="true">
+                    <thead>
+                        <tr>
+                            <th data-field="selectItem" data-checkbox="true"></th>
+                        </tr>
+                    </thead>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<!--<script src="${ctxPath}/static/modular/person/person_list.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/person/person_list.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/admin/view/person/set_active.html

@@ -0,0 +1,73 @@
+{extend name="layout/content"}
+{block name="content"}
+<div class="ibox float-e-margins">
+    <div class="ibox-content">
+        <form id="ps_active" class="form-horizontal">
+            <input type="text" id="id" value="{$person.id}" style="display: none;" />
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label">用户名/账号</label>
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control" readonly="readonly" id="username" name="username" value="{$person.username}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label">姓名</label>
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control" readonly="readonly" id="name" name="name" value="{$person.name}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label">证件号码</label>
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control" readonly="readonly" id="idCard" name="idCard" value="{$person.idCard}"  />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label"><span class="text-danger">*</span>账号状态</label>
+                        <div class="col-sm-10">
+                            <select class="form-control" id="active" name="active" >
+                                <option value="">--- 请选择 ---</option>
+                                <option value="1">账号有效</option>
+                                <option value="2">拉黑/冻结</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="hr-line-dashed"></div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="rowGroup"  style="margin-bottom: 0px;">
+                        <label class="col-sm-2 control-label">冻结原因</label>
+                        <div class="col-sm-10">
+                            <textarea class="form-control" rows="3" id="activeMsg" name="activeMsg">{$person.activeMsg}</textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+<input type="text" id="activeTemp" value="{$person.active}" style="display: none;" />
+<!--<script src="${ctxPath}/static/modular/person/person_active.js"></script>-->
+<script type="text/javascript">
+    document.write('<script src="/static/modular/person/person_active.js?v=' + (new Date()).getTime() + '"><\/script>');
+</script>
+{/block}

app/common/api/UserApi.php

@@ -140,8 +140,10 @@ class UserApi {
                 }
                 break;
             case 3:
+                if ($this->info['active'] == 2) {
+                    return "账号被冻结， 冻结原因为： {$this->info['activeMsg']}";
+                }
                 return false;
-                break;
         }
     }
 

app/index/controller/Auth.php

@@ -53,7 +53,7 @@ class Auth extends BaseController {
             } else if (session("isCaptcha") == 1 && !captcha_check($captcha)) {
                 $msg = "验证码错误";
             } else if ($res_msg = $user->checkState()) {
-                if (in_array($user->info['checkState'], [2, 5])) {
+                if (in_array($user->info['checkState'], [2, 5]) && $usertype == 2) {
                     return redirect("/common/auth/enterprise_edit");
                 }
                 $msg = $res_msg;
@@ -225,14 +225,12 @@ class Auth extends BaseController {
         }
     }
 
-    public function test(){
+    public function test() {
         $sm4 = new SM4('b123d075924b4224');
         $data = mystr_pad('test');
         // CBC加密
         $d = $sm4->enDataCbc($data, '8a003e84b5be7b6e');
         var_dump(base64_encode($d));
-
-
     }
 
 }

public/static/modular/person/person_active.js

@@ -1,26 +1,26 @@
 var PsActive = {};
 
-PsActive.addSubmit = function() {
-	var id = $("#id").val();
-	var active = $("#active").val();
-	var activeMsg = $("#activeMsg").val();
-	var da = {"id":id, "active":active, "activeMsg":activeMsg};
-	var ajax = new $ax(Feng.ctxPath + "/person/setActive", function(data){
+PsActive.addSubmit = function () {
+    var id = $("#id").val();
+    var active = $("#active").val();
+    var activeMsg = $("#activeMsg").val();
+    var da = {"id": id, "active": active, "activeMsg": activeMsg};
+    var ajax = new $ax(Feng.ctxPath + "/admin/person/setActive", function (data) {
         Feng.info(data.msg);
         if (data.code == 200) {
-        	window.parent.Person.table.refresh();
-        	parent.layer.close(window.parent.Person.layerIndex);
-		}
-    },function(data){
+            window.parent.Person.table.refresh();
+            parent.layer.close(window.parent.Person.layerIndex);
+        }
+    }, function (data) {
         Feng.error("操作失败!" + data.responseJSON.message + "!");
     });
     ajax.set(da);
     ajax.start();
 };
 
-$(function () {	
-	var activeTemp = $("#activeTemp").val();
-	if (activeTemp!=null && activeTemp!='') {
-		$("#active").val(activeTemp);
-	}
+$(function () {
+    var activeTemp = $("#activeTemp").val();
+    if (activeTemp != null && activeTemp != '') {
+        $("#active").val(activeTemp);
+    }
 });

public/static/modular/person/person_list.js

@@ -1,100 +1,100 @@
 var Person = {
-    id: "table",	                                                                //表格id
-    seItem: null,		                                                            //选中的条目
+    id: "table", //表格id
+    seItem: null, //选中的条目
     table: null,
     layerIndex: -1
 };
 
-Person.initColumn = function(){
-	return [
-		{field: 'selectItem', radio: true},
+Person.initColumn = function () {
+    return [
+        {field: 'selectItem', radio: true},
         {title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
-        {title: '用户名/账号', field: 'username', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '姓名', field: 'name', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '性别', field: 'sex', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip',
-        	formatter: function (value, row, index){
-                if (value==null || value==''){
+        {title: '用户名/账号', field: 'username', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '姓名', field: 'name', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '性别', field: 'sex', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (value == null || value == '') {
                     return "";
-                } else if (value == 1){
+                } else if (value == 1) {
                     return "男";
-                }else if(value == 2){
+                } else if (value == 2) {
                     return "女";
                 } else {
-                	return "";
+                    return "";
                 }
             }
         },
-        {title: '证件号码', field: 'idCard', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '电话号码', field: 'phone', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '联系地址', field: 'address', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'},
-        {title: '账号状态', field: 'active', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip',
-        	formatter: function (value, row, index){
-                if (value==null || value==''){
+        {title: '证件号码', field: 'idCard', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '电话号码', field: 'phone', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '联系地址', field: 'address', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'},
+        {title: '账号状态', field: 'active', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip',
+            formatter: function (value, row, index) {
+                if (value == null || value == '') {
                     return "";
-                } else if (value == 1){
+                } else if (value == 1) {
                     return "账号有效";
-                }else if(value == 2){
+                } else if (value == 2) {
                     return "被冻结/拉黑";
                 } else {
-                	return "";
+                    return "";
                 }
             },
-            cellStyle: function(value, row, index) {
-            	if (value==null || value==''){
-            		return {css:{}};
-                } else if (value == 1){
-                	return {css:{'background-color':'LightGreen'}};
-                }else if(value == 2){
-                	return {css:{"background-color":"Orange"}};
+            cellStyle: function (value, row, index) {
+                if (value == null || value == '') {
+                    return {css: {}};
+                } else if (value == 1) {
+                    return {css: {'background-color': 'LightGreen'}};
+                } else if (value == 2) {
+                    return {css: {"background-color": "Orange"}};
                 } else {
-                	return {css:{}};
+                    return {css: {}};
                 }
             }
         },
-        {title: '注册时间', field: 'createTime', align: 'center', width:120, valign: 'middle', 'class': 'uitd_showTip'}
-	];
+        {title: '注册时间', field: 'createTime', align: 'center', width: 120, valign: 'middle', 'class': 'uitd_showTip'}
+    ];
 };
 
-Person.search = function() {
-	var queryData = {};
-	queryData['username'] = $("#username").val();
-	queryData['name'] = $("#name").val();
-	queryData['sex'] = $("#sex").val();
-	queryData['idCard'] = $("#idCard").val();
-	queryData['phone'] = $("#phone").val();
-	Person.table.refresh({"query": queryData});
+Person.search = function () {
+    var queryData = {};
+    queryData['username'] = $("#username").val();
+    queryData['name'] = $("#name").val();
+    queryData['sex'] = $("#sex").val();
+    queryData['idCard'] = $("#idCard").val();
+    queryData['phone'] = $("#phone").val();
+    Person.table.refresh({"query": queryData});
 };
 
-Person.reset = function() {
-	$("#username").val("");
-	$("#name").val("");
-	$("#sex").val("");
-	$("#idCard").val("");
-	$("#phone").val("");
+Person.reset = function () {
+    $("#username").val("");
+    $("#name").val("");
+    $("#sex").val("");
+    $("#idCard").val("");
+    $("#phone").val("");
 };
 
 Person.check = function () {
     var selected = $('#' + Person.id).bootstrapTable('getSelections');
-    if(selected.length == 0){
+    if (selected.length == 0) {
         Feng.info("请先选中表格中的某一记录！");
         return false;
-    }else{
-    	Person.seItem = selected[0];
+    } else {
+        Person.seItem = selected[0];
         return true;
     }
 };
 
-Person.gotoPersonDetailPage = function() {
-	if (!Person.check()) {
-		return;
-	}
+Person.gotoPersonDetailPage = function () {
+    if (!Person.check()) {
+        return;
+    }
     var index = layer.open({
         type: 2,
         title: '查看详情',
         area: ['830px', '450px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/person/gotoPersonDetailPage?id='+Person.seItem.id,
+        content: Feng.ctxPath + '/admin/person/detail/id/' + Person.seItem.id,
         btn: ['<i class="fa fa-eraser"></i>&nbsp;&nbsp;关闭'],
         yes: function (index, layero) {
             layer.close(index);
@@ -104,52 +104,52 @@ Person.gotoPersonDetailPage = function() {
     Person.layerIndex = index;
 };
 
-Person.setActive = function() {
-	if (!Person.check()) {
-		return;
-	}
-	var index = layer.open({
+Person.setActive = function () {
+    if (!Person.check()) {
+        return;
+    }
+    var index = layer.open({
         type: 2,
         title: '设置冻结',
         area: ['830px', '580px'], //宽高
         fix: false, //不固定
         maxmin: true,
-        content: Feng.ctxPath + '/person/gotoActivePage?id='+Person.seItem.id,
+        content: Feng.ctxPath + '/admin/person/setActive/id/' + Person.seItem.id,
         btn: ['<i class="fa fa-check"></i>&nbsp;&nbsp;确定', '<i class="fa fa-eraser"></i>&nbsp;&nbsp;取消'],
         yes: function (index, layero) {
-        	//按钮【按钮一】的回调
-        	var iframeWin = window[layero.find('iframe')[0]['name']];
-        	iframeWin.PsActive.addSubmit();
+            //按钮【按钮一】的回调
+            var iframeWin = window[layero.find('iframe')[0]['name']];
+            iframeWin.PsActive.addSubmit();
         }
     });
 //    layer.full(index);
     this.layerIndex = index;
 };
 
-Person.resetPassword = function() {
-	if (!Person.check()) {
-		return;
-	}
-	Feng.confirm(
-        "确定要重置吗?",
-        function(){
-        	var ajax = new $ax(Feng.ctxPath + "/person/resetPassword?id="+Person.seItem.id, function(data){
-                Feng.info(data.msg);
-                if(data.code == 200){
-                	Person.table.refresh();
-                }
-            },function(data){
-                Feng.error("操作失败!");
-            });
-            ajax.set(null);
-            ajax.start();
-        }
-	);
+Person.resetPassword = function () {
+    if (!Person.check()) {
+        return;
+    }
+    Feng.confirm(
+            "确定要重置吗?",
+            function () {
+                var ajax = new $ax(Feng.ctxPath + "/admin/person/resetPassword/id/" + Person.seItem.id, function (data) {
+                    Feng.info(data.msg);
+                    if (data.code == 200) {
+                        Person.table.refresh();
+                    }
+                }, function (data) {
+                    Feng.error("操作失败!");
+                });
+                ajax.set(null);
+                ajax.start();
+            }
+    );
 };
 
 $(function () {
     var defaultColunms = Person.initColumn();
-    var table = new BSTable(Person.id, "/person/findPersonByPage", defaultColunms);
+    var table = new BSTable(Person.id, "/admin/person/list", defaultColunms);
     table.setPaginationType("server");
     Person.table = table.init();
 });