rkljw 1 месяц назад
Родитель
Сommit
eea5b757b0
4 измененных файлов с 16 добавлено и 28 удалено
  1. 5 0
      app/Controller/LoginController.php
  2. 6 28
      app/Controller/NewsController.php
  3. 4 0
      config/api/login.php
  4. 1 0
      config/api/news.php

+ 5 - 0
app/Controller/LoginController.php

@@ -434,4 +434,9 @@ class LoginController extends AbstractController
         }
         return Result::success(['isDel' => $isDel]);
     }
+
+    public function goLogin()
+    {
+
+    }
 }

+ 6 - 28
app/Controller/NewsController.php

@@ -52,35 +52,11 @@ class NewsController extends AbstractController
      */
     public function getCategoryList()
     {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'page'=> 'required',
-                'pageSize'=> 'required',
-            ],
-            [
-                'page.required' => '第几页不能为空',
-                'pageSize.required' => '每页显示条数不能为空',
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
+        $result = $this->newsServiceClient->getCategoryList([]);
+        if($result['code'] == 200){
+            return Result::success(PublicData::buildMenuTree($result['data']));
         }
-         //获取用户信息
-        //  $user_id = Context::get("UserId");
-        //  $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
-        //  var_dump("用户信息:",$userInfo);
-        //  $sszq = $userInfo['data']['sszq'];
-        //  $type_id = $userInfo['data']['type_id']; //'1:个人会员 2:政务会员 3:企业会员 4:调研员 10000:管理员 20000:游客(小程序)'
-        $result = $this->newsServiceClient->getCategoryList($requireData);
-        if($result['data']){
-            foreach ($result['data']['rows'] as $k=>$v) {
-                $result['data']['rows'][$k]['pid_arr'] = $v['pid_arr']?json_decode($v['pid_arr']):[0];
-            }
-        }
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+        return  Result::error($result['message']);
     }
     /**
      * 站点下的导航池
@@ -667,6 +643,7 @@ class NewsController extends AbstractController
          return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
      }
 
+
       //20250226  产品列表
 
     //   20250306    招聘
@@ -1061,3 +1038,4 @@ class NewsController extends AbstractController
      }
     //20250306  求职
 }
+

+ 4 - 0
config/api/login.php

@@ -21,3 +21,7 @@ Router::get('/api/loginapi', 'App\Controller\LoginController@loginapi');
 //退出登陆
 Router::get('/api/logoutapi', 'App\Controller\LoginController@logoutapi');
 
+Router::get('/api/goLogin', 'App\Controller\LoginController@goLogin');
+Router::get('/api/logout', 'App\Controller\LoginController@logout');
+Router::get('/api/backlogin', 'App\Controller\LoginController@backlogin');
+

+ 1 - 0
config/api/news.php

@@ -38,6 +38,7 @@ Router::addGroup(
         Router::get('/selectWebsiteCategory', [NewsController::class, 'selectWebsiteArticle']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
+
         //前端-获取资讯列表
         Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);
         //检测导航池名称是否存在