From 02e81d3e59de95ed1dd0806a4a0a016b2703e190 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Mon, 30 Jun 2025 10:57:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pc/mobile=20banner=E7=9A=84extra=5Fimage?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/controller/ContactUs.php          |  9 +-----
 app/index/view/mobile/contact_us/index.html | 12 ++++----
 app/index/view/mobile/topic_nas/help.html   |  5 ++--
 app/index/view/pc/contact_us/index.html     | 12 +++-----
 app/index/view/pc/topic_nas/help.html       | 32 ++++++++++++---------
 5 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/app/index/controller/ContactUs.php b/app/index/controller/ContactUs.php
index 5f8b474b..44c4a74f 100644
--- a/app/index/controller/ContactUs.php
+++ b/app/index/controller/ContactUs.php
@@ -45,14 +45,7 @@ class ContactUs extends Common
                 $banner_map[$v->unique_label] = $v;
             }
             $focus_image = data_get($banner_map, 'BANNER_6805e3d32dcc2')?->items->first()?->toArray();
-            $info_datas  = data_get($banner_map, 'BANNER_6806090c1838f')?->items->each(function($item) {
-                if (Str::contains($item->title, '<br/>')) {
-                    $title             = explode('<br/>', $item->title);
-                    $item->title       = $title[0];
-                    $item->title_short = $title[1];
-                }
-                return $item;
-            })->toArray();
+            $info_datas  = data_get($banner_map, 'BANNER_6806090c1838f')?->items->toArray();
         }
         View::assign('focus_image', $focus_image);
         View::assign('info_datas', $info_datas);
diff --git a/app/index/view/mobile/contact_us/index.html b/app/index/view/mobile/contact_us/index.html
index a96b9414..45550253 100644
--- a/app/index/view/mobile/contact_us/index.html
+++ b/app/index/view/mobile/contact_us/index.html
@@ -24,13 +24,13 @@
                         <div class="narskfit" {notempty name="item.link"}onclick="location.href='{$item.link}'"{/notempty}>
                             <img src="{$item.image}" class="narskico-img" />
                             <span class="narskf-title">{$item.title}</span>
-                            {notempty name="item.title_short"}
-                            <span class="narskf-sm">{$item.title_short}</span>
-                            {/notempty}
                             {notempty name="item.desc"}
-                            {if condition="str_contains($item.desc, '<img')"}
-                            <div class="narskfactive-ewm" style="display: none;">{$item.desc|raw}</div>
-                            {/if}
+                            <span class="narskf-sm">{$item.desc|raw}</span>
+                            {/notempty}
+                            {notempty name="item.extra_image"}
+                            <div class="narskfactive-ewm" style="display: none;">
+                                <img src="{$item.extra_image}" alt="" />
+                            </div>
                             {/notempty}
                         </div>
                         {/volist}
diff --git a/app/index/view/mobile/topic_nas/help.html b/app/index/view/mobile/topic_nas/help.html
index b4d7435b..22564d0c 100644
--- a/app/index/view/mobile/topic_nas/help.html
+++ b/app/index/view/mobile/topic_nas/help.html
@@ -49,8 +49,9 @@
         {notempty name="contacts"}
         <h1 class="nhlpapp-title">{:lang_i18n('联系我们')}</h1>
         <div class="nhlpapp-row">
+            {assign name="first_section" value=":array_splice($contacts, 0, count($contacts) - 3)"}
             <div class="sec-1">
-                {volist name="contacts" id="co" key="idx" offset="0" length="4"}
+                {volist name="first_section" id="co"}
                 <a class="nhlplxwmit" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg">
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
@@ -61,7 +62,7 @@
                 {/volist}
             </div>
             <div class="sec-2">
