Merge remote-tracking branch 'origin/master'

app/service/ContentService.php

@@ -467,8 +467,13 @@ class ContentService {
             'check_status' => 3,
             'is_del'=>1,
         ];
-        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;

public/themes/dist_static/static/css/solution.css

@@ -203,6 +203,9 @@
   font-weight: 400;
   line-height: var(--font-64);
 }
+.sl-clients__viewport {
+  width: 100%;
+}
 .sl-clients__grid {
   display: grid;
   grid-template-columns: repeat(5, minmax(0, 1fr));
@@ -227,6 +230,34 @@
   object-fit: contain;
 }
 
+/* 超过 5 个：CSS 横向无缝循环（内容在模板里复制一份） */
+.sl-clients__viewport.is-marquee {
+  overflow: hidden;
+  container-type: inline-size;
+}
+.sl-clients__viewport.is-marquee .sl-clients__grid {
+  display: flex;
+  width: max-content;
+  gap: 1.5rem;
+  animation: sl-clients-marquee 30s linear infinite;
+}
+.sl-clients__viewport.is-marquee .sl-clients__item {
+  flex: 0 0 calc((100cqi - 6rem) / 5);
+  width: calc((100cqi - 6rem) / 5);
+}
+.sl-clients__viewport.is-marquee:hover .sl-clients__grid {
+  animation-play-state: paused;
+}
+@keyframes sl-clients-marquee {
+  from { transform: translateX(0); }
+  to { transform: translateX(-50%); }
+}
+@media (prefers-reduced-motion: reduce) {
+  .sl-clients__viewport.is-marquee .sl-clients__grid {
+    animation: none;
+  }
+}
+
 .sl-cases {
   position: relative;
   padding-top: 7.5rem;
@@ -418,6 +449,10 @@
   .sl-clients__grid {
     grid-template-columns: repeat(4, minmax(0, 1fr));
   }
+  .sl-clients__viewport.is-marquee .sl-clients__item {
+    flex-basis: calc((100cqi - 4.5rem) / 4);
+    width: calc((100cqi - 4.5rem) / 4);
+  }
   .sl-cases__body {
     grid-template-columns: 1fr;
     gap: 40Px;
@@ -442,6 +477,10 @@
   .sl-clients__grid {
     grid-template-columns: repeat(3, minmax(0, 1fr));
   }
+  .sl-clients__viewport.is-marquee .sl-clients__item {
+    flex-basis: calc((100cqi - 3rem) / 3);
+    width: calc((100cqi - 3rem) / 3);
+  }
   .sl-cases__nav {
     margin-top: 24Px;
   }
@@ -471,6 +510,13 @@
     grid-template-columns: repeat(2, minmax(0, 1fr));
     gap: 12Px;
   }
+  .sl-clients__viewport.is-marquee .sl-clients__grid {
+    gap: 12Px;
+  }
+  .sl-clients__viewport.is-marquee .sl-clients__item {
+    flex-basis: calc((100cqi - 12Px) / 2);
+    width: calc((100cqi - 12Px) / 2);
+  }
   .sl-clients__item {
     height: 100Px;
   }

public/themes/dist_static/static/js/solution2.js

@@ -75,6 +75,13 @@ function initMoreSwiper() {
 	const root = document.querySelector(".sl2-more");
 	const el = root?.querySelector(".sl2-more__swiper");
 	if (!root || !el || !window.Swiper) return;
+	const slideCount = el.querySelectorAll(".swiper-wrapper > .swiper-slide").length;
+	// 一屏展示 3 条，不超过 3 条时隐藏切换按钮
+	if (slideCount <= 3) {
+		root.querySelectorAll(".sl2-more__head .s-arrows, .sl2-more__arrows-mobile").forEach((node) => {
+			node.style.display = "none";
+		});
+	}
 	new window.Swiper(el, {
 		slidesPerView: 3,
 		spaceBetween: 40,

public/themes/website/1/zh/demo/news.html

@@ -93,11 +93,16 @@
     <article class="n-featured">
       <div class="n-featured__swiper swiper">
         <div class="swiper-wrapper">
-          {hcTaglib:content cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time" subField="" name="hc_featured" limit="10" item="vo_content" sort="sort asc"}
+          {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time" subField="" name="hc_content" limit="100" item="content_sub22" sort="sort asc" isTop="1"}
+          {/hcTaglib:contentPage2}
+
+          {volist name="hc_content" id="vo_content"}
           {php}
+          $content = $vo_content['content'] ?? ''; // 富文本
           $description = $vo_content['description'] ?? '';
-          $title = $vo_content['title'] ?? '';
+          $title = $vo_content['description'] ?? '';
           $create_time_str = $vo_content['create_time'] ?? '';
+          // dd($vo_content->toArray());exit;
           {/php}
           <div class="swiper-slide n-featured__slide" data-category="company">
             <div class="n-featured__media">
@@ -121,7 +126,7 @@
               </div>
             </div>
           </div>
-          {/hcTaglib:content}
+          {/volist}
 
         </div>
       </div>
@@ -153,21 +158,19 @@
 
     <div class="n-grid">
 
-      {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time" subField="" name="hc_content" limit="6" item="content_sub22" sort="sort asc"}
+      {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time" subField="" name="hc_content" limit="6" item="content_sub22" sort="sort asc" isTop="2"}
       {/hcTaglib:contentPage2}
 
       {volist name="hc_content" id="vo_content"}
       {php}
-      $description = $vo_content['description'] ?? '';
-      $create_time_int = $vo_content['create_time'] ?? '';
+      $content = $hc_content['content'] ?? '';
+      $description = $hc_content['description'] ?? '';
+      $create_time_int = $hc_content['create_time'] ?? '';
       $create_time_str = '';
       if(!empty($create_time_int)){
-        if (is_numeric($create_time_int)) {
-          $create_time_str = date('Y-m-d', (int)$create_time_int);
-        } else {
-          $create_time_str = $create_time_int;
-        }
+      $create_time_str = date('Y-m-d', $create_time_int);
       }
+      // dd($hc_content->toArray());exit;
       {/php}
 
       <article class="n-card" data-category="insight">

public/themes/website/1/zh/demo/solution.html

@@ -154,13 +154,21 @@
     {if !empty($sub_cates[4])}
     <section class="sl-clients section__wrap" id="clients" data-header-dark>
       <h2 class="sl-clients__title">{$sub_cates[4]['title'] ?? ''}</h2>
-      <div class="sl-clients__grid">
-        {php}
-        $contents = getContentByCategory($sub_cates[4]['id'], $seller_id, 6, 'sort asc', ['thumbnail', 'category']);
-        {/php}
-        {volist name="contents" id="vo"}
-        <div class="sl-clients__item"><img src="{$vo['thumbnail']['url'] ?? ''}" alt="" width="252" height="160" loading="lazy" /></div>
-        {/volist}
+      {php}
+      $contents = getContentByCategory($sub_cates[4]['id'], $seller_id, 20, 'sort asc', ['thumbnail', 'category']);
+      $clients_marquee = is_array($contents) && count($contents) > 5;
+      {/php}
+      <div class="sl-clients__viewport{if $clients_marquee} is-marquee{/if}">
+        <div class="sl-clients__grid">
+          {volist name="contents" id="vo"}
+          <div class="sl-clients__item"><img src="{$vo['thumbnail']['url'] ?? ''}" alt="" width="252" height="160" loading="lazy" /></div>
+          {/volist}
+          {if $clients_marquee}
+          {volist name="contents" id="vo"}
+          <div class="sl-clients__item" aria-hidden="true"><img src="{$vo['thumbnail']['url'] ?? ''}" alt="" width="252" height="160" loading="lazy" /></div>
+          {/volist}
+          {/if}
+        </div>
       </div>
     </section>
     {/if}

public/themes/website/1/zh/demo/solution2.html

@@ -199,7 +199,7 @@ $current_cate_id = $current_cate['id'] ?? 0;
     </section>
     {/if}
     {if !empty($sub_cates[5])}
-
+    <!-- 其他解决方案 -->
     <section class="sl2-more section__wrap" id="more" data-header-dark>
       <div class="sl2-more__head">
         <h2 class="sl2-more__title">{$sub_cates[5]['title'] ?? ''}</h2>