名人堂完善千古流芳，当代名流

application/admin/lang/zh-cn/family/family_people.php

@@ -36,4 +36,5 @@ return [
     'Audit 1'        => '通过',
     'Audit 2'        => '失败',
     'Sleep_place'       => '安息地',
+    'Type_label'    =>'标签',
 ];

application/admin/view/family/family_people/add.html

@@ -27,6 +27,12 @@
             {:build_radios('row[ext0]', ['0'=>__('否'), '1'=>__('是'), '2'=>__('未知')], 1)}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type_label')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[type_label]', ['1'=>__('千古流芳'), '2'=>__('当代名流')], 1)}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Photo')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/family/family_people/edit.html

@@ -26,6 +26,12 @@
             {:build_radios('row[ext0]', ['0'=>__('否'), '1'=>__('是'), '2'=>__('未知')], $row.ext0)}
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type_label')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[type_label]', ['1'=>__('千古流芳'), '2'=>__('当代名流')], $row.type_label)}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Photo')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/FamilyTree.php

@@ -631,8 +631,10 @@ class FamilyTree extends Api
     public function celebrityList(){
         $page = $this->request->param('page',1);
         $type = $this->request->param('type',1);
+        $type_label = $this->request->param('type_label',1);
         $map['type'] = 2;
         $map['status'] = 1;
+        $map['type_label'] = $type_label;
         if($type == 2){//同姓
             $Surname=SurnameModel::where(["ID"=>$this->auth->surname_id])->value("Surname");
             $map['surname'] = $Surname;
@@ -640,6 +642,10 @@ class FamilyTree extends Api
             $map['province_id'] = $this->auth->province_id;
         }else if($type == 4){//同城
             $map['city_id'] = $this->auth->city_id;
+        }else if($type == 5){//同县
+            $map['area_id'] = $this->auth->area_id;
+        }else if($type == 6){//同乡
+            $map['village_id'] = $this->auth->village_id;
         }
         $data=FamilyPeopleModel::where(['type'=>2,'status'=>1])->field("*")->page($page)->limit(10)->order("ranking desc,id desc")->select();
         $this->success("",$data);