From 873a312ac04c0e0f3aa546c2e0fb51f872ccee55 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Mon, 1 Apr 2019 13:48:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=B7=E8=AF=AD?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2amp=E9=A1=B5=E9=9D=A2=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../htmlcompressor/controllers/index_gm.php           | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/third_party/htmlcompressor/controllers/index_gm.php b/application/third_party/htmlcompressor/controllers/index_gm.php
index 0a987645..0ee105f1 100644
--- a/application/third_party/htmlcompressor/controllers/index_gm.php
+++ b/application/third_party/htmlcompressor/controllers/index_gm.php
@@ -279,16 +279,21 @@ class Index_gm extends CI_Controller
 				//添加webp图片支持
 				$img_src_webp='';
 				if(substr($img_src, -4) == '.jpg'){
-					$img_src_jpg=" <amp-img fallback layout=\"responsive\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\"></amp-img>";
+					if($img_size->width < 400){
+						$layout = 'fixed';
+					}else{
+						$layout = 'responsive';
+					}
+					$img_src_jpg=" <amp-img fallback layout=\"{$layout}\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\"></amp-img>";
 					
 					$img_src_webp=substr($img_src, 0, strlen($img_src) - 4).'.webp';
 					
-					$img_src_webp = " <amp-img layout=\"responsive\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src_webp}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\">{$img_src_jpg}</amp-img>";
+					$img_src_webp = " <amp-img layout=\"{$layout}\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src_webp}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\">{$img_src_jpg}</amp-img>";
 				}
 				if(!empty($img_src_webp)){
 					$image->outertext =$img_src_webp;
 				}else{
-					$image->outertext = " <amp-img layout=\"responsive\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\"></amp-img>";
+					$image->outertext = " <amp-img layout=\"{$layout}\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\"></amp-img>";
 				}
             }
         }

From b624a3f0bd7dd50a6d561f4999259ea108f657d1 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Mon, 1 Apr 2019 14:00:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=B7=E8=AF=ADAMP?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/htmlcompressor/controllers/index_gm.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/third_party/htmlcompressor/controllers/index_gm.php b/application/third_party/htmlcompressor/controllers/index_gm.php
index 0ee105f1..33c8e074 100644
--- a/application/third_party/htmlcompressor/controllers/index_gm.php
+++ b/application/third_party/htmlcompressor/controllers/index_gm.php
@@ -278,11 +278,10 @@ class Index_gm extends CI_Controller
             if (!empty($img_size)) {
 				//添加webp图片支持
 				$img_src_webp='';
+				$layout = 'responsive';
 				if(substr($img_src, -4) == '.jpg'){
 					if($img_size->width < 400){
 						$layout = 'fixed';
-					}else{
-						$layout = 'responsive';
 					}
 					$img_src_jpg=" <amp-img fallback layout=\"{$layout}\" class=\"{$img_class}\" alt=\"{$img_alt}\" src=\"{$img_src}\" width=\"{$img_size->width}\" height=\"{$img_size->height}\"></amp-img>";
 					

From 63f6659242ab7f5eb2d8392f6b4387d7e655660b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Tue, 2 Apr 2019 16:36:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=A2=9E=E5=8A=A011?=
 =?UTF-8?q?=E4=B8=BA=E6=9C=80=E9=AB=98=E7=BA=A7=E7=9A=84=E4=B8=AD=E9=97=B4?=
 =?UTF-8?q?=E5=A4=A7=E5=9B=BE=E7=94=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/information_edit.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index b5a4bce8..a2bf64f4 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1267,6 +1267,7 @@ $meta_subnavi_arr = array(
                   <option value="8" <?php echo get_meta($information->ic_id, 'meta_attraction_Order') === '8' ? 'selected' : false; ?>>8</option>
                   <option value="9" <?php echo get_meta($information->ic_id, 'meta_attraction_Order') === '9' ? 'selected' : false; ?>>9</option>
                   <option value="10" <?php echo get_meta($information->ic_id, 'meta_attraction_Order') === '10' ? 'selected' : false; ?>>10</option>
+                  <option value="11" <?php echo get_meta($information->ic_id, 'meta_attraction_Order') === '11' ? 'selected' : false; ?>>11</option>
                 </select>
               </div>