From 438e1f8983e88681671901b230974d393757cf4c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 31 Aug 2023 14:41:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/IndexLogic.php | 68 +++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php index b80b81fb8..08eabbe82 100755 --- a/app/api/logic/IndexLogic.php +++ b/app/api/logic/IndexLogic.php @@ -16,6 +16,7 @@ namespace app\api\logic; use app\common\logic\BaseLogic; +use app\common\model\AppUpdate; use app\common\model\article\Article; use app\common\model\decorate\DecoratePage; use app\common\model\decorate\DecorateTabbar; @@ -24,7 +25,6 @@ use app\common\model\user\UserRole; use app\common\service\ConfigService; use app\common\service\FileService; - /** * index * Class IndexLogic @@ -106,29 +106,29 @@ class IndexLogic extends BaseLogic * @author 段誉 * @date 2022/9/21 19:38 */ - public static function getConfigData($group_id=1) + public static function getConfigData($group_id = 1) { - if($group_id==null){ - $group_id=1; + if ($group_id == null) { + $group_id = 1; } - $group_find=UserRole::where('id',$group_id)->find(); - $menu=[]; - if($group_find){ - $select=UserMenu::where('id','in',$group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->order('sort','desc')->limit(100)->select()->toArray(); - $arr=[]; - foreach($select as $k=>$v){ - if($v['pid']==0){ - $arr[]=$v; + $group_find = UserRole::where('id', $group_id)->find(); + $menu = []; + if ($group_find) { + $select = UserMenu::where('id', 'in', $group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->order('sort', 'desc')->limit(100)->select()->toArray(); + $arr = []; + foreach ($select as $k => $v) { + if ($v['pid'] == 0) { + $arr[] = $v; } } - foreach($arr as $k=>$v){ - foreach($select as $kk=>$vv){ - if($v['id']==$vv['pid']){ - $arr[$k]['children'][]=$vv; + foreach ($arr as $k => $v) { + foreach ($select as $kk => $vv) { + if ($v['id'] == $vv['pid']) { + $arr[$k]['children'][] = $vv; } } } - $menu=$arr; + $menu = $arr; } // 底部导航 $tabbar = DecorateTabbar::getTabbarLists(); @@ -154,7 +154,16 @@ class IndexLogic extends BaseLogic 'shop_name' => ConfigService::get('website', 'shop_name'), 'shop_logo' => FileService::getFileUrl(ConfigService::get('website', 'shop_logo')), ]; - $versionInfo=[]; + $versionInfo = []; + $version='1.0.0'; + if(self::isAndroid()){ + $versionInfo=AppUpdate::where('type',2)->order('id','desc')->find(); + }elseif(self::isIOS()){ + $versionInfo=AppUpdate::where('type',1)->order('id','desc')->find(); + } + if($versionInfo){ + $version=$versionInfo['version']; + } return [ 'domain' => FileService::getFileUrl(), 'style' => $style, @@ -162,19 +171,20 @@ class IndexLogic extends BaseLogic 'menu' => $menu, 'login' => $loginConfig, 'website' => $website, - 'version'=> config('project.version'), - 'version_info'=>$versionInfo, + 'version' => $version, + 'version_info' => $versionInfo, ]; } - function isAndroid() { - $userAgent = $_SERVER['HTTP_USER_AGENT']; - return strpos($userAgent, 'Android') !== false; -} + public static function isAndroid() + { + $userAgent = $_SERVER['HTTP_USER_AGENT']; + return strpos($userAgent, 'Android') !== false; + } -function isIOS() { - $userAgent = $_SERVER['HTTP_USER_AGENT']; - return strpos($userAgent, 'iPhone') !== false || strpos($userAgent, 'iPad') !== false; + public static function isIOS() + { + $userAgent = $_SERVER['HTTP_USER_AGENT']; + return strpos($userAgent, 'iPhone') !== false; + } } - -} \ No newline at end of file