wjd
/
rui-neng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
zhangf@suq.cn 2 weeks ago
parent
ac9252b6ef 03099920fd
commit
ab4c09d17e
15 changed files with 143 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      app/common.php
  2. 25
      config/ui_ids.php
  3. 14
      public/themes/dist_static/static/css/common.css
  4. BIN
      public/themes/dist_static/static/fonts/MiSans-VF.subset.woff
  5. 2
      public/themes/dist_static/static/js/common.js
  6. 8
      public/themes/website/1/en/demo/components/footer.html
  7. 42
      public/themes/website/1/en/demo/components/header.html
  8. 10
      public/themes/website/1/en/demo/components/mask.html
  9. 3
      public/themes/website/1/en/demo/single_search.html
  10. 5
      public/themes/website/1/en/demo/solution2.html
  11. 8
      public/themes/website/1/zh/demo/components/footer.html
  12. 41
      public/themes/website/1/zh/demo/components/header.html
  13. 10
      public/themes/website/1/zh/demo/components/mask.html
  14. 3
      public/themes/website/1/zh/demo/single_search.html
  15. 4
      public/themes/website/1/zh/demo/solution2.html

18
app/common.php
View File

@ -318,6 +318,24 @@ function getLang()
return $firstPath;
}
/**
* 按当前语言取前台语义 ID（config/ui_ids.php）
* @param string $key 如 nav_header / product
* @param string|null $lang 默认 getLang()；zh-cn 会归一为 zh
*/
function uiId(string $key, ?string $lang = null): int
{
$lang = $lang ?: getLang();
if ($lang === 'zh-cn' || $lang === config('lang.simplified_chinese')) {
$lang = 'zh';
}
$row = config('ui_ids.' . $key);
if (!is_array($row)) {
return (int)$row;
}
return (int)($row[$lang] ?? $row['zh'] ?? 0);
}
function optEventLog($id, $title, $operation)
{

25
config/ui_ids.php
View File

@ -0,0 +1,25 @@
<?php
/**
* 前台模板语义 ID 映射（方案 A）
* 键名供 uiId('xxx') 使用；按语言取对应数字 ID。
* 英文站栏目建好后，只改本文件 en 值即可，不必改模板。
*
* 说明：nav_header / nav_footer 为导航分类 ID，库内 zh/en 条目共用同一 nav_cate_id。
*/
return [
// 导航分类
'nav_header' => ['zh' => 47, 'en' => 49], // 顶部导航_新
'nav_footer' => ['zh' => 48, 'en' => 50], // 睿能科技底部导航
// 栏目（header / footer 业务判断与标签查询）
'home' => ['zh' => 36, 'en' => 706], // 首页
'product' => ['zh' => 333, 'en' => 704], // 产品
'solution' => ['zh' => 345, 'en' => 716], // 解决方案
'support' => ['zh' => 355, 'en' => 724], // 服务支持
'news' => ['zh' => 361, 'en' => 730], // 新闻动态
'exhibition' => ['zh' => 364, 'en' => 733], // 展会与活动
'invest' => ['zh' => 365, 'en' => 734], // 投资者关系
'about' => ['zh' => 371, 'en' => 740], // 关于睿能
'search_hot' => ['zh' => 679, 'en' => 748], // 搜索-热门搜索词
'social_channel' => ['zh' => 707, 'en' => 749], // 社交频道
];

14
public/themes/dist_static/static/css/common.css
View File

@ -292,7 +292,7 @@
font-display: swap;
} */@font-face {
font-family: "MiSans VF";
src: url("../fonts/MiSans-VF-DESbBZLB.ttf") format("truetype");
src: url("../fonts/MiSans-VF.subset.woff") format("woff");
font-weight: 100 900;
font-style: normal;
font-display: swap;
@ -1531,6 +1531,9 @@ body {
grid-template-columns: repeat(7, max-content);
justify-content: start;
gap: 6.25rem;
}
html[lang="en"] .nav-mega__cols--solution {
gap: 2rem;
}.nav-mega__col {
display: flex;
flex-direction: column;
@ -1741,6 +1744,9 @@ body {
.nav-mega__cols--solution {
gap: 32Px 24Px;
}
html[lang="en"] .nav-mega__cols--solution {
gap: 2rem;
}
}@media (max-width: 1439px) {
.site-header__top, .site-header__nav, .site-header__search, .site-header__cta {
display: none;
@ -1871,7 +1877,11 @@ body {
gap: 1.5rem;
}.site-footer__col {
min-width: 0;
}.site-footer__colTitle {
}
html[lang="en"] .site-footer__col {
flex: 1;
}
.site-footer__colTitle {
margin-bottom: 1.25rem;
color: var(--color-text);
font-family: "MiSans VF", sans-serif;

BIN
public/themes/dist_static/static/fonts/MiSans-VF.subset.woff
View File

2
public/themes/dist_static/static/js/common.js
View File

@ -194,7 +194,7 @@ $(function() {
if (!targetLang || targetLang === defaultLang) {
path = rest ? `/${rest}` : "/";
} else {
path = rest ? `/${targetLang}/${rest}` : `/${targetLang}/`;
path = rest ? `/${targetLang}/${rest}` : `/${targetLang}`;
}
return path + location.search + location.hash;
};

8
public/themes/website/1/en/demo/components/footer.html
View File

@ -27,9 +27,13 @@
</div>
</div>
<nav class="site-footer__cols" aria-label="Footer navigation">
{hcTaglib:nav cid="48" max-level="2" item="vo" name="hc_nav" sort="sort asc"}
{php}
$ft_is_product = ((int)($vo['category_id'] ?? 0) === 333);
$ui_nav_footer = uiId('nav_footer');
$ui_product = uiId('product');
{/php}
{hcTaglib:nav cid="$ui_nav_footer" max-level="2" item="vo" name="hc_nav" sort="sort asc"}
{php}
$ft_is_product = ((int)($vo['category_id'] ?? 0) === $ui_product);
{/php}
<div class="site-footer__col">
<div class="site-footer__colTitle">{$vo.title}</div>

42
public/themes/website/1/en/demo/components/header.html
View File

@ -63,7 +63,7 @@
</span>
</span>
{php}
$content_arr = getDescriptionSeparate(707);
$content_arr = getDescriptionSeparate(uiId('social_channel'));
$douyin_url = $content_arr['0'] ?? '';
$sina_url = $content_arr['1'] ?? '';
$zhihu_url = $content_arr['2'] ?? '';
@ -183,30 +183,40 @@
</a>
<nav class="site-header__nav" aria-label="Main navigation">
<ul>
{hcTaglib:nav cid="47" max-level="2" item="vo" name="hc_header_nav" sort="sort asc"}
{php}
$ui_nav_header = uiId('nav_header');
$ui_home = uiId('home');
$ui_product = uiId('product');
$ui_solution = uiId('solution');
$ui_support = uiId('support');
$ui_news = uiId('news');
$ui_invest = uiId('invest');
$ui_about = uiId('about');
$ui_exhibition = uiId('exhibition');
{/php}
{hcTaglib:nav cid="$ui_nav_header" max-level="2" item="vo" name="hc_header_nav" sort="sort asc"}
{php}
$nav_title = $vo['title'] ?? '';
$nav_href = $vo['href'] ?? '';
$nav_id = (int)($vo['id'] ?? 0);
$nav_cid = (int)($vo['category_id'] ?? 0);
$nav_children = $vo['children'] ?? [];
// 产品 333 / 解决方案 345 走特殊下拉
$nav_is_product = ($nav_cid === 333);
$nav_is_solution = ($nav_cid === 345);
$nav_is_home = ($nav_cid === 36);
// 普通下拉面板样式 class
// Product / Solutions mega menus (IDs from config/ui_ids.php)
$nav_is_product = ($nav_cid === $ui_product);
$nav_is_solution = ($nav_cid === $ui_solution);
$nav_is_home = ($nav_cid === $ui_home);
$nav_mega_map = [
355 => 'support', // 服务支持
361 => 'news', // 新闻动态
365 => 'invest', // 投资者关系
371 => 'about', // 关于睿能
$ui_support => 'support',
$ui_news => 'news',
$ui_invest => 'invest',
$ui_about => 'about',
];
$nav_mega_class = $nav_mega_map[$nav_cid] ?? 'support';
{/php}
{if $nav_is_product}
<!-- 产品导航（特殊处理） -->
<li class="site-header__nav-item site-header__nav-item--mega">
{hcTaglib:category id="333" item="vo" field="*"}
{hcTaglib:category id="$ui_product" item="vo" field="*"}
<a
href="{$vo.alias}"
class="site-header__nav-link"
@ -238,7 +248,7 @@
<div class="nav-mega__inner">
<div class="nav-mega__dropdown-content product">
<aside class="nav-mega__cats" aria-label="Product categories">
{hcTaglib:subcategory pid="333" item="vo" sort=""}
{hcTaglib:subcategory pid="$ui_product" item="vo" sort=""}
<button type="button" class="nav-mega__cat {if $key==1}is-active{/if}" data-mega-cat="product_{$key}">
<span>{$vo.title}</span>
@ -264,7 +274,7 @@
</aside>
<div class="nav-mega__main">
<div class="nav-mega__panels">
{hcTaglib:subcategory pid="333" item="vo" sort=""}
{hcTaglib:subcategory pid="$ui_product" item="vo" sort=""}
<div class="nav-mega__panel {if $key==1}is-active{/if}" data-mega-panel="product_{$key}" {if $key!=1}hidden{/if}>
{php}
$sub_cate_id = $vo['id']; // 获取子分类的ID
@ -360,7 +370,7 @@
</div>
<div class="nav-mega__promo-side">
{hcTaglib:category id="364" item="vo" field="*"}
{hcTaglib:category id="$ui_exhibition" item="vo" field="*"}
{php}
$zhanhui_and_activity = $vo;
$thumbnail_url_header = $vo['thumbnail']['url'] ?? '';
@ -437,7 +447,7 @@
<div class="nav-mega__inner">
<div class="nav-mega__dropdown-content solution">
<div class="nav-mega__cols nav-mega__cols--solution">
{hcTaglib:allSubCategory pid="345" item="vo" sort=""}
{hcTaglib:allSubCategory pid="$ui_solution" item="vo" sort=""}
<div class="nav-mega__col">
<div class="nav-mega__group">
<span class="nav-mega__group-title">{$vo.title}</span>

10
public/themes/website/1/en/demo/components/mask.html
View File

@ -42,13 +42,17 @@
<div class="mask-content">
<nav class="mask-nav" aria-label="Mobile navigation">
<ul class="mask-nav__list">
{hcTaglib:nav cid="47" max-level="2" item="vo" name="hc_mask_nav" sort="sort asc"}
{php}
$ui_nav_header = uiId('nav_header');
$ui_solution = uiId('solution');
{/php}
{hcTaglib:nav cid="$ui_nav_header" max-level="2" item="vo" name="hc_mask_nav" sort="sort asc"}
{php}
$mask_title = $vo['title'] ?? '';
$mask_href = $vo['href'] ?? '';
$mask_cid = (int)($vo['category_id'] ?? 0);
$mask_children = $vo['children'] ?? [];
$mask_is_solution = ($mask_cid === 345);
$mask_is_solution = ($mask_cid === $ui_solution);
{/php}
{if $mask_is_solution}
<!-- 解决方案：一级可继续展开二级（栏目树） -->
@ -72,7 +76,7 @@
</button>
<div class="mask-nav__sublist-wrapper">
<ul class="mask-nav__sublist">
{hcTaglib:allSubCategory pid="345" item="sol" sort=""}
{hcTaglib:allSubCategory pid="$ui_solution" item="sol" sort=""}
{php}
$sol_children = $sol['children'] ?? [];
$sol_has_children = !empty($sol_children);

3
public/themes/website/1/en/demo/single_search.html
View File

@ -70,7 +70,8 @@
<div class="sr-hot">
<span class="sr-hot__label">Popular searches:</span>
<div class="sr-hot__list">
{hcTaglib:category id="679" item="vo" field="id,title,description"}
{php}$ui_search_hot = uiId('search_hot');{/php}
{hcTaglib:category id="$ui_search_hot" item="vo" field="id,title,description"}
{php}
$description = $vo['description'] ?? '';
$descriptionArr = [];

5
public/themes/website/1/en/demo/solution2.html
View File

@ -142,7 +142,8 @@ $current_cate_id = $current_cate['id'] ?? 0;
</section>
{/if}
{if !empty($sub_cates[4])}
<section class="sl2-scene section__wrap" id="scene" data-header-dark>
<!-- 应用场景 -->
<!-- <section class="sl2-scene section__wrap" id="scene" data-header-dark>
<div class="sl2-scene__head">
<h2 class="sl2-scene__title">{$sub_cates[4]['title'] ?? ''}</h2>
<div class="s-arrows">
@ -196,7 +197,7 @@ $current_cate_id = $current_cate['id'] ?? 0;
</button>
</div>
</div>
</section>
</section> -->
{/if}
{if !empty($sub_cates[5])}
<!-- 其他解决方案 -->

8
public/themes/website/1/zh/demo/components/footer.html
View File

@ -27,9 +27,13 @@
</div>
</div>
<nav class="site-footer__cols" aria-label="底部导航">
{hcTaglib:nav cid="48" max-level="2" item="vo" name="hc_nav" sort="sort asc"}
{php}
$ft_is_product = ((int)($vo['category_id'] ?? 0) === 333);
$ui_nav_footer = uiId('nav_footer');
$ui_product = uiId('product');
{/php}
{hcTaglib:nav cid="$ui_nav_footer" max-level="2" item="vo" name="hc_nav" sort="sort asc"}
{php}
$ft_is_product = ((int)($vo['category_id'] ?? 0) === $ui_product);
{/php}
<div class="site-footer__col">
<div class="site-footer__colTitle">{$vo.title}</div>

41
public/themes/website/1/zh/demo/components/header.html
View File

@ -63,7 +63,7 @@
</span>
</span>
{php}
$content_arr = getDescriptionSeparate(707);
$content_arr = getDescriptionSeparate(uiId('social_channel'));
$douyin_url = $content_arr['0'] ?? '';
$sina_url = $content_arr['1'] ?? '';
$zhihu_url = $content_arr['2'] ?? '';
@ -183,30 +183,41 @@
</a>
<nav class="site-header__nav" aria-label="主导航">
<ul>
{hcTaglib:nav cid="47" max-level="2" item="vo" name="hc_header_nav" sort="sort asc"}
{php}
$ui_nav_header = uiId('nav_header');
$ui_home = uiId('home');
$ui_product = uiId('product');
$ui_solution = uiId('solution');
$ui_support = uiId('support');
$ui_news = uiId('news');
$ui_invest = uiId('invest');
$ui_about = uiId('about');
$ui_exhibition = uiId('exhibition');
{/php}
{hcTaglib:nav cid="$ui_nav_header" max-level="2" item="vo" name="hc_header_nav" sort="sort asc"}
{php}
$nav_title = $vo['title'] ?? '';
$nav_href = $vo['href'] ?? '';
$nav_id = (int)($vo['id'] ?? 0);
$nav_cid = (int)($vo['category_id'] ?? 0);
$nav_children = $vo['children'] ?? [];
// 产品 333 / 解决方案 345 走特殊下拉
$nav_is_product = ($nav_cid === 333);
$nav_is_solution = ($nav_cid === 345);
$nav_is_home = ($nav_cid === 36);
// 产品 / 解决方案 走特殊下拉（ID 见 config/ui_ids.php）
$nav_is_product = ($nav_cid === $ui_product);
$nav_is_solution = ($nav_cid === $ui_solution);
$nav_is_home = ($nav_cid === $ui_home);
// 普通下拉面板样式 class
$nav_mega_map = [
355 => 'support', // 服务支持
361 => 'news', // 新闻动态
365 => 'invest', // 投资者关系
371 => 'about', // 关于睿能
$ui_support => 'support', // 服务支持
$ui_news => 'news', // 新闻动态
$ui_invest => 'invest', // 投资者关系
$ui_about => 'about', // 关于睿能
];
$nav_mega_class = $nav_mega_map[$nav_cid] ?? 'support';
{/php}
{if $nav_is_product}
<!-- 产品导航（特殊处理） -->
<li class="site-header__nav-item site-header__nav-item--mega">
{hcTaglib:category id="333" item="vo" field="*"}
{hcTaglib:category id="$ui_product" item="vo" field="*"}
<a
href="{$vo.alias}"
class="site-header__nav-link"
@ -238,7 +249,7 @@
<div class="nav-mega__inner">
<div class="nav-mega__dropdown-content product">
<aside class="nav-mega__cats" aria-label="产品分类">
{hcTaglib:subcategory pid="333" item="vo" sort=""}
{hcTaglib:subcategory pid="$ui_product" item="vo" sort=""}
<button type="button" class="nav-mega__cat {if $key==1}is-active{/if}" data-mega-cat="product_{$key}">
<span>{$vo.title}</span>
@ -264,7 +275,7 @@
</aside>
<div class="nav-mega__main">
<div class="nav-mega__panels">
{hcTaglib:subcategory pid="333" item="vo" sort=""}
{hcTaglib:subcategory pid="$ui_product" item="vo" sort=""}
<div class="nav-mega__panel {if $key==1}is-active{/if}" data-mega-panel="product_{$key}" {if $key!=1}hidden{/if}>
{php}
$sub_cate_id = $vo['id']; // 获取子分类的ID
@ -360,7 +371,7 @@
</div>
<div class="nav-mega__promo-side">
{hcTaglib:category id="364" item="vo" field="*"}
{hcTaglib:category id="$ui_exhibition" item="vo" field="*"}
{php}
$zhanhui_and_activity = $vo;
$thumbnail_url_header = $vo['thumbnail']['url'] ?? '';
@ -437,7 +448,7 @@
<div class="nav-mega__inner">
<div class="nav-mega__dropdown-content solution">
<div class="nav-mega__cols nav-mega__cols--solution">
{hcTaglib:allSubCategory pid="345" item="vo" sort=""}
{hcTaglib:allSubCategory pid="$ui_solution" item="vo" sort=""}
<div class="nav-mega__col">
<div class="nav-mega__group">
<span class="nav-mega__group-title">{$vo.title}</span>

10
public/themes/website/1/zh/demo/components/mask.html
View File

@ -42,13 +42,17 @@
<div class="mask-content">
<nav class="mask-nav" aria-label="移动导航">
<ul class="mask-nav__list">
{hcTaglib:nav cid="47" max-level="2" item="vo" name="hc_mask_nav" sort="sort asc"}
{php}
$ui_nav_header = uiId('nav_header');
$ui_solution = uiId('solution');
{/php}
{hcTaglib:nav cid="$ui_nav_header" max-level="2" item="vo" name="hc_mask_nav" sort="sort asc"}
{php}
$mask_title = $vo['title'] ?? '';
$mask_href = $vo['href'] ?? '';
$mask_cid = (int)($vo['category_id'] ?? 0);
$mask_children = $vo['children'] ?? [];
$mask_is_solution = ($mask_cid === 345);
$mask_is_solution = ($mask_cid === $ui_solution);
{/php}
{if $mask_is_solution}
<!-- 解决方案：一级可继续展开二级（栏目树） -->
@ -72,7 +76,7 @@
</button>
<div class="mask-nav__sublist-wrapper">
<ul class="mask-nav__sublist">
{hcTaglib:allSubCategory pid="345" item="sol" sort=""}
{hcTaglib:allSubCategory pid="$ui_solution" item="sol" sort=""}
{php}
$sol_children = $sol['children'] ?? [];
$sol_has_children = !empty($sol_children);

3
public/themes/website/1/zh/demo/single_search.html
View File

@ -70,7 +70,8 @@
<div class="sr-hot">
<span class="sr-hot__label">热门搜索：</span>
<div class="sr-hot__list">
{hcTaglib:category id="679" item="vo" field="id,title,description"}
{php}$ui_search_hot = uiId('search_hot');{/php}
{hcTaglib:category id="$ui_search_hot" item="vo" field="id,title,description"}
{php}
$description = $vo['description'] ?? '';
$descriptionArr = [];

4
public/themes/website/1/zh/demo/solution2.html
View File

@ -142,7 +142,7 @@ $current_cate_id = $current_cate['id'] ?? 0;
</section>
{/if}
{if !empty($sub_cates[4])}
<section class="sl2-scene section__wrap" id="scene" data-header-dark>
<!-- <section class="sl2-scene section__wrap" id="scene" data-header-dark>
<div class="sl2-scene__head">
<h2 class="sl2-scene__title">{$sub_cates[4]['title'] ?? ''}</h2>
<div class="s-arrows">
@ -196,7 +196,7 @@ $current_cate_id = $current_cate['id'] ?? 0;
</button>
</div>
</div>
</section>
</section> -->
{/if}
{if !empty($sub_cates[5])}
<!-- 其他解决方案 -->

Write Preview
Loading…
Cancel
Save