From 2ed166405a4e3fedeff3daec573ee9d43906bf56 Mon Sep 17 00:00:00 2001
From: "tangly1024.com" <tlyong1992@hotmail.com>
Date: Tue, 7 May 2024 17:28:57 +0800
Subject: [PATCH] =?UTF-8?q?commerce=E4=B8=BB=E9=A2=98=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=92=8C=E6=96=87=E5=AD=97=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/qrcode.png                    | Bin 0 -> 2305 bytes
 themes/commerce/components/Footer.js | 300 ++++++++++++++++++---------
 themes/commerce/config.js            |   4 +
 3 files changed, 205 insertions(+), 99 deletions(-)
 create mode 100644 public/qrcode.png

diff --git a/public/qrcode.png b/public/qrcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b361b4b61c0e86d7964fae32a9afe0cf3798ce
GIT binary patch
literal 2305
zcmb7GYfuwc7)`JeM3(rdhz7cf4;;0M6-`t~RHOl6#HkhpT0(|u@CC7SDlm}ESXjhh
z5UbQcN{Y5JPO!n(6e<ugm_S9MBhi4QVTmRVq9jC`1d?o*ai+f{Yk%C?xp(LL?z!hX
z=exIb_bw*jyU>?FAONv3JH8+gh-W5;j~BK=*40*HpBdbk<QxLQzkPBL&#&^Q5C}du
zVs~uYn=5{;i~IIj%&e{34&JrNubaI2OLn^Q_8R*_+Lqfd&R=1(>E)1|;OpK}NF<;;
z8~A>0UY~t5vt!okMN$8EVqfo^7#SG>n}pRZHILVQRRoy$5iIuLqO%%7^Y|`0k4U|s
zKluH=t#CSV!HMbL_yn9;{GQ3<N8%(~d0`hbL<lJjdxC8;<kh@xCMOXpGW^ji1#Gp!
z?+^ShrE(NYp-Nbld{hym;?_Th+p3V2!IJ8{7T7R9?6|Y;?f#PKMN@45F3T}qxM`Xn
z2BG}?k-&OUsw;pZ)Udn#Juzecb%IRe(eJv{`((U$Cv2Uqz2h+eBiZ206xN<{40m&Z
z><h!muGz-Jxr&vM698k`7Mv24y|}c=Mh@?agp|N~P)asB_~i|VSE7DMj?}&V3wP%U
zs`%!yC&1i!YW*mD<s8N>oQ>EyPGA_X@ZIG`zq-v?flV~tp>7vzP^yvMWS0&l(d2w!
zZi>eOD@Q|hNepK`y8a0z2%STvxx>*zD)ML}JM;N@+`38-z1lP*5q;{C$wvH6CV^os
zZz<j^OegrDD<xGq{Ukr~)s1q}#?{v;V|L&Eu=WEbQ|j=Y5Uv$qLRg+bPhUFN3n-!#
z(XB{aK`RUhA_@eQ<u}uM*`BnF<%nnIWYJ;_qG?~Zt_jSplHYT^k^C~w2XA{kt%Wm2
z>F3^QGkXc4B8Rn2Ei>o4D3vemd-|l{E$XM{CAd|pEH?&8n)7bun_p-ON`-3gV6Z@R
z8~wZm%0H-B*oTLEHTWR;HEd0(VIgB`YT4C#`UXyxJwWx;?2S26>=8X?Yo+6n*f5PK
zO?V(u->Of$2-MXEF%nJoqyG%qMd2#>C5Vkj{kq@>o9LQ#j2{n-wJQMAxE~AESe~W7
zvG;clJ+4k;u@${BIUdzE*=Y3A&^bcMf*b5XwtYOOwD#2fV03YPO|xi=JJo$%;kAA0
zZg;t4cNYMfbzGl&7ShQiOl5K3p&>G!fKr*6TTE?G;Iv8_qsltuj#>dHHI9E=R)mCr
zl4cR=fIBZ34%0Yz$F~%s1NR?VW@^*NIQ<PUh;Gm|z|yq?ngVABp1CtNS6SWO0+N3g
zt?aq`N`*o7TM+n3-+-M-bEj&#L|oP&7=oNVVsc<6jUI81cFkxgKmI4XLZagqdyG|%
zMy=repix(VsE|J3%hEB<T87}zN0LoNUiRpzsmA{7<N4ep<^CL+>n2f*DT&Zb%4Gp8
z<0_JuDzXu`qmH7*lPqSnG#w)$Omesh?GYp9hu(@WQzEI>B{K67#oGO2sYe<sKEyW7
z<NVSRjw<0?USTm17moTU1QD$r)GkJ3H4A|$op|hHO}(2GSQC2#+4>XG)ehI5MwpF|
z`33B#<ETos?qZMTL1Jwn7tMGQWi|EmasxV#NkiAPVz6g<yqU3{ywv?_f+JNk?fhl=
z8-n7Spwf-;fA>Q@9r$LoSyYaZ<EU2k5EhjgGC&pisz@IVnp1NQ`I`kEZ%WLiM6D8!
ek`H-I*g^K9mr?Rz+vJ;u5F5Q~$M4(IPy7qo0h@jR

literal 0
HcmV?d00001

diff --git a/themes/commerce/components/Footer.js b/themes/commerce/components/Footer.js
index a8efec25..d6aa5908 100644
--- a/themes/commerce/components/Footer.js
+++ b/themes/commerce/components/Footer.js
@@ -1,121 +1,223 @@
 import { siteConfig } from '@/lib/config'
 import Link from 'next/link'
+import CONFIG from '../config'
 
 /**
  * 页脚
  * @param {*} param0
  * @returns
  */
-const Footer = (props) => {
+const Footer = props => {
   const d = new Date()
   const currentYear = d.getFullYear()
   const since = siteConfig('SINCE')
-  const copyrightDate = parseInt(since) < currentYear ? since + '-' + currentYear : currentYear
+  const copyrightDate =
+    parseInt(since) < currentYear ? since + '-' + currentYear : currentYear
   const { categoryOptions, customMenu } = props
 
-  return <footer id="footer-wrapper" className='relative bg-[#2A2A2A] justify-center w-full leading-6 text-gray-300 text-sm p-10'>
-
-        <div id='footer-container' className='w-full mx-auto max-w-screen-xl'>
-
-            <div className='flex'>
-                <div className='hidden md:flex flex-grow my-6 space-x-20 text-lg  '>
-
-                    {/* 分类菜单  */}
-                    <div>
-                        <div className='font-bold mb-4 text-white'>{siteConfig('COMMERCE_TEXT_FOOTER_MENU_1', 'Product Center')}</div>
-                        <nav id='home-nav-button' className={'flex flex-col space-y-2 text-start'}>
-                            {categoryOptions?.map(category => {
-                              return (
-                                    <Link
-                                        key={`${category.name}`}
-                                        title={`${category.name}`}
-                                        href={`/category/${category.name}`}
-                                        passHref>
-                                        {category.name}
-                                    </Link>
-                              )
-                            })}
-                        </nav>
-                    </div>
-
-                    {/* 系统菜单  */}
-                    <div>
-                        <div className='font-bold mb-4 text-white'>{siteConfig('COMMERCE_TEXT_FOOTER_MENU_2', 'About US')}</div>
-                        <nav id='home-nav-button' className={'flex flex-col space-y-2 text-start'}>
-                            {customMenu?.map(menu => {
-                              return (
-                                    <Link
-                                        key={`${menu.name}`}
-                                        title={`${menu.name}`}
-                                        href={`${menu.to}`}
-                                        passHref>
-                                        {menu.name}
-                                    </Link>
-                              )
-                            })}
-                        </nav>
-                    </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')}</div>
-                    <div className='space-y-4'>
-                        <div className='flex space-x-4 text-2xl'>
-                            {JSON.parse(siteConfig('COMMERCE_CONTACT_WHATSAPP_SHOW'), true) && <div>
-                                {<a target='_blank' rel='noreferrer' href={siteConfig('CONTACT_WHATSAPP', '#')} 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)) && <div>
-                                {<a target='_blank' rel='noreferrer' href={siteConfig('CONTACT_TELEGRAM', '#')} 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') && <div>
-                            <i className='transform hover:scale-125 duration-150 fas fa-user dark:hover:text-red-400 hover:text-red-600' />  {siteConfig('CONTACT_PHONE')}
-                        </div>}</div>
-                    </div>
-                </div>}
+  return (
+    <footer
+      id='footer-wrapper'
+      className='relative bg-[#2A2A2A] justify-center w-full leading-6 text-gray-300 text-sm p-10'>
+      <div id='footer-container' className='w-full mx-auto max-w-screen-xl'>
+        <div className='flex'>
+          {/* 页脚左侧菜单组 */}
+          <div className='hidden md:flex flex-grow my-6 space-x-20 text-lg  '>
+            {/* 分类菜单  */}
+            <div>
+              <div className='font-bold mb-4 text-white'>
+                {siteConfig('COMMERCE_TEXT_FOOTER_MENU_1', 'Product Center')}
+              </div>
+              <nav
+                id='home-nav-button'
+                className={'flex flex-col space-y-2 text-start'}>
+                {categoryOptions?.map(category => {
+                  return (
+                    <Link
+                      key={`${category.name}`}
+                      title={`${category.name}`}
+                      href={`/category/${category.name}`}
+                      passHref>
+                      {category.name}
+                    </Link>
+                  )
+                })}
+              </nav>
             </div>
 
-            {/* 底部版权相关 */}
-            <div id='footer-copyright-wrapper' className='flex flex-col md:flex-row justify-between border-t border-gray-600 pt-8'>
-                <div className='text-start space-y-1'>
-
-                    {/* 网站所有者 */}
-                    <div> Copyright <i className='fas fa-copyright' /> {`${copyrightDate}`} <a href={siteConfig('LINK')} className='underline font-bold  dark:text-gray-300 '>{siteConfig('AUTHOR')}</a> All Rights Reserved.</div>
-
-                    {/* 技术支持 */}
-                    <div className='text-xs text-light-500 dark:text-gray-700'>Powered by <a href='https://github.com/tangly1024/NotionNext' className='dark:text-gray-300'>NotionNext {siteConfig('VERSION')}</a>.</div>
-
-                    {/* 站点统计 */}
-                    <div>
-                        <span className='hidden busuanzi_container_site_pv'>
-                            <i className='fas fa-eye' /><span className='px-1 busuanzi_value_site_pv'> </span>  </span>
-                        <span className='pl-2 hidden busuanzi_container_site_uv'>
-                            <i className='fas fa-users' /> <span className='px-1 busuanzi_value_site_uv'> </span> </span>
-                    </div>
-                </div>
-
-                {/* 右边公司名字 */}
-                <div className='md:text-right'>
-                    <h1 className='text-xs pt-4 text-light-400 dark:text-gray-400'>{siteConfig('TITLE')} {siteConfig('BIO')}</h1>
-                    <h2> {siteConfig('DESCRIPTION')}</h2>
-                    {/* 可选备案信息 */}
-                    {siteConfig('BEI_AN') && <><i className='fas fa-shield-alt' /> <a href='https://beian.miit.gov.cn/' className='mr-2'>{siteConfig('BEI_AN')}</a></>}
-                </div>
+            {/* 系统菜单  */}
+            <div>
+              <div className='font-bold mb-4 text-white'>
+                {siteConfig('COMMERCE_TEXT_FOOTER_MENU_2', 'About US')}
+              </div>
+              <nav
+                id='home-nav-button'
+                className={'flex flex-col space-y-2 text-start'}>
+                {customMenu?.map(menu => {
+                  return (
+                    <Link
+                      key={`${menu.name}`}
+                      title={`${menu.name}`}
+                      href={`${menu.to}`}
+                      passHref>
+                      {menu.name}
+                    </Link>
+                  )
+                })}
+              </nav>
             </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', CONFIG)}`}>
+                      <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, CONFIG) && (
+                    <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, CONFIG)}
+                    </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,
+                    CONFIG
+                  )}></img>
+              </div>
+              <div className='space-y-4'>
+                <div className='flex space-x-4 text-center'>
+                  {siteConfig('COMMERCE_FOOTER_RIGHT_TEXT', null, CONFIG)}
+                </div>
+              </div>
+            </div>
+          }
         </div>
 
