From 8c9108924762058928fa37d27277c32da5b7ccdf Mon Sep 17 00:00:00 2001
From: Gongxinshu <1289453099@qq.com>
Date: Mon, 10 Jan 2022 10:34:35 +0800
Subject: [PATCH 1/3] 1.10

---
 view/article/products.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/article/products.html b/view/article/products.html
index 8b2c51d..5329ae6 100644
--- a/view/article/products.html
+++ b/view/article/products.html
@@ -51,7 +51,7 @@
                 <ul>
                     {foreach $items as $item}
                     <li>
-                        <a href="{:url('article/detail', ['id' => $item.id, 'source'=>$categoryId])}">
+                        <a>
                             <span><img src="{:getImgSrc($item, '__IMG__/default_bg.jpg')}" ></span><p>{$item.title}</p>
                         </a>
                     </li>

From a6f72605982a3332c136271dafca9002a9f1115f Mon Sep 17 00:00:00 2001
From: Gongxinshu <1289453099@qq.com>
Date: Mon, 10 Jan 2022 16:46:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.10=E5=AD=97=E4=BD=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/static/css/style.css b/public/static/css/style.css
index 595f51c..218fbf4 100644
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -187,7 +187,7 @@ input,select,textarea{outline:medium none; resize: none;}
 .about-box1::after{ content: ''; width: 100%; height: 30vh; background: url(../image/ab1_bg.jpg) no-repeat center; position: absolute; left: 0; bottom: 0; z-index: -1;}
 .about-box1 .pull-left{ width: 42%;}
 .about-box1 .pull-right{ width: 55%;}
-.about-box1 .pull-right .box-info{ font-size: 0.875rem; color: #999; line-height: 1.6; margin-top: 1.25rem;}
+.about-box1 .pull-right .box-info{ font-size: 16px; color: #999; line-height: 1.6; margin-top: 1.25rem;}
 
 .about-box2{ padding: 5rem 0;}
 .about-box2 .top-box .all-title-box2{ padding-right: 1.25rem;}

From 802fcf5d1ac6179cf5ed3716c85b7fb7de9310bd Mon Sep 17 00:00:00 2001
From: Gongxinshu <1289453099@qq.com>
Date: Mon, 10 Jan 2022 17:11:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.10=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/style.css | 10 ++++++++--
 view/page/about.html        |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/static/css/style.css b/public/static/css/style.css
index 218fbf4..615d2f0 100644
--- a/public/static/css/style.css
+++ b/public/static/css/style.css
@@ -182,10 +182,16 @@ input,select,textarea{outline:medium none; resize: none;}
 
 .all-title-box2 span{ display: block; font-size: 2.7rem;}
 .all-title-box2 p{ font-size: 1.125rem; color: #666; margin-top: 0.1875rem;}
-
+.disFlex{display: flex;justify-content: space-between}
 .about-box1{ height: 100vh; position: relative;}
 .about-box1::after{ content: ''; width: 100%; height: 30vh; background: url(../image/ab1_bg.jpg) no-repeat center; position: absolute; left: 0; bottom: 0; z-index: -1;}
-.about-box1 .pull-left{ width: 42%;}
+.about-box1 .pull-left{ width: 42%; overflow: hidden;}
+.about-box1 .pull-left .imgH{
+    width: 100%;
+}
+.about-box1 .disFlex{
+    align-items: flex-end;
+}
 .about-box1 .pull-right{ width: 55%;}
 .about-box1 .pull-right .box-info{ font-size: 16px; color: #999; line-height: 1.6; margin-top: 1.25rem;}
 
diff --git a/view/page/about.html b/view/page/about.html
index 304182f..cfc8508 100644
--- a/view/page/about.html
+++ b/view/page/about.html
@@ -11,8 +11,8 @@
 <!--  Company  -->
 <div class="all-center-box">
     <div class="about-box1 w-100 center-center" id="about1">
-        <div class="w-1200">
-            <div class="pull-left"><img src="{$blocks['company']['img']['value'] ?? ''}" ></div>
+        <div class="w-1200 disFlex">
+            <div class="pull-left"><img class="imgH" src="{$blocks['company']['img']['value'] ?? ''}" ></div>
             <div class="pull-right">
                 <div class="all-title-box2 w-100"><span>{$blocks['company']['title']['value'] ?? ''}</span><p>{$blocks['company']['subtitle']['value'] ?? ''}</p></div>
                 <div class="box-info w-100">{:nl2br($blocks['company']['description']['value'] ?? '')}</div>