修改

app/api/controller/Pub.php

@@ -24,6 +24,7 @@ use app\model\api\User as UserModel;
 use app\model\api\ShowTemplate;
 use app\model\api\UserShowTemplate;
 use app\model\api\ServiceType;
+use app\model\api\ServiceLabel;
 use app\model\api\ServiceTimeType;
 use app\model\api\UserWorkType;
 use app\model\api\Advert as AdvertModel;
@@ -191,6 +192,33 @@ class Pub extends BaseController
         $data = empty($data)?[]:$data;
         return app('json')->success(["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount]);
     }
+    /**
+     * 获取标签列表
+     * @param Request $request
+     * @return type
+     */
+    public function getServiceLabelList(Request $request){
+        $post = UtilService::getMore([
+            ['page', 1],
+            ['pageSize', 50],
+        ], $request);
+        $post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
+        $post["page"]     = $post["page"]<=0 ? 1 : (int)$post["page"];
+        $where=[];
+        $where[]=["status","=",1];
+        $totalCount = (new ServiceLabel)->where($where)->count();
+        $data=null;
+        if($totalCount>0){
+            $data = (new ServiceLabel)
+                ->field("id,title,content,img")
+                ->where($where)
+                ->order("seq", "desc")
+                ->page($post["page"], $post["pageSize"])
+                ->select();
+        }
+        $data = empty($data)?[]:$data;
+        return app('json')->success(["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount]);
+    }
     
     /**
      * 获取用户工作服务类型

app/api/controller/User.php

@@ -182,8 +182,10 @@ class User extends BaseController
     public function getUserCardInfo(Request $request){
         $data = (new InfoAudit)
                 ->alias("u")
-                ->field("u.*,wt.title as user_work_type_title")
+                ->field("u.*,wt.title as user_work_type_title,s.title as service_time_type_title,w.title as user_work_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")
+                ->leftJoin("user_work_type w", "w.id = u.user_work_type_id")
                 ->where("u.uid",$request->user["uid"])
                 ->where("u.status",1)
                 ->order("u.id","desc")
@@ -210,7 +212,8 @@ class User extends BaseController
         if(!empty($data["service_project"])){
             $data["service_project_ar"] = $serviceTypeModel->where("id","in",$data["service_project"])->select();
         }
-        $data["service_type_name"] = (new ServiceTimeType)->where("code",$data["service_type"])->value("title");
+        $data["service_label"]     = getImageAr($data["service_label"]);
+        
         unset($data["admin_id"]);
         unset($data["admin_mono"]);
         unset($data["admin_time"]);
@@ -260,6 +263,7 @@ class User extends BaseController
             ['minority',''],
             
             ['user_work_type_id','0'],//服务职称
+            ['service_label',[]],//服务标签
             
             
         ],$request);
@@ -323,6 +327,8 @@ class User extends BaseController
                 $save["service_project"] = implode(",", $saveCon);
             }
         }
+        //服务标签
+        $save["service_label"]          = empty($post["service_label"])        ? "" : implode(",", $post["service_label"]);
         $save["service_intro_content"]  = empty($post["service_intro_content"])? "" : $post["service_intro_content"];
         $save["service_intro_imgs"]     = empty($post["service_intro_imgs"])   ? "" : implode(",", $post["service_intro_imgs"]);
         $save["service_audit_imgs"]     = empty($post["service_audit_imgs"])   ? "" : implode(",", $post["service_audit_imgs"]);

app/api/route/pub.php

@@ -28,6 +28,9 @@ Route::group('pub', function () {
     Route::rule('getPayTypeData','Pub/getPayTypeData');
     //获取用户服务类型
     Route::rule('getUserWorkTypeList','Pub/getUserWorkTypeList');
+    //获取用户服务标签列表
+    Route::rule('getServiceLabelList','Pub/getServiceLabelList');
+    
     
     
     //bug提交

app/model/api/Label.php → app/model/api/ServiceLabel.php

@@ -8,7 +8,7 @@ use think\Model;
 /**
  * @mixin \think\Model
  */
-class Label extends Model
+class ServiceLabel extends Model
 {
     //
 }

app/system/controller/Audit.php

@@ -131,6 +131,8 @@ class Audit extends BaseController
             if(!empty($data[$k]["service_project"])){
                 $data[$k]["service_project_ar"] = $serviceTypeModel->where("id","in",$data[$k]["service_project"])->select();
             }
+            //服务标签
+            $data[$k]["service_label"]     = getImageAr($v["service_label"]);
         }
         return app('json')->success([
             'list'      => $data,
@@ -149,8 +151,10 @@ class Audit extends BaseController
         ], $request);
         $data = (new InfoAudit)
                 ->alias("i")
-                ->field("i.*,u.mobile as user_mobile,u.nickname as user_nickname,u.avatar as user_avatar")
+                ->field("i.*,u.mobile as user_mobile,u.nickname as user_nickname,u.avatar as user_avatar,s.title as service_time_type_title,w.title as user_work_type_title")
                 ->join("user as u","u.uid = i.uid","left")
+                ->leftJoin("service_time_type s", "s.code = t.service_type")
+                ->leftJoin("user_work_type w", "w.id = i.user_work_type_id")
                 ->where("i.id",$post["id"])
                 ->find();
         if(empty($data)){
@@ -177,6 +181,7 @@ class Audit extends BaseController
         if(!empty($data["service_project"])){
             $data["service_project_ar"] = $serviceTypeModel->where("id","in",$data["service_project"])->select();
         }
+        $data["service_label"]     = getImageAr($data["service_label"]);
         return app('json')->success($data);
     }
     /**

app/system/controller/ServiceLabel.php

@@ -0,0 +1,97 @@
+<?php
+declare (strict_types = 1);
+namespace app\system\controller\v1;
+
+use app\BaseController;
+use app\model\api\ServiceLabel as LabelModel;
+use app\Request;
+use library\services\UtilService;
+
+// +----------------------------------------------------------------------
+// | [ WE CAN DO IT MORE SIMPLE  ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2018-2020 rights reserved.
+// +----------------------------------------------------------------------
+// | [ 服务标签管理 ]
+// +----------------------------------------------------------------------
+// | Date: 2020-09-06 21:53
+// +----------------------------------------------------------------------
+
+class ServiceLabel extends  BaseController{
+    
+    /**
+     * 标签列表
+     * @param Request $request
+     * @return type
+     */
+    public function list(Request $request) {
+        $pageSize = 50;
+        $post =  UtilService::getMore([
+                ['page',1],
+                ['name',''],
+                ['status',''],
+        ],$request);
+        $where=[];
+        if(in_array((string)$post["status"],['0','1'])){
+            $where[]=["status","=",(int)$post["status"]];
+        }
+        if(!empty($post["name"])){
+            $where[]=["name","like","%{$post["name"]}%"];
+        }
+        $data = (new LabelModel)
+                ->where($where)
+                ->page((int)$post["page"], (int)$pageSize)
+                ->order("seq","desc")
+                ->order("id","desc")
+                ->select()
+                ->toArray();
+        $pageCount = (new LabelModel)->where($where)->count();
+        $data = empty($data)?[]:$data;
+        return app('json')->success([
+            'list'      => $data,
+            'pageCount' => $pageCount,
+            'pageSize'  => $pageSize,
+            'page'      => $post["page"]
+        ]);
+    }
+
+    /**
+     * 标签添加
+     */
+    public function add(Request $request){
+        $post = UtilService::getMore([
+            ['id','0'],
+            ['name','','empty','请输入标签名称'],
+            ['seq','0'],
+            ['type','common'],
+            ['status','1']
+        ],$request);
+        $id = $post["id"];
+        unset($post["id"]);
+        $r=0;
+        if(empty($id) || $id=="0"){
+            $r = (new LabelModel)->insert($post);
+        }else{
+            $r = (new LabelModel)->where("id",$id)->update($post);
+        }
+        
+        if($r){
+            return app('json')->success("数据保存成功");
+        }else{
+            return app('json')->fail("数据保存失败");
+        }
+    }
+
+    /**
+     * 标签删除
+     * @param Request $request
+     */
+    public function del(Request $request) {
+        [$id] = UtilService::getMore([
+            ['id',0,'empty','参数错误']
+        ],$request,true);
+        $bool =   (new LabelModel)->where("id",$id)->delete();
+        return app('json')->success("分类删除成功");
+    }
+
+}