From bc5022b2d69e1a5a1276a36e9c322432b895b73b Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 16 Apr 2025 13:39:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=99=84=E4=BB=B6/=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/controller/Attachment.php        |   4 ++++
 app/index/lang/en-us.php                   |   9 +++++----
 app/index/lang/zh-cn.php                   |   9 +++++----
 app/index/model/AttachmentModel.php        |   9 +++++++++
 app/index/model/VideoModel.php             |   9 +++++++++
 app/index/view/attachment/index.html       |  17 ++++++++++-------
 app/index/view/attachment/video.html       |  16 +++++++++-------
 public/static/index/css/download.css       |   5 +++++
 public/static/index/images/search_blue.png | Bin 0 -> 571 bytes
 9 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100755 public/static/index/images/search_blue.png

diff --git a/app/index/controller/Attachment.php b/app/index/controller/Attachment.php
index 468bb3c8..ae49b874 100644
--- a/app/index/controller/Attachment.php
+++ b/app/index/controller/Attachment.php
@@ -21,6 +21,7 @@ class Attachment extends Common
     {
         $param = request()->param([
             'id',
+            'keyword',
             'page/d' => 1,
             'size/d' => 12,
         ]);
@@ -47,6 +48,7 @@ class Attachment extends Common
                 'support_platform',
                 'attach',
             ])
+            ->withSearch(['name'], ['name' => $param['keyword']??null])
             ->language($this->lang_id)
             ->category($param['id']??null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
@@ -70,6 +72,7 @@ class Attachment extends Common
     {
         $param = request()->param([
             'id',
+            'keyword',
             'page/d' => 1,
             'size/d' => 12
         ]);
@@ -106,6 +109,7 @@ class Attachment extends Common
                 'video',
                 'link'
             ])
+            ->withSearch(['name'], ['name' => $param['keyword']??null])
             ->language($this->lang_id)
             ->category($param['id']??null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
diff --git a/app/index/lang/en-us.php b/app/index/lang/en-us.php
index ad0a50b9..0c90a2f7 100644
--- a/app/index/lang/en-us.php
+++ b/app/index/lang/en-us.php
@@ -33,9 +33,10 @@ return [
         'detail_recommend'             => 'Recommended for you',
     ],
     'attachment' => [
-        'software_drives'  => 'Software and Drivers',
-        'video'            => 'Videos',
-        'support_model'    => 'Supported Models',
-        'support_platform' => 'Supported Systems',
+        'software_drives'    => 'Software and Drivers',
+        'video'              => 'Videos',
+        'support_model'      => 'Supported Models',
+        'support_platform'   => 'Supported Systems',
+        'search_placeholder' => 'Search model',
     ]
 ];
\ No newline at end of file
diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php
index 1aeb67eb..10f84691 100644
--- a/app/index/lang/zh-cn.php
+++ b/app/index/lang/zh-cn.php
@@ -33,9 +33,10 @@ return [
         'detail_recommend'             => '你可能还喜欢',
     ],
     'attachment' => [
-        'software_drives'  => '软件和驱动程序',
-        'video'            => '视频',
-        'support_model'    => '支持型号',
-        'support_platform' => '支持系统',
+        'software_drives'    => '软件和驱动程序',
+        'video'              => '视频',
+        'support_model'      => '支持型号',
+        'support_platform'   => '支持系统',
+        'search_placeholder' => '搜索型号',
     ]
 ];
\ No newline at end of file
diff --git a/app/index/model/AttachmentModel.php b/app/index/model/AttachmentModel.php
index d358f4ed..590d2a8f 100644
--- a/app/index/model/AttachmentModel.php
+++ b/app/index/model/AttachmentModel.php
@@ -22,6 +22,15 @@ class AttachmentModel extends AttachmentBaseModel
     // 设置JSON数据返回数组
     protected $jsonAssoc = true;
 