-    </footer >
+        {/* 底部版权相关 */}
+        <div
+          id='footer-copyright-wrapper'
+          className='flex flex-col md:flex-row justify-between border-t border-gray-600 pt-8'>
+          <div className='text-start space-y-1'>
+            {/* 网站所有者 */}
+            <div>
+              {' '}
+              Copyright <i className='fas fa-copyright' /> {`${copyrightDate}`}{' '}
+              <a
+                href={siteConfig('LINK')}
+                className='underline font-bold  dark:text-gray-300 '>
+                {siteConfig('AUTHOR')}
+              </a>{' '}
+              All Rights Reserved.
+            </div>
+
+            {/* 技术支持 */}
+            <div className='text-xs text-light-500 dark:text-gray-700'>
+              Powered by{' '}
+              <a
+                href='https://github.com/tangly1024/NotionNext'
+                className='dark:text-gray-300'>
+                NotionNext {siteConfig('VERSION')}
+              </a>
+              .
+            </div>
+
+            {/* 站点统计 */}
+            <div>
+              <span className='hidden busuanzi_container_site_pv'>
+                <i className='fas fa-eye' />
+                <span className='px-1 busuanzi_value_site_pv'> </span>{' '}
+              </span>
+              <span className='pl-2 hidden busuanzi_container_site_uv'>
+                <i className='fas fa-users' />{' '}
+                <span className='px-1 busuanzi_value_site_uv'> </span>{' '}
+              </span>
+            </div>
+          </div>
+
+          {/* 右边公司名字 */}
+          <div className='md:text-right'>
+            <h1 className='text-xs pt-4 text-light-400 dark:text-gray-400'>
+              {siteConfig('TITLE')} {siteConfig('BIO')}
+            </h1>
+            <h2> {siteConfig('DESCRIPTION')}</h2>
+            {/* 可选备案信息 */}
+            {siteConfig('BEI_AN') && (
+              <>
+                <i className='fas fa-shield-alt' />{' '}
+                <a href='https://beian.miit.gov.cn/' className='mr-2'>
+                  {siteConfig('BEI_AN')}
+                </a>
+              </>
+            )}
+          </div>
+        </div>
+      </div>
+    </footer>
+  )
 }
 
 export default Footer
