Merge branch 'master' of http://114.215.101.231:8099/guosheng/community into Branch_liuzhen

@@ -23,7 +23,6 @@ class UserHouse extends Backend
     {
         parent::_initialize();
         $this->model = new \app\api\model\UserHouse;
-
     }
 
     /**
@@ -56,7 +55,7 @@ class UserHouse extends Backend
                 ->order($sort, $order)
                 ->limit($offset, $limit)
                 ->select();
-                
+
             $list = collection($list)->toArray();
             $result = array("total" => $total, "rows" => $list);
 

@@ -249,7 +249,7 @@ class House extends Api
             ->alias('a')
             ->join('user b','a.user_id = b.id')
             ->where('a.house_board_id',$id)
-            ->field('b.id,b.avatar')
+            ->field('b.id,b.avatar,b.nickname')
             ->order('a.createtime desc')
             ->select();
         foreach ($data as &$v) {

@@ -30,7 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 						{field: 'user.id', title: __('用户ID'), operate:false},
                         {field: 'name', title: __('电话名称'), operate:false},
                         {field: 'phone', title: __('电话')},
-						{field: 'status', title: __('绑定状态')},
+						{field: 'status', title: __('绑定状态'), searchList: {'1':'申请中','2':'已绑定','3':'已拒绝'}, formatter: Table.api.formatter.normal},
 						{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, buttons:
 						    [
 						        {