From b933817640828aeca911d3835daf4eb20af01440 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 26 Sep 2023 10:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 23 +++++++----------------
 route/api.php               |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 347f2485..5e8ba595 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -1361,24 +1361,15 @@ class Auth extends BaseController
     }
 
     //获取APP菜单
-    public function appMenu()
+    public function miniAppVersion()
     {
-        $menuList = Db::name('app_menu')->where('is_show', 1)->where('is_disable', 0)->field(['id', 'pid', 'name', 'icon', 'sort', 'paths'])->order('sort', 'asc')->select()->toArray();
-        
-        $menuData = [];
-        foreach($menuList as $n) {
-            if ($n['pid'] == 0) {
-                $menuData[] = $n;
-            }
+        $version = $this->request->param('version', '');
+        $queryBuilder = Db::name('miniapp_update');
+        if ($version) {
+            $queryBuilder = $queryBuilder->where('version', '>', $version);
         }
-        foreach($menuData as $k=>$v) {
-            foreach($menuList as $ml) {
-                if ($v['id'] == $ml['pid']) {
-                    $menuData[$k]['children'][] = $ml;
-                }
-            }
-        }
-        return app('json')->success($menuData);
+        $appInfo = $queryBuilder->order('version', 'desc')->fetchSql(false)->find();
+        return app('json')->success(compact('appInfo'));
     }
 
     //根据street_id获取商户信息
diff --git a/route/api.php b/route/api.php
index 6eed857c..869f974a 100644
--- a/route/api.php
+++ b/route/api.php
@@ -33,7 +33,7 @@ Route::group('api/', function () {
     Route::get('region/:street_id/merchant', 'api.Auth/regionMerchant');
     Route::get('region/goods', 'api.Auth/goodsStatistics');
     Route::get('global/config', 'api.Auth/globalConfig');
-    Route::get('app/menu', 'api.Auth/appMenu');
+    Route::get('miniapp/version', 'api.Auth/miniAppVersion');
     Route::resource('upload', 'api.Upload');
     Route::post('articleCatch', 'api.Upload/article');
     //强制登录