修改

app/api/controller/Pub.php

@@ -29,7 +29,6 @@ use app\model\api\ServiceTimeType;
 use app\model\api\UserWorkType;
 use app\model\api\Advert as AdvertModel;
 use library\utils\WxpayV2 as wxpayApi;
-use app\model\api\ServiceLabel as ServiceLabelModel;
 
 class Pub extends BaseController
 {
@@ -205,20 +204,9 @@ class Pub extends BaseController
         ], $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,type")
-                ->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]);
+        $post["status"]   = 1;
+        $data = (new ServiceLabel)->getList($post,"id,title,type");
+        return app('json')->success($data);
     }
     
     /**
@@ -340,7 +328,7 @@ class Pub extends BaseController
     public function appTest(Request $request){
         
         
-        $labelData = (new ServiceLabelModel)->where("status",1)->where("id","in",["",1,2,6,7,8,0])->column('id');
+        $labelData = (new ServiceLabel)->where("status",1)->where("id","in",["",1,2,6,7,8,0])->column('id');
         var_dump($labelData);exit;
         
         $money = $request->post("money",0);

app/api/controller/User.php

@@ -331,10 +331,13 @@ class User extends BaseController
             }
         }
         //服务标签
+        $save["service_label"]="";
         if(!empty($post["service_label"]) && is_array($post["service_label"])){
             $labelData = (new ServiceLabelModel)->where("status",1)->where("id","in",$post["service_label"])->column('id');
+            if(!empty($labelData)){
+                $save["service_label"] = implode(",", $labelData);
+            }
         }
-        $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/model/api/ServiceLabel.php

@@ -10,5 +10,33 @@ use think\Model;
  */
 class ServiceLabel extends Model
 {
-    //
+    /**
+     * 获取标签列表
+     * @param type $post
+     * @param type $field
+     * @return type
+     */
+    public function getList($post,$field="*"){
+        $post["pageSize"] = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
+        $post["page"]     = $post["page"]<=0     ? 1  : (int)$post["page"];
+        $where=[];
+        if(isset($post["status"]) && in_array((string)$post["status"], ["0","1"])){
+            $where[]=["status","=",(int)$post["status"]];
+        }
+        if(!empty($post["title"])){
+            $where[]=["title","like","%{$post["title"]}%"];
+        }
+        $totalCount = $this->where($where)->count();
+        $data=null;
+        if($totalCount>0){
+            $data = (new ServiceLabel)
+                ->field($field)
+                ->where($where)
+                ->order("seq", "desc")
+                ->page($post["page"], $post["pageSize"])
+                ->select();
+        }
+        $data = empty($data)?[]:$data;
+        return ["list" => $data, "pageSize" => $post["pageSize"],"page"=>$post["page"],"totalCount"=>$totalCount];
+    }
 }