Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/api/controller/Family.php

@@ -66,7 +66,7 @@ class Family extends Api
      * 查看所创建的族谱
      */
     public function familyList(){
-        $source=$this->request->param("source",2);//1我的族谱，2创建族谱，
+        $source=$this->request->param("source",2);//0首页，1我的族谱，2创建族谱，
        /* if($source == 2 && $this->auth->is_shaikh==0){
             $this->error("您还未申请为族长");
         }*/
@@ -102,7 +102,7 @@ class Family extends Api
             }
         }
 
-        $this->success("",$arr);
+        $this->success("",$source==0?$arr:$data);
     }