修改

app/api/controller/User.php

@@ -181,50 +181,10 @@ class User extends BaseController
      * @param Request $request
      */
     public function getUserCardInfo(Request $request){
-        $data = (new InfoAudit)
-                ->alias("u")
-                ->field("u.*,wt.title as user_work_type_title,s.title as service_time_type_title")
-                ->join("user_work_type wt","wt.id = u.user_work_type_id","left")
-                ->leftJoin("service_time_type s", "s.code = u.service_type")
-                ->where("u.uid",$request->user["uid"])
-                ->where("u.status",1)
-                ->order("u.id","desc")
-                ->find();
+        $data = (new InfoAudit)->getItem(["uid"=>$request->user["uid"],"status"=>1]);
         if(empty($data)){
             return app('json')->fail("您还没有通过名片信息审核");
         }
-        $data = $data->toArray();
-        $serviceTypeModel = new ServiceTypeModel();
-        $data["birthday"]   = empty($data["birthday"])  ?"":date("Y-m-d",$data["birthday"]);
-        $data["time"]   = date("Y-m-d H:i:s",$data["time"]);
-        $data["service_audit_imgs"] = getImageAr($data["service_audit_imgs"]);
-        $data["service_intro_imgs"] = getImageAr($data["service_intro_imgs"]);
-        $data["service_imgs"]       = getImageAr($data["service_imgs"]);
-        //服务区域
-        $data["service_area"] = getImageAr($data["service_area"]);
-        $data["service_area_all"] = [];
-        foreach($data["service_area"] as $k2=>$v2){
-            $data["service_area_all"][]=getAreaItemAr($v2);
-        }
-        //服务内容
-        $data["service_project"]    = getImageAr($data["service_project"]);
-        $data["service_project_ar"] = [];
-        if(!empty($data["service_project"])){
-            $data["service_project_ar"] = $serviceTypeModel->where("id","in",$data["service_project"])->select();
-        }
-        $data["service_label"]       = getImageAr($data["service_label"]);
-        $data["service_label_ar"]    = (new ServiceLabelModel)->getColumnList("id", "title", $data["service_label"]);
-        
-        
-        unset($data["admin_id"]);
-        unset($data["admin_mono"]);
-        unset($data["admin_time"]);
-        unset($data["uid"]);
-        unset($data["id"]);
-        unset($data["service_price"]);
-        unset($data["service_area"]);
-        unset($data["service_project"]);
-        
         $typeData = (new TypeAudit)->where("uid",$request->user["uid"])->order("id","desc")->find();
         $data["is_type_audit"] = (empty($typeData) || $typeData["status"]!=1)?0:1;   
         return app('json')->success($data);

app/model/api/InfoAudit.php

@@ -3,6 +3,9 @@ declare (strict_types = 1);
 
 namespace app\model\api;
 
+use app\model\api\ServiceType as ServiceTypeModel;
+use app\model\api\ServiceLabel as ServiceLabelModel;
+
 use think\Model;
 
 /**
@@ -18,7 +21,7 @@ class InfoAudit extends Model
      * @param type $id
      * @param type $type
      */
-    public function getItem($post){
+    public function getItem($post,$is_admin=0){
         if(empty($parms)){
             return [];
         }
@@ -41,5 +44,41 @@ class InfoAudit extends Model
                 ->where($where)
                 ->order("au.id","desc")
                 ->find();
+        if(empty($data)){
+            return [];
+        }
+        $data = $data->toArray();
+        $serviceTypeModel = new ServiceTypeModel();
+        $data["birthday"]           = empty($data["birthday"])  ? "" : date("Y-m-d",$data["birthday"]);//生日
+        $data["time"]               = date("Y-m-d H:i:s",$data["time"]);//添加时间
+        $data["service_audit_imgs"] = getImageAr($data["service_audit_imgs"]);//我的证书
+        $data["service_intro_imgs"] = getImageAr($data["service_intro_imgs"]);//我的介绍图片
+        $data["service_imgs"]       = getImageAr($data["service_imgs"]);//我的服务展示照片
+        //服务区域
+        $data["service_area"]       = getImageAr($data["service_area"]);
+        $data["service_area_all"]   = [];
+        foreach($data["service_area"] as $k2=>$v2){
+            $data["service_area_all"][]=getAreaItemAr($v2);
+        }
+        //服务内容
+        $data["service_project"]    = getImageAr($data["service_project"]);//我的服务内容
+        $data["service_project_ar"] = [];
+        if(!empty($data["service_project"])){
+            $data["service_project_ar"] = (new ServiceTypeModel())->where("id","in",$data["service_project"])->select();
+        }
+        $data["service_label"]       = getImageAr($data["service_label"]);
+        $data["service_label_ar"]    = (new ServiceLabelModel)->getColumnList("id", "title", $data["service_label"]);
+        
+        if($is_admin==0){
+            unset($data["admin_id"]);
+            unset($data["admin_mono"]);
+            unset($data["admin_time"]);
+            unset($data["uid"]);
+            unset($data["service_price"]);
+            unset($data["service_area"]);
+            unset($data["service_project"]);
+        }
+        return $data;
+        
     }
 }