Merge branch 'dev' of https://gitea.f2b211.com/jsasg/orico-official-website into dev

app/index/view/product/category.html

@@ -4,7 +4,17 @@
 {/block}
 {block name="main"}
 <div class="orico_Page_category">
-	<!--首页主题内容 -->
+	<!-- banner轮播 -->
+	{notempty name="focus_image"}
+	<div class="opdBanner">
+		{volist name="focus_image" id="fi"}
+		<a {notempty name="fi.link" }href="{$fi.link}" {/notempty}>
+			<img src="{$fi.image}" class="opdbannerImg" />
+		</a>
+		{/volist}
+	</div>
+	{/notempty}
+	<!--分类/产品内容 -->
 	<div class="pageMain">
 		{volist name="list" id="vo"}
 		<div class="cat">
@@ -15,6 +25,7 @@
 					<img src="/static/index/images/more.png" class="catmoreImg" />
 				</a>
 			</div>
+			{notempty name="vo.products"}
 			<div class="ori-pd-list">
 				{volist name="vo.products" id="pro"}
 				<a class="oripditem" href="{:url('product/detail', ['id' => $pro.id])}">
@@ -29,8 +40,30 @@
 				</a>
 				{/volist}
 			</div>
+			{/notempty}
 		</div>
 		{/volist}
 	</div>
 </div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+  $(function () {
+    // 显示第一张图片
+    $('.opdbannerImg').eq(0).show();
+    let currentIndex = 0;
+    const imgCount = $('.opdbannerImg').length;
+    setInterval(() => {
+      // 淡出当前图片
+      $('.opdbannerImg').eq(currentIndex).fadeTo(10, 0, () => {
+        // 隐藏当前图片
+        $('.opdbannerImg').eq(currentIndex).hide();
+        // 计算下一张图片的索引
+        currentIndex = (currentIndex + 1) % imgCount;
+        // 显示并淡入下一张图片
+        $('.opdbannerImg').eq(currentIndex).show().fadeTo(10, 1);
+      });
+    }, 10000);
+  });
+</script>
 {/block}

app/index/view/public/header.html

@@ -25,16 +25,15 @@
               </ul>
               <!-- 右边子菜单-->
               {volist name="header_categorys" id="vo" key="idx"}
-              <div class="navItem_cyright" {eq name="idx" value="1" }style="display: block;"
-                {else/}style="display: none;" {/eq}>
+              <div class="navItem_cyright" {eq name="idx" value="1" }style="display: block;"{else/}style="display: none;"{/eq}>
                 {volist name="vo.children" id="vc"}
                 <dl class="nav_cyrightit">
                   <dt>
-                    <a href="{:url('product/category', ['id' => $vc.id])}">{$vc.name}</a>
+                    <a href="{:url('product/subcategory', ['id' => $vc.id])}">{$vc.name}</a>
                   </dt>
                   {volist name="vc.children" id="vcc"}
                   <dd>
-                    <a href="{:url('product/category', ['id' => $vcc.id])}">{$vcc.name}</a>
+                    <a href="{:url('product/subcategory', ['id' => $vcc.id])}">{$vcc.name}</a>
                   </dd>
                   {/volist}
                 </dl>