From 782bdbb7dbd0407dc251eb8b7bbf899050e1059d Mon Sep 17 00:00:00 2001
From: yin5th <541304803@qq.com>
Date: Fri, 14 Oct 2022 14:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Cases.php | 7 ++++++-
 view/page/caseslist.html | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controller/Cases.php b/app/controller/Cases.php
index d0fa05b..fd67b28 100755
--- a/app/controller/Cases.php
+++ b/app/controller/Cases.php
@@ -84,7 +84,12 @@ class Cases extends Base
             return $this->json(2, '栏目不存在');
         }
 
-        $items = CasesModel::findListByWhere(["category_id" => $categoryId], $page, $size);
+        $categoryIds = Category::where('parent_id', $categoryId)->column('id');
+        $items = CasesModel::whereIn('category_id', $categoryIds)
+                        ->where('visible', 1)
+                        ->page($page, $size)
+                        ->select()
+                        ->toArray();
 
         foreach ($items as $item) {
             $item['image'] = $this->isMobile ? $item['image_mobile'] : $item['image'];
diff --git a/view/page/caseslist.html b/view/page/caseslist.html
index 7a72ecb..87dabf3 100755
--- a/view/page/caseslist.html
+++ b/view/page/caseslist.html
@@ -35,7 +35,7 @@ $items = CasesModel::getByParentId($category['id'],true,$category['number'] ?: 6
 	<div class="project-case-list red-property-case flex w1360">
 		{foreach $items as $item}
 		<a href="/cases/{$item.id}.html" class="wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="0">
-			<div class="img"><img src="{$isMobile ? $item['image'] : $item['image_mobile']}" alt="{$item.title}"></div>
+			<div class="img"><img src="{$isMobile ? $item['image_mobile'] : $item['image']}" alt="{$item.title}"></div>
 			<div class="info bg-col-white">
 				<div class="txt flex">
 					<p class="clips1">{$item.title}</p>
@@ -69,7 +69,7 @@ $items = CasesModel::getByParentId($category['id'],true,$category['number'] ?: 6
 					}, 2000)
 					return false;
 				}
-				let html = '';
+				let html = ``;
 				$.each(res.data, function (index, item) {
 					html += `
 					<a href="/cases/${item.id}.html" class="wow fadeInUp" data-wow-duration="0.8s" data-wow-delay="0">
@@ -86,7 +86,7 @@ $items = CasesModel::getByParentId($category['id'],true,$category['number'] ?: 6
 				})
 				page++;
 				that.data('page', page)
-				$('.show-msg').before(html);
+				$('.project-case-list').append(html);
 				return false;
 			}
 		})