wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code format

This commit is contained in:
Edward Yang 2022-08-15 12:55:13 +08:00
parent acec51efdd
commit 1b8e643880
4 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Middleware/ShareViewData.php
View File

@ -21,8 +21,8 @@ namespace App\Http\Middleware;
use Closure; use Closure;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Beike\Repositories\FooterRepo;
use Beike\Repositories\MenuRepo; use Beike\Repositories\MenuRepo;
use Beike\Repositories\FooterRepo;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
use Beike\Repositories\CategoryRepo; use Beike\Repositories\CategoryRepo;
use Beike\Repositories\LanguageRepo; use Beike\Repositories\LanguageRepo;
@ -35,6 +35,9 @@ class ShareViewData
return $next($request); return $next($request);
} }
/**
* @throws \Exception
*/
protected function loadShopShareViewData() protected function loadShopShareViewData()
{ {
if (is_admin()) { if (is_admin()) {

19
beike/Helpers.php
View File

@ -181,6 +181,25 @@ function type_label($type, $value, array $texts = []): string
} }
/**
* 处理配置链接
*
* @param $link
* @return array
*/
function handle_link($link): array
{
$type = $link['type'] ?? '';
$value = $link['value'] ?? '';
$texts = $link['text'] ?? [];
$link['link'] = type_route($type, $value);
$link['text'] = type_label($type, $value, $texts);
return $link;
}
/** /**
* 是否访问的后端 * 是否访问的后端
* @return bool * @return bool

15
beike/Repositories/FooterRepo.php
View File

@ -31,20 +31,7 @@ class FooterRepo
foreach ($contentLinkKeys as $contentLinkKey) { foreach ($contentLinkKeys as $contentLinkKey) {
$links = $content[$contentLinkKey]['links']; $links = $content[$contentLinkKey]['links'];
$links = collect($links)->map(function ($link) { $links = collect($links)->map(function ($link) {
if ($link['type'] == 'custom') { return handle_link($link);
$link['link'] = $link['value'];
} elseif ($link['type'] == 'static') {
$link['link'] = shop_route($link['value']);
$link['text'] = trans('shop/' . $link['value']);
} elseif ($link['type'] == 'page') {
$pageId = $link['value'];
$page = Page::query()->find($pageId);
if ($page) {
$link['link'] = type_route('page', $link['value']);
$link['text'] = $page->description->title;
}
}
return $link;
})->toArray(); })->toArray();
$footerSetting['content'][$contentLinkKey]['links'] = $links; $footerSetting['content'][$contentLinkKey]['links'] = $links;
} }

22
beike/Repositories/MenuRepo.php
View File

@ -38,7 +38,7 @@ class MenuRepo
$menus = $MenuSetting['menus']; $menus = $MenuSetting['menus'];
foreach ($menus as $index => $menu) { foreach ($menus as $index => $menu) {
$menus[$index]['link'] = self::handleLink($menu['link']); $menus[$index]['link'] = handle_link($menu['link']);
$menus[$index]['name'] = $menu['name'][$locale] ?? ''; $menus[$index]['name'] = $menu['name'][$locale] ?? '';
$menus[$index]['badge']['name'] = $menu['badge']['name'][$locale] ?? ''; $menus[$index]['badge']['name'] = $menu['badge']['name'][$locale] ?? '';
@ -58,7 +58,7 @@ class MenuRepo
} else { } else {
if ($childrenGroup['children']) { if ($childrenGroup['children']) {
foreach ($childrenGroup['children'] as $children_index => $children) { foreach ($childrenGroup['children'] as $children_index => $children) {
$menus[$index]['childrenGroup'][$group_index]['children'][$children_index]['link'] = self::handleLink($children['link']); $menus[$index]['childrenGroup'][$group_index]['children'][$children_index]['link'] = handle_link($children['link']);
} }
} }
} }
@ -68,22 +68,4 @@ class MenuRepo
return $menus; return $menus;
} }
/**
* 处理链接
*
* @param $link
* @return array
*/
private static function handleLink($link): array
{
$type = $link['type'] ?? '';
$value = $link['value'] ?? '';
$texts = $link['text'] ?? [];
$link['link'] = type_route($type, $value);
$link['text'] = type_label($type, $value, $texts);
return $link;
}
} }