This commit is contained in:
mkm 2023-08-31 14:41:35 +08:00
parent 7f305fb6d2
commit 438e1f8983

View File

@ -16,6 +16,7 @@ namespace app\api\logic;
use app\common\logic\BaseLogic; use app\common\logic\BaseLogic;
use app\common\model\AppUpdate;
use app\common\model\article\Article; use app\common\model\article\Article;
use app\common\model\decorate\DecoratePage; use app\common\model\decorate\DecoratePage;
use app\common\model\decorate\DecorateTabbar; 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\ConfigService;
use app\common\service\FileService; use app\common\service\FileService;
/** /**
* index * index
* Class IndexLogic * Class IndexLogic
@ -106,29 +106,29 @@ class IndexLogic extends BaseLogic
* @author 段誉 * @author 段誉
* @date 2022/9/21 19:38 * @date 2022/9/21 19:38
*/ */
public static function getConfigData($group_id=1) public static function getConfigData($group_id = 1)
{ {
if($group_id==null){ if ($group_id == null) {
$group_id=1; $group_id = 1;
} }
$group_find=UserRole::where('id',$group_id)->find(); $group_find = UserRole::where('id', $group_id)->find();
$menu=[]; $menu = [];
if($group_find){ 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(); $select = UserMenu::where('id', 'in', $group_find['menu_arr'])->field('id,pid,name,icon,sort,paths')->order('sort', 'desc')->limit(100)->select()->toArray();
$arr=[]; $arr = [];
foreach($select as $k=>$v){ foreach ($select as $k => $v) {
if($v['pid']==0){ if ($v['pid'] == 0) {
$arr[]=$v; $arr[] = $v;
} }
} }
foreach($arr as $k=>$v){ foreach ($arr as $k => $v) {
foreach($select as $kk=>$vv){ foreach ($select as $kk => $vv) {
if($v['id']==$vv['pid']){ if ($v['id'] == $vv['pid']) {
$arr[$k]['children'][]=$vv; $arr[$k]['children'][] = $vv;
} }
} }
} }
$menu=$arr; $menu = $arr;
} }
// 底部导航 // 底部导航
$tabbar = DecorateTabbar::getTabbarLists(); $tabbar = DecorateTabbar::getTabbarLists();
@ -154,7 +154,16 @@ class IndexLogic extends BaseLogic
'shop_name' => ConfigService::get('website', 'shop_name'), 'shop_name' => ConfigService::get('website', 'shop_name'),
'shop_logo' => FileService::getFileUrl(ConfigService::get('website', 'shop_logo')), '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 [ return [
'domain' => FileService::getFileUrl(), 'domain' => FileService::getFileUrl(),
'style' => $style, 'style' => $style,
@ -162,19 +171,20 @@ class IndexLogic extends BaseLogic
'menu' => $menu, 'menu' => $menu,
'login' => $loginConfig, 'login' => $loginConfig,
'website' => $website, 'website' => $website,
'version'=> config('project.version'), 'version' => $version,
'version_info'=>$versionInfo, 'version_info' => $versionInfo,
]; ];
} }
function isAndroid() { public static function isAndroid()
$userAgent = $_SERVER['HTTP_USER_AGENT']; {
return strpos($userAgent, 'Android') !== false; $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;
}
} }