diff --git a/themes/commerce/config.js b/themes/commerce/config.js
index 8315ac97..4c3e872a 100644
--- a/themes/commerce/config.js
+++ b/themes/commerce/config.js
@@ -9,6 +9,10 @@ const CONFIG = {
   COMMERCE_TEXT_FOOTER_TITLE: 'Contact US', // COMMERCE主题页脚文案标题；按Shift+Enter键可以换行
   COMMERCE_TEXT_FOOTER_MENU_1: 'Product Center', // COMMERCE主题页脚左侧菜单标题1
   COMMERCE_TEXT_FOOTER_MENU_2: 'About US', // COMMERCE主题页脚左侧菜单标题2
+
+  COMMERCE_FOOTER_RIGHT_IMG_URL: null, // 显示页脚右侧的图片，通常放二维码
+  COMMERCE_FOOTER_RIGHT_TEXT: null, // 页脚右侧图片下的文字描述
+
   COMMERCE_HOME_POSTS_COUNT: 9, // 首页展示商品数
   COMMERCE_CONTACT_WHATSAPP_SHOW: true, // 是否展示whatsapp联系按钮 请配置 CONTACT_WHATSAPP
   COMMERCE_CONTACT_TELEGRAM_SHOW: true // 联系栏展示telegram按钮 请配置 CONTACT_TELEGRAM