-                {volist name="contacts" id="co" key="idx" offset="4"}
+                {volist name="contacts" id="co"}
                 <a class="nhlplxwmit nhlplxwmit-w1" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg">
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}<br></span>
diff --git a/app/index/view/pc/contact_us/index.html b/app/index/view/pc/contact_us/index.html
index 46e0cbc6..75b14e1c 100644
--- a/app/index/view/pc/contact_us/index.html
+++ b/app/index/view/pc/contact_us/index.html
@@ -24,16 +24,12 @@
                 <a class="narskfit" href="{$item.link}">
                     <img src="{$item.image}" class="narskico-img" />
                     <span class="narskf-title">{$item.title}</span>
-                    {notempty name="item.title_short"}
-                    <span class="narskf-sm">{$item.title_short}</span>
-                    {/notempty}
                     {notempty name="item.desc"}
-                    {if condition="str_contains($item.desc, '<img')"}
+                    <span class="narskf-sm">{$item.desc|raw}</span>
+                    {/notempty}
+                    {notempty name="item.extra_image"}
                     <div class="narskfactive-ewm">
-                    {else/}
-                    <div class="narskf-sm narskf-font-26">
-                    {/if}
-                        {$item.desc|raw}
+                        <img src="{$item.extra_image}" alt="" />
                     </div>
                     {/notempty}
                 </a>
diff --git a/app/index/view/pc/topic_nas/help.html b/app/index/view/pc/topic_nas/help.html
index 8e5cf071..e0752832 100644
--- a/app/index/view/pc/topic_nas/help.html
+++ b/app/index/view/pc/topic_nas/help.html
@@ -57,33 +57,37 @@
             <h1 class="lxwmtitle">{:lang_i18n('联系我们')}</h1>
             <div class="nhlp-row">
               <div class="nhlp-row-content">
-                {volist name="contacts" id="co" key="idx" offset="0" length="3"}
-                <a class="nhlplxwmit nhlplxwmit-w1" {notempty name="co.link"}href="{$co.link}"{/notempty} {eq name="idx" value="3"}style="margin-right: 0;"{/eq}>
+                {assign name="fist_section" value=":array_splice($contacts, 0, 3)" /}
+                {volist name="fist_section" id="co"}
+                <a class="nhlplxwmit nhlplxwmit-w1" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg" />
-                    {if condition="!empty($co.desc) && str_contains($co.desc, '<img')"}
-                    <img src="{:get_path_from_img_tag($co.desc)}" class="lxewmimg" />
-                    <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
-                    {else/}
+                    {notempty name="co.extra_image"}
+                    <img src="{$co.extra_image}" class="lxewmimg" />
+                    {/notempty}
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
+                    {notempty name="co.desc"}
                     <span class="t2" {:style(['color'=>$co.desc_txt_color])}>{$co.desc|raw}</span>
-                    {/if}
+                    {/notempty}
                 </a>
                 {/volist}
               </div>
+              {assign name="second_section" value=":array_chunk($contacts, 4)" /}
+              {volist name="second_section" id="chunk"}
               <div class="nhlp-row-content">
-                {volist name="contacts" id="co" key="idx" offset="3"}
-                <a class="nhlplxwmit nhlplxwmit-w2" {notempty name="co.link"}href="{$co.link}"{/notempty} {eq name="idx%4" value="0"}style="margin-right: 0;"{/eq}>
+                {volist name="chunk" id="co"}
+                <a class="nhlplxwmit nhlplxwmit-w2" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg" />
-                    {if condition="!empty($co.desc) && str_contains($co.desc, '<img')"}
-                    <img src="{:get_path_from_img_tag($co.desc)}" class="lxewmimg" />
-                    <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
-                    {else/}
+                    {notempty name="co.extra_image"}
+                    <img src="{$co.extra_image}" class="lxewmimg" />
+                    {/notempty}
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
+                    {notempty name="co.desc"}
                     <span class="t2" {:style(['color'=>$co.desc_txt_color])}>{$co.desc|raw}</span>
-                    {/if}
+                    {/notempty}
                 </a>
                 {/volist}
               </div>
+              {/volist}
             </div>
         </div>
         {/notempty}