From 2c1c1ff5047077e4c4dd4e267276ad9ff0b34e7d Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Wed, 8 May 2024 10:30:59 +0800
Subject: [PATCH] =?UTF-8?q?commerce-footer=E6=A0=B7=E5=BC=8F=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/commerce/components/Footer.js        | 191 +++++++++++---------
 themes/commerce/components/ProductCenter.js |   4 +-
 themes/commerce/index.js                    |   2 +-
 3 files changed, 104 insertions(+), 93 deletions(-)

diff --git a/themes/commerce/components/Footer.js b/themes/commerce/components/Footer.js
index e36949af..5aab31e4 100644
--- a/themes/commerce/components/Footer.js
+++ b/themes/commerce/components/Footer.js
@@ -18,7 +18,7 @@ const Footer = props => {
   return (
     <footer
       id='footer-wrapper'
-      className='relative bg-[#2A2A2A] justify-center w-full leading-6 text-gray-300 text-sm p-10'>
+      className='relative bg-[#2A2A2A] justify-center w-full leading-6 text-gray-300 text-sm md:p-10'>
       <div id='footer-container' className='w-full mx-auto max-w-screen-xl'>
         <div className='flex'>
           {/* 页脚左侧菜单组 */}
@@ -72,97 +72,108 @@ const Footer = props => {
             </div>
           </div>
 
-          {/* 页脚中部联系方式 */}
+          {/* 页脚右侧联系方式 */}
           {
-            <div className='md:border-l pl-4 border-gray-600 my-6 whitespace-pre-line text-left flex-grow'>
-              <div className='font-bold text-l text-white mb-6'>
-                {siteConfig('COMMERCE_TEXT_FOOTER_TITLE', 'Contact US', CONFIG)}
-              </div>
-              <div className='space-y-4'>
-                <div className='flex space-x-4 text-2xl'>
-                  {JSON.parse(
-                    siteConfig('COMMERCE_CONTACT_WHATSAPP_SHOW', null, CONFIG),
-                    true
-                  ) && (
-                    <div>
-                      {
-                        <a
-                          target='_blank'
-                          rel='noreferrer'
-                          href={siteConfig('CONTACT_WHATSAPP', '#', CONFIG)}
-                          title={'telegram'}>
-                          <i className='transform hover:scale-125 duration-150 fa-brands fa-whatsapp dark:hover:text-red-400 hover:text-red-600' />
-                        </a>
-                      }
-                    </div>
-                  )}
-
-                  {JSON.parse(
-                    siteConfig('COMMERCE_CONTACT_TELEGRAM_SHOW', true, CONFIG)
-                  ) && (
-                    <div>
-                      {
-                        <a
-                          target='_blank'
-                          rel='noreferrer'
-                          href={siteConfig('CONTACT_TELEGRAM', '#', CONFIG)}
-                          title={'telegram'}>
-                          <i className='transform hover:scale-125 duration-150 fab fa-telegram dark:hover:text-red-400 hover:text-red-600' />
-                        </a>
-                      }
-                    </div>
-                  )}
-                </div>
-                <div className='text-lg'>
-                  {' '}
-                  {siteConfig('CONTACT_EMAIL') && (
-                    <a
-                      target='_blank'
-                      rel='noreferrer'
-                      title={'email'}
-                      href={`mailto:${siteConfig('CONTACT_EMAIL')}`}>
-                      <i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-red-400 hover:text-red-600' />{' '}
-                      {siteConfig('CONTACT_EMAIL')}
-                    </a>
-                  )}
-                </div>
-                <div className='text-lg'>
-                  {' '}
-                  {siteConfig('CONTACT_PHONE', null) && (
-                    <div>
-                      <i className='transform hover:scale-125 duration-150 fas fa-user dark:hover:text-red-400 hover:text-red-600' />{' '}
-                      {siteConfig('CONTACT_PHONE', null)}
-                    </div>
-                  )}
-                </div>
-              </div>
-            </div>
-          }
-
-          {/* 页脚右侧图片二维码和文字描述 */}
-          {
-            <div className='pl-4 border-gray-600 my-6 whitespace-pre-line text-center flex-grow'>
-              <div className='font-bold text-l text-white mb-6 text-center'>
-                {/* eslint-disable-next-line @next/next/no-img-element */}
-                <img
-                  className='h-36'
-                  src={siteConfig(
-                    'COMMERCE_FOOTER_RIGHT_IMG_URL',
-                    null,
+            <div className='md:border-l pl-8 space-x-8 border-gray-600 flex flex-grow'>
+              {/* 电话邮箱等 */}
+              <div className='my-6 whitespace-pre-line text-left'>
+                <div className='font-bold text-l text-white mb-6'>
+                  {siteConfig(
+                    'COMMERCE_TEXT_FOOTER_TITLE',
+                    'Contact US',
                     CONFIG
-                  )}></img>
-              </div>
-              <div className='space-y-4'>
-                <div
-                  className='flex space-x-4 text-center'
-                  dangerouslySetInnerHTML={{
-                    __html: siteConfig(
-                      'COMMERCE_FOOTER_RIGHT_TEXT',
-                      null,
-                      CONFIG
-                    )
-                  }}></div>
+                  )}
+                </div>
+                <div className='space-y-4'>
+                  <div className='flex space-x-4 text-2xl'>
+                    {JSON.parse(
+                      siteConfig(
+                        'COMMERCE_CONTACT_WHATSAPP_SHOW',
+                        null,
+                        CONFIG
+                      ),
+                      true
+                    ) && (
+                      <div>
+                        {
+                          <a
+                            target='_blank'
+                            rel='noreferrer'
+                            href={siteConfig('CONTACT_WHATSAPP', '#', CONFIG)}
+                            title={'telegram'}>
+                            <i className='transform hover:scale-125 duration-150 fa-brands fa-whatsapp dark:hover:text-red-400 hover:text-red-600' />
+                          </a>
+                        }
+                      </div>
+                    )}
+
+                    {JSON.parse(
+                      siteConfig('COMMERCE_CONTACT_TELEGRAM_SHOW', true, CONFIG)
+                    ) && (
+                      <div>
+                        {
+                          <a
+                            target='_blank'
+                            rel='noreferrer'
+                            href={siteConfig('CONTACT_TELEGRAM', '#', CONFIG)}
+                            title={'telegram'}>
+                            <i className='transform hover:scale-125 duration-150 fab fa-telegram dark:hover:text-red-400 hover:text-red-600' />
+                          </a>
+                        }
+                      </div>
+                    )}
+                  </div>
+                  <div className='text-lg'>
+                    {' '}
+                    {siteConfig('CONTACT_EMAIL') && (
+                      <a
+                        target='_blank'
+                        rel='noreferrer'
+                        title={'email'}
+                        href={`mailto:${siteConfig('CONTACT_EMAIL')}`}>
+                        <i className='transform hover:scale-125 duration-150 fas fa-envelope dark:hover:text-red-400 hover:text-red-600' />{' '}
+                        {siteConfig('CONTACT_EMAIL')}
+                      </a>
+                    )}
+                  </div>
+                  <div className='text-lg'>
+                    {' '}
+                    {siteConfig('CONTACT_PHONE', null) && (
+                      <div>
+                        <i className='transform hover:scale-125 duration-150 fas fa-user dark:hover:text-red-400 hover:text-red-600' />{' '}
+                        {siteConfig('CONTACT_PHONE', null)}
+                      </div>
+                    )}
+                  </div>
+                </div>
               </div>
+
+              {/* 页脚右侧图片二维码和文字描述 */}
+              {
+                <div className=' border-gray-600 my-6 whitespace-pre-line text-center'>
+                  <div className='font-bold text-l text-white mb-6 text-center'>
+                    {/* eslint-disable-next-line @next/next/no-img-element */}
+                    <img
+                      className='h-36'
+                      src={siteConfig(
+                        'COMMERCE_FOOTER_RIGHT_IMG_URL',
+                        null,
+                        CONFIG
+                      )}></img>
+                  </div>
+                  <div className='space-y-4'>
+                    <div
+                      className='flex space-x-4 text-center'
+                      dangerouslySetInnerHTML={{
+                        __html: siteConfig(
+                          'COMMERCE_FOOTER_RIGHT_TEXT',
+                          null,
+                          CONFIG
+                        )
+                      }}></div>
+                  </div>
+                </div>
+              }
             </div>
           }
         </div>
@@ -170,7 +181,7 @@ const Footer = props => {
         {/* 底部版权相关 */}
         <div
           id='footer-copyright-wrapper'
-          className='flex flex-col md:flex-row justify-between border-t border-gray-600 pt-8'>
+          className='flex flex-col md:flex-row justify-between border-t border-gray-600 pt-8 px-4 md:px-0'>
           <div className='text-start space-y-1'>
             {/* 网站所有者 */}
             <div>
diff --git a/themes/commerce/components/ProductCenter.js b/themes/commerce/components/ProductCenter.js
index 2161a837..d900260e 100644
--- a/themes/commerce/components/ProductCenter.js
+++ b/themes/commerce/components/ProductCenter.js
@@ -16,7 +16,7 @@ export default function ProductCenter(props) {
   )
 
   return (
-    <div className='w-full my-4 mx-4'>
+    <div className='w-full'>
       <div className='w-full text-center text-4xl font-bold'>
         {siteConfig('COMMERCE_TEXT_CENTER_TITLE', 'Product Center', CONFIG)}
       </div>
@@ -29,7 +29,7 @@ export default function ProductCenter(props) {
       <div className='flex'>
         <ProductCategories {...props} />
 
-        <div className='w-full p-4 mx-2'>
+        <div className='w-full px-4'>
           {/* 文章列表 */}
           <div className='grid md:grid-cols-3 grid-cols-2 gap-5'>
             {posts?.map(post => (
diff --git a/themes/commerce/index.js b/themes/commerce/index.js
index 0eec6224..7ced2e85 100644
--- a/themes/commerce/index.js
+++ b/themes/commerce/index.js
@@ -129,7 +129,7 @@ const LayoutIndex = props => {
 
       {/* 首页企业/品牌介绍 这里展示公告 */}
       {notice && (
-        <div id='brand-introduction' className='w-full my-4 mx-4'>
+        <div id='brand-introduction' className='w-full'>
           <div className='w-full text-center text-4xl font-bold pt-12'>
             {notice.title}
           </div>