修改

app/api/controller/Pub.php

@@ -25,6 +25,7 @@ use app\model\api\ShowTemplate;
 use app\model\api\UserShowTemplate;
 use app\model\api\ServiceType;
 use app\model\api\ServiceTimeType;
+use app\model\api\UserWorkType;
 use app\model\api\Advert as AdvertModel;
 use library\utils\WxpayV2 as wxpayApi;
 
@@ -190,6 +191,35 @@ 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
+     */
+    public function getUserWorkTypeList(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 UserWorkType)->where($where)->count();
+        $data=null;
+        if($totalCount>0){
+            $data = (new UserWorkType)
+                ->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]);
+    }
+    
+    
     /**
      * 获取服务时长类型
      * @param Request $request

app/api/controller/User.php

@@ -621,15 +621,44 @@ class User extends BaseController
     public function getWxmpQrcode(Request $request){
         $weixinA = new weixina();
         $data = $weixinA->getUnlimitedQRCode("pages/index/index","a=1");
-        return app('json')->success(["data"=>$data,"res"=>\think\facade\Filesystem::disk('resource')]);
         if(empty($data)){
             return app('json')->fail("小程序码获取失败".$weixinA->error);
         }
-        $base64 = 'data:'.$reponse['contentType'].';base64,'.base64_encode($data['buffer']);
+        $base64 = 'data:'.$data['contentType'].';base64,'.base64_encode($data['buffer']);
+        $res = $this->uploadImageBase64("wximg",$base64);
+        if($res["code"]!=1){
+            return app('json')->fail($res["msg"]);
+        }
+        return app('json')->success(["img"=>$res["data"]]);
+    }
+    
+    /**
+     * 
+     * @param Request $request
+     */
+    public function uploadBase64(Request $request){
+        [$img] = UtilService::getMore([
+            ['img', '','empty',"请上传图片"],
+        ], $request,true);
+        $imgAr = explode("base64,",$img);
+        if(empty($imgAr)){
+            return app("json")->fail("请上传base64图片");
+        }
+        $imgBase64 = count($imgAr)==1?$imgAr[0]:$imgAr[1];
+        $contentType = "image/jpeg";
+        if(count($imgAr)>1){
+            
+        }
+        
+        
+        //判断字符串是否经过编码方法 
+        if($imgBase64!=base64_encode(base64_decode($imgBase64))){
+            return app("json")->fail("请上传base64图片");
+        }
+        
         
-        $this->uploadImageBase64("wximg",$base64);
         
-        return app('json')->success(["data"=>$data,"res"=>\think\facade\Filesystem::disk('resource')]);
+        $img = "data:application/octet-stream;base64,".$imgBase64;
     }
     
     

app/api/route/pub.php

@@ -26,6 +26,9 @@ Route::group('pub', function () {
     Route::rule('getBannerList','Pub/getBannerList');
     //获取支付类型
     Route::rule('getPayTypeData','Pub/getPayTypeData');
+    //获取用户服务类型
+    Route::rule('getUserWorkTypeList','Pub/getUserWorkTypeList');
+    
     
     //bug提交
     Route::rule('appBugSub', 'Pub/appBugSub');

app/model/api/UserWorkType.php

@@ -0,0 +1,15 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\model\api;
+
+use library\basic\BaseModel;
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class UserWorkType extends BaseModel
+{
+    //
+}