小程序登录

app/common/controller/UploadController.php

@@ -88,7 +88,7 @@ class UploadController
             $originalName = $file->getUploadName();
 
             $result = Storage::adapter('oss')
-                ->path('bsh_datax/' . $sceneUrl . date('Ymd'))
+                ->path('bsh_info/' . $sceneUrl . date('Ymd'))
                 ->size(1024*1024*100)
                 ->upload($file);
             
@@ -129,7 +129,7 @@ class UploadController
             }
 
             $result = Storage::adapter('oss')
-                ->path('bsh_datax/' . $sceneUrl . date('Ymd'))
+                ->path('bsh_info/' . $sceneUrl . date('Ymd'))
                 ->size(1024*1024*100)
                 ->extYes(['image/jpeg','image/png'])
                 ->extNo(['image/gif'])

app/common/controller/UserController.php

@@ -133,7 +133,7 @@ class UserController extends BaseController
     {
         try {
             $params = $request->all();
-            $result = $this->service->wechatLogin($params['code'], $params['state']);
+            $result = $this->service->wechatLogin($params['login_code'], $params['phone_code']);
 
             return $this->success($result);
         } catch (\Throwable $th) {

app/common/model/PostCategory.php

@@ -40,7 +40,7 @@ class PostCategory extends Model
     /**
      * 允许自动填充模型字段
      */
-    protected $fillable = ['id', 'parent_id', 'name', 'level', 'path', 'sort', 'status', 'created_at', 'updated_at'];
+    protected $fillable = ['id', 'parent_id', 'icon', 'name', 'level', 'path', 'sort', 'status', 'created_at', 'updated_at'];
 
     /**
      * 不允许自动填充模型字段

app/common/service/BasicDataService.php

@@ -98,7 +98,7 @@ class BasicDataService
      */
     private function getAllLoginTypes()
     {
-        return ['upwd', 'feishu', 'qrcode']; // 示例数据
+        return ['upwd', 'feishu', 'wechat', 'qrcode']; // 示例数据
     }
 
     /**

app/common/service/UserService.php

@@ -187,7 +187,8 @@ class UserService
 
         $session = $logic->miniCode2Session($loginCode);
         if (!isset($session['openid'])) {
-            return json(['code'=>0, 'msg'=>'登录失败', 'data'=>$session]);
+            throw new BusinessException('登录失败');
+//            return json(['code'=>0, 'msg'=>'登录失败', 'data'=>$session]);
         }
 
         $openid = $session['openid'];
@@ -199,7 +200,8 @@ class UserService
         $phoneData = $logic->getMiniPhoneNumber($access_token, $phoneCode);
 
         if (!isset($phoneData['phone_info']['phoneNumber'])) {
-            return json(['code'=>0, 'msg'=>'获取手机号失败', 'data'=>$phoneData]);
+            throw new BusinessException('获取手机号失败');
+//            return json(['code'=>0, 'msg'=>'获取手机号失败', 'data'=>$phoneData]);
         }
 
         $phone = $phoneData['phone_info']['phoneNumber'];

app/common/service/WechatService.php

@@ -13,6 +13,7 @@ class WechatService
 {
 
     protected array $web;
+    protected array $mini;
     protected array $login;
     protected $app;
 

config/route.php

@@ -21,7 +21,7 @@ Route::any('/qrcode/url', [app\common\controller\UserController::class, 'getQrUr
 Route::any('/user/info', [app\common\controller\UserController::class, 'getUserInfo']);
 Route::any('/bind/user', [app\common\controller\UserController::class, 'bindUser']);
 
-//Route::post('/api/wechat/login', [app\common\controller\UserController::class, 'wechatLogin']);
+Route::post('/wechat/login', [app\common\controller\UserController::class, 'wechatLogin']);
 
 // 代理oss文件地址
 Route::any('/proxy/ossurl', [app\common\controller\UploadController::class, 'proxy']);