+    // 附件名称搜索器
+    public function searchNameAttr($query, $value, $data)
+    {
+        if (is_null($value)) {
+            return;
+        }
+        $query->where('name', 'like', "%{$value}%");
+    }
+
     // 所属语言范围查询
     public function scopeLanguage($query, $language)
     {
diff --git a/app/index/model/VideoModel.php b/app/index/model/VideoModel.php
index 3ebbb1a1..3708ac91 100644
--- a/app/index/model/VideoModel.php
+++ b/app/index/model/VideoModel.php
@@ -18,6 +18,15 @@ class VideoModel extends VideoBaseModel
     // 软删除字段
     protected $deleteTime = 'deleted_at';
 
+    // 视频名称搜索器
+    public function searchNameAttr($query, $value, $data)
+    {
+        if (is_null($value)) {
+            return;
+        }
+        $query->where('name', 'like', "%{$value}%");
+    }
+
     // 所属语言范围查询
     public function scopeLanguage($query, $language)
     {
diff --git a/app/index/view/attachment/index.html b/app/index/view/attachment/index.html
index 03821bf2..fda7c37a 100644
--- a/app/index/view/attachment/index.html
+++ b/app/index/view/attachment/index.html
@@ -12,12 +12,13 @@
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
-            <div class="search_all">
-                <input type="text" name="textfield" placeholder="Search model" id="search_software">
-                <div class="searchbtn" id="search-btn">
-                    <img src="downloadImg/search.png" />
+            <form action="{:url('attachment/index')}" method="get">
+                <div class="search_all">
+                    <input type="hidden" name="id" value="{$Request.get.id}" />
+                    <input type="text" name="keyword" placeholder="{:lang('attachment.search_placeholder')}" />
+                    <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>
-            </div>
+            </form>
             <!-- tab切换 -->
             <div class="tab">
                 {notempty name="categorys"}
@@ -36,8 +37,8 @@
                 <a href="{:url('attachment/video')}"><div class="tabit">{:lang('attachment.video')}</div></a>
             </div>
             <!-- 切换的内容 -->
-            {notempty name="attachements"}
             <div class="softlist">
+                {notempty name="attachements"}
                 {volist name="attachements" id="att"}
                 <div class="softit">
                     <div class="left_img">
@@ -62,8 +63,10 @@
                 </div>
                 {/volist}
                 <div>{$page|raw}</div>
+                {else/}
+                <div class="softit">查询无结果！</div>
+                {/notempty}
             </div>
-            {/notempty}
         </div>
     </div>
 </div>
diff --git a/app/index/view/attachment/video.html b/app/index/view/attachment/video.html
index 05ff143d..6447bbdc 100644
--- a/app/index/view/attachment/video.html
+++ b/app/index/view/attachment/video.html
@@ -12,12 +12,12 @@
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
-            <div class="search_all">
-                <input type="text" name="textfield" placeholder="Search model" id="search_software">
-                <div class="searchbtn" id="search-btn">
-                    <img src="downloadImg/search.png" />
+            <form action="{:url('attachment/video')}" method="get">
+                <div class="search_all">
+                    <input type="text" name="keyword" placeholder="{:lang('attachment.search_placeholder')}" />
+                    <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>
-            </div>
+            </form>
             <!-- tab切换 -->
             <div class="tab">
                 {notempty name="attachment_categorys"}
@@ -45,9 +45,9 @@
                 </div>
                 {/notempty}
                 <!-- 视频内容 -->
-                {notempty name="videos"}
                 <div class="bdconten">
                     <ul >
+                        {notempty name="videos"}
                         <dl class="video_hotul">
                             {volist name="videos" id="vo"}
                             <dd>
@@ -65,9 +65,11 @@
                             <div class="clear"></div>
                         </dl>
                         <div>{$page|raw}</div>
+                        {else/}
+                        <dl class="video-empty">查询无结果！</dl>
+                        {/notempty}
                     </ul>
                 </div>
-                {/notempty}
             </div>
         </div>
     </div>
diff --git a/public/static/index/css/download.css b/public/static/index/css/download.css
index 43d1b3f9..3576a89a 100755
--- a/public/static/index/css/download.css
+++ b/public/static/index/css/download.css
@@ -65,6 +65,8 @@
   top: 50%;
   margin-top: -0.75rem;
   right: 6rem;
+  border: 0;
+  background-color: transparent;
 }
 .orico_Page_download .downloadMain .contact_c .search_all .searchbtn img {
   width: 100%;
@@ -259,3 +261,6 @@
   margin-top: 16px;
   line-height: 20px;
 }
+.orico_Page_download .downloadMain .contact_c .video-empty {
+  padding-bottom: 3rem;
+}
diff --git a/public/static/index/images/search_blue.png b/public/static/index/images/search_blue.png
new file mode 100755
index 0000000000000000000000000000000000000000..a973810c3e5e13ec3bfd0e7fcd29befe8e3abf0a
GIT binary patch
literal 571
zcmV-B0>u4^P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00064Nkl<ZNK3U<
z%TWSB5PiMutVcBh%|MJmxFS|z1Y!hg1Y!ncAY?$5ibo&=j6jS)Ji5QJXO?CEI~;JT
zsG@dy`@Qad{g&|0hm84q@(2OWws8%7VL~h8dz*l2fS%Wak4H$^DoM5ktRdd)u?eUM
zpcuREGl+WImnAK>|4Ck?k}e^{bzMbS0F~VHW}Ki2Nk6c{A#7*J3Dy~=9ls9>1^}Hf
zku^fQjVW<e#ghf-cylO*gb#$GU-gnsqsaIiFZFy>CG7$czDNL6&pkQQ%we}`lgC8U
zAS9pgdcaj>PXe%IUmjRF%$S&J)vGuz2Z(zAtuF-!<$G?D%H=Q1mggae+a%`c@Th{M
zJqt`l%apHh-|>b#yF30B+O!{l?(cwS_xOJR<_hE~&)`#+{^pqNBj2O0yVP<GdFkG1
zQk;Q$5(i1^7E^n)^Bj69awP&u$y9A;_{`q3g5#X;tfW}p7RGpS`qg`ouA*i$GYPKT
z5klPP<#g<3nJ49}LN)<k*~K9z;`OJ8ysjfzb6b30RU1os2djvwbr{6*MjMZTZdt>c
zAh06Cqd>VV6XBx`k?(8#s9Z7HW88a$*8QfM;>=ag8)Cp0>pIgjOHzM$!eqMxXNd#M
zGa{&QRx`k^daVH2A3!wx<QpNyxw8EI0>mKjS+bF<?jIo6(m$8^3n;J#qFn$0002ov
JPDHLkV1l+<2;=|&

literal 0
HcmV?d00001