diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php index d4f682561..ebe88cddc 100755 --- a/app/api/logic/IndexLogic.php +++ b/app/api/logic/IndexLogic.php @@ -106,7 +106,7 @@ class IndexLogic extends BaseLogic * @author 段誉 * @date 2022/9/21 19:38 */ - public static function getConfigData($group_id = 1,$parmas) + public static function getConfigData($group_id = 1,$parmas=[]) { if ($group_id == null) { $group_id = 1; @@ -131,34 +131,34 @@ class IndexLogic extends BaseLogic $menu = $arr; } // 底部导航 - $tabbar = DecorateTabbar::getTabbarLists(); + // $tabbar = DecorateTabbar::getTabbarLists(); // 导航颜色 - $style = ConfigService::get('tabbar', 'style', config('project.decorate.tabbar_style')); + // $style = ConfigService::get('tabbar', 'style', config('project.decorate.tabbar_style')); // 登录配置 - $loginConfig = [ - // 登录方式 - 'login_way' => ConfigService::get('login', 'login_way', config('project.login.login_way')), - // 注册强制绑定手机 - 'coerce_mobile' => ConfigService::get('login', 'coerce_mobile', config('project.login.coerce_mobile')), - // 政策协议 - 'login_agreement' => ConfigService::get('login', 'login_agreement', config('project.login.login_agreement')), - // 第三方登录 开关 - // 'third_auth' => ConfigService::get('login', 'third_auth', config('project.login.third_auth')), - // 微信授权登录 - 'wechat_auth' => ConfigService::get('login', 'wechat_auth', config('project.login.wechat_auth')), - // qq授权登录 - // 'qq_auth' => ConfigService::get('login', 'qq_auth', config('project.login.qq_auth')), - ]; + // $loginConfig = [ + // // 登录方式 + // 'login_way' => ConfigService::get('login', 'login_way', config('project.login.login_way')), + // // 注册强制绑定手机 + // 'coerce_mobile' => ConfigService::get('login', 'coerce_mobile', config('project.login.coerce_mobile')), + // // 政策协议 + // 'login_agreement' => ConfigService::get('login', 'login_agreement', config('project.login.login_agreement')), + // // 第三方登录 开关 + // // 'third_auth' => ConfigService::get('login', 'third_auth', config('project.login.third_auth')), + // // 微信授权登录 + // 'wechat_auth' => ConfigService::get('login', 'wechat_auth', config('project.login.wechat_auth')), + // // qq授权登录 + // // 'qq_auth' => ConfigService::get('login', 'qq_auth', config('project.login.qq_auth')), + // ]; // 网址信息 - $website = [ - 'shop_name' => ConfigService::get('website', 'shop_name'), - 'shop_logo' => FileService::getFileUrl(ConfigService::get('website', 'shop_logo')), - ]; + // $website = [ + // 'shop_name' => ConfigService::get('website', 'shop_name'), + // 'shop_logo' => FileService::getFileUrl(ConfigService::get('website', 'shop_logo')), + // ]; $versionInfo = []; $version='1.0.0'; - if(isset($parmas['os'])&&$parmas['os']=='android'||self::isAndroid()){ + if((isset($parmas['os'])&&$parmas['os']=='android')||self::isAndroid()){ $versionInfo=AppUpdate::where('type',2)->order('id','desc')->find(); - }elseif(isset($parmas['os'])&&$parmas['os']=='ios'||self::isIOS()){ + }elseif((isset($parmas['os'])&&$parmas['os']=='ios')||self::isIOS()){ $versionInfo=AppUpdate::where('type',1)->order('id','desc')->find(); } if($versionInfo){ @@ -166,11 +166,11 @@ class IndexLogic extends BaseLogic } return [ 'domain' => FileService::getFileUrl(), - 'style' => $style, - 'tabbar' => $tabbar, + // 'style' => $style, + // 'tabbar' => $tabbar, 'menu' => $menu, - 'login' => $loginConfig, - 'website' => $website, + // 'login' => $loginConfig, + // 'website' => $website, 'version' => $version, 'version_info' => $versionInfo, ];