diff --git a/app/model/Category.php b/app/model/Category.php index 2213969..224f443 100755 --- a/app/model/Category.php +++ b/app/model/Category.php @@ -155,7 +155,7 @@ class Category extends Base ->leftJoin('model m', 'c.model_id=m.id') ->field('c.*, m.manager, m.name as modelName') ->when($limit, function ($query) use ($cates) { -// $query->whereIn('c.id', $cates); + // $query->whereIn('c.id', $cates); }) ->order('sort', 'asc') ->select() @@ -408,15 +408,15 @@ class Category extends Base $allCategories = Category::getList(false); foreach ($menus as &$menu) { $menu['children_ids'] = []; - // $menusGroup = []; +// $menusGroup = []; if (isset($menu['children'])) { $menu['children_ids'] = array_column($menu['children'], 'id'); - // foreach ($menu['children'] as $child) { - // $menusGroup[$child['group_name']][] = $child; - // } +// foreach ($menu['children'] as $child) { +// $menusGroup[$child['group_name']][] = $child; +// } } - // $menu['menus_group'] = $menusGroup; +// $menu['menus_group'] = $menusGroup; $menu['all_subordinate_ids'] = self::getAllSubordinateIds($allCategories, $menu['id'], true); $menu['isActive'] = 0; if ($categoryId == $menu['id'] || in_array($categoryId, $menu['all_subordinate_ids'])) { @@ -428,7 +428,8 @@ class Category extends Base // 'categoryId' => $categoryId, 'menus' => $menus, ]; -// var_dump($menus);exit; +// dd($menus); +// exit; return $data; } diff --git a/view/index/index.html b/view/index/index.html index 57eaf2f..92cce4c 100755 --- a/view/index/index.html +++ b/view/index/index.html @@ -1,4 +1,7 @@ {layout name="layout" /} +{php}$service5List = json_decode($blocks['home_service_5']['value'], true);{/php} +{php}$firstService = array_shift($service5List);{/php} + diff --git a/view/manager/cases/add.html b/view/manager/cases/add.html index a5203f0..2c1bb85 100755 --- a/view/manager/cases/add.html +++ b/view/manager/cases/add.html @@ -39,9 +39,9 @@
- +
- +
diff --git a/view/manager/cases/edit.html b/view/manager/cases/edit.html index 631d134..c5ff211 100755 --- a/view/manager/cases/edit.html +++ b/view/manager/cases/edit.html @@ -38,9 +38,9 @@
- +
- +
diff --git a/view/page/activity.html b/view/page/activity.html index d9342dc..a927090 100755 --- a/view/page/activity.html +++ b/view/page/activity.html @@ -84,7 +84,7 @@ $previewList = Article::getList(Category::CATEGORY_BRAND_ACTIVITY, 10, null, ['i let html = ''; $.each(res.data, function (index, item) { html += ` - +
${item.title}

${item.title}

diff --git a/view/public/about_second.html b/view/public/about_second.html index 97ab81f..f810e04 100644 --- a/view/public/about_second.html +++ b/view/public/about_second.html @@ -25,7 +25,7 @@