diff --git a/app/controller/frontend/SearchController.php b/app/controller/frontend/SearchController.php index f7f7290..061657c 100644 --- a/app/controller/frontend/SearchController.php +++ b/app/controller/frontend/SearchController.php @@ -45,7 +45,9 @@ class SearchController extends BaseController // 获取可以查询的栏目 $category = new Category(); - $categories = $category -> getAllCustomArrayData(['is_search' => 1],'id desc','id')['data']; + // $categories = $category -> getAllCustomArrayData(['is_search' => 1],'id desc','id')['data']; + // status: 1 正常 2 禁用 + $categories = $category -> getAllCustomArrayData(['status' => 1],'id desc','id')['data']; $cateIds = array_column($categories,'id'); $cateSub = new CategorySubContent(); diff --git a/app/service/ContentService.php b/app/service/ContentService.php index 3a371d4..3eb6029 100644 --- a/app/service/ContentService.php +++ b/app/service/ContentService.php @@ -467,14 +467,20 @@ class ContentService { 'check_status' => 3, 'is_del'=>1, ]; - switch ($param['isTop']) { - case 1: - $where['is_top'] = 1; - break; - case 2: - $where['is_top'] = 2; - break; + + if($param['isTop'] != 2){ + $where['is_top'] = 1; } + + // switch ($param['isTop']) { + // case 1: + // $where['is_top'] = 1; + // break; + // case 2: + // $where['is_top'] = 2; + // break; + // } + if($param['isCommend'] != 2){ $where['is_recommend'] = 1; } diff --git a/public/themes/dist_static/static/css/about.css b/public/themes/dist_static/static/css/about.css index a33682d..1e5c085 100644 --- a/public/themes/dist_static/static/css/about.css +++ b/public/themes/dist_static/static/css/about.css @@ -466,6 +466,10 @@ background: rgba(255, 255, 255, 0.2); overflow: hidden; } +.ab-members__panels { + position: relative; + min-width: 0; +} .ab-members__content { display: flex; flex-direction: column; @@ -505,9 +509,11 @@ justify-content: center; width: 10rem; height: 6.25rem; + padding: 0; border: 0; border-radius: 1rem; background: rgba(255, 255, 255, 0.5); + color: inherit; cursor: pointer; transition: background var(--duration-fast) var(--easing); } @@ -518,7 +524,8 @@ height: auto; object-fit: cover; } -.ab-members__logo.is-active, .ab-members__logo:hover { +.ab-members__logo.active, +.ab-members__logo:hover { background: rgb(255, 255, 255); } diff --git a/public/themes/dist_static/static/css/common.css b/public/themes/dist_static/static/css/common.css index 2c7c66e..053f4c6 100644 --- a/public/themes/dist_static/static/css/common.css +++ b/public/themes/dist_static/static/css/common.css @@ -1086,11 +1086,13 @@ body { display: flex; align-items: center; height: 100%; - gap: 2rem; + /* gap: 2rem; */ margin: 0; padding: 0; list-style: none; }.site-header__nav > ul li { + padding-left: 1rem; + padding-right: 1rem; height: 100%; }.site-header__nav > ul > li > a { display: inline-flex; diff --git a/public/themes/dist_static/static/js/about.js b/public/themes/dist_static/static/js/about.js index 7a01947..70c70a6 100644 --- a/public/themes/dist_static/static/js/about.js +++ b/public/themes/dist_static/static/js/about.js @@ -59,51 +59,6 @@ function initHistorySwiper() { on: { slideChange: updateFarClass } })); } -function initMemberLogos() { - const root = document.querySelector(".ab-members"); - if (!root) return; - const nameEl = root.querySelector("#ab-members-name"); - const descEl = root.querySelector("#ab-members-desc"); - const contentEl = root.querySelector(".ab-members__content > div"); - const logos = root.querySelectorAll(".ab-members__logo"); - if (!nameEl || !descEl || !logos.length) return; - const applyMember = (btn) => { - const name = btn.getAttribute("data-name") || ""; - const desc = btn.getAttribute("data-desc") || ""; - if (!name && !desc) return; - const update = () => { - nameEl.textContent = name; - descEl.textContent = desc; - }; - if (!contentEl || !contentEl.animate) { - update(); - return; - } - contentEl.animate([{ opacity: 1 }, { opacity: 0 }], { - duration: 160, - fill: "forwards", - easing: "ease" - }).finished.then(() => { - update(); - contentEl.animate([{ opacity: 0 }, { opacity: 1 }], { - duration: 220, - fill: "forwards", - easing: "ease" - }); - }); - }; - logos.forEach((btn) => { - btn.addEventListener("click", () => { - if (btn.classList.contains("is-active")) return; - logos.forEach((item) => { - const active = item === btn; - item.classList.toggle("is-active", active); - item.setAttribute("aria-selected", active ? "true" : "false"); - }); - applyMember(btn); - }); - }); -} function initHonorsToggle() { const list = document.querySelector(".ab-honors__list"); const btn = document.querySelector(".ab-honors__more"); @@ -122,7 +77,6 @@ function initHonorsToggle() { $(function() { setActiveNav(); initHistorySwiper(); - initMemberLogos(); counterUpInit(); initHonorsToggle(); }); diff --git a/public/themes/website/1/zh/demo/about.html b/public/themes/website/1/zh/demo/about.html index ffae66f..90b821d 100644 --- a/public/themes/website/1/zh/demo/about.html +++ b/public/themes/website/1/zh/demo/about.html @@ -220,36 +220,87 @@

集团成员

-
-
-

上海睿能高齐自动化有限公司

-

- 上海睿能高齐自动化有限公司成立于2018年，是睿能科技旗下全资子公司。睿能自动化主要从事工业物联网、HMI、PLC、伺服系统、变频器等工业自动化产品的研发、生产、销售及系统集成......

+
+
+
+
+

上海睿能高齐自动化有限公司

+

+ 上海睿能高齐自动化有限公司成立于2018年，是睿能科技旗下全资子公司。睿能自动化主要从事工业物联网、HMI、PLC、伺服系统、变频器等工业自动化产品的研发、生产、销售及系统集成...... +

+
+ 探索更多 +
+
+
+
+
+

奇电电气（GIROD）

+

+ 奇电电气专注工业电气与自动化配套产品，具备研发、制造与系统集成能力。并入睿能科技后，持续完善工业自动化产品矩阵，强化全产业链协同与交付能力。 +

+
+ 探索更多 +
+
+
+
+
+

深圳亿维自动化有限公司

+

+ 深圳亿维自动化（UniMAT）深耕可编程控制器与工业自动化控制产品，面向离散制造与过程控制等场景提供可靠的控制解决方案，助力客户实现设备智能化升级。 +

+
+ 探索更多 +
+
+
+
+
+

贝诺国际（Burnon International）

+

+ 贝诺国际专注相关领域的技术与市场拓展，依托睿能科技平台资源，持续推进产品与解决方案的国际化布局，服务更广泛的行业客户与合作伙伴。 +

+
+ 探索更多 +
+
+
+
+
+

琪利软件（Qili Software）

+

+ 琪利软件专注工业软件与数字化相关产品研发，围绕自动化控制与智能制造场景，为客户提供软件工具、系统集成与技术服务，赋能生产效率提升。 +

+
+ 探索更多 +
- 探索更多
-
- - - - -
diff --git a/public/themes/website/1/zh/demo/search.html b/public/themes/website/1/zh/demo/search.html index 5655d95..03f10ff 100644 --- a/public/themes/website/1/zh/demo/search.html +++ b/public/themes/website/1/zh/demo/search.html @@ -1,3 +1,13 @@ + + +{php} +dd('此页面废弃'); +{/php} + + + + + diff --git a/public/themes/website/1/zh/demo/single_search.html b/public/themes/website/1/zh/demo/single_search.html new file mode 100644 index 0000000..d184559 --- /dev/null +++ b/public/themes/website/1/zh/demo/single_search.html @@ -0,0 +1,713 @@ + + + + + + + 搜索 - 睿能科技 + + + + + + + + + + + + + + + + + + + + + + {include file="components/header"} + +
+
+
+

搜索

+ +
+ 热门搜索： +
+ {hcTaglib:category id="679" item="vo" field="id,title,description"} + {php} + $description = $vo['description'] ?? ''; + $descriptionArr = []; + if(!empty($description)){ + $descriptionArr = explode(',',$description); + } + {/php} + {/hcTaglib:category} + + {volist name="descriptionArr" id="one"} + + {/volist} + +
+
+
+ +
+ {volist name="list" id="vo"} + {php} + $sr_date = ''; + $sr_time = $vo['publish_time'] ?? ($vo['create_time'] ?? ''); + if (!empty($sr_time)) { + $sr_date = is_numeric($sr_time) ? date('Y-m-d', (int)$sr_time) : $sr_time; + } + $sr_cid = $vo['category_id'] ?? ($vo['category'][0]['id'] ?? 0); + $sr_thumb = is_array($vo['thumbnail'] ?? null) ? ($vo['thumbnail']['url'] ?? '') : ''; + $sr_url = hcUrl('detail/index', ['id' => $vo['id'], 'cid' => $sr_cid]); + {/php} +
+ + + +
+
+
+ {if !empty($vo['category'][0]['title'])}{$vo.category.0.title}{else /}内容{/if} + + +
+

+ {$vo.title} +

+ {notempty name="vo.description"} +

{$vo.description}

+ {/notempty} +
+ + 探索更多 + + + + + +
+
+ {/volist} +
+ + {php} + $list_empty = isHcListEmpty($list ?? null); + if ($list_empty) { + $empty_text = '未找到相关结果，请尝试其他关键词'; + } + {/php} + {if $list_empty} + {include file="components/empty"} + {else /} + {$list_page|raw} + {/if} +
+
+ + + + + + + + + + + + + + + + +