From 94574e015ddfd4352bf3cc048852658e615fd485 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 18:35:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-h1.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/mobile_first/gh-h1.php b/application/views/mobile_first/gh-h1.php index 5a279417..bc16ba63 100644 --- a/application/views/mobile_first/gh-h1.php +++ b/application/views/mobile_first/gh-h1.php @@ -1,8 +1,4 @@
- - <?php echo !empty($ic_title)?$ic_title:'H1 title globalhighlights mobile first template'; ?> -
From 08e87a38026c4170eccb608207f9d28b02d6c1ff Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 19:08:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=BA=95=E9=83=A8newsletter=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=A7=BB=E8=87=B3=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=B8=BA=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 21 ++------------------- application/views/mobile_first/gh.php | 18 +----------------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index b4bf250e..a55feacb 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -231,7 +231,7 @@
We are here to help you...
start planning your tailor-made trip with 1-1 help from our travel advisors. -
Create Your Trip
+
From f2cda3dfaa4be8726f268510b03b78165aaae9b4 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 19:14:13 +0800 Subject: [PATCH 3/9] 11 --- application/views/mobile_first/gh-pc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index a55feacb..5ab95b84 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -231,7 +231,7 @@
We are here to help you...
start planning your tailor-made trip with 1-1 help from our travel advisors. - +
Create Your Trip
-
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 500a9a23..3a9bf84b 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -333,8 +333,6 @@ - - From 33d83cc68a02ad6b384f8c19c81e041b70052b25 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 3 Apr 2024 09:35:17 +0800 Subject: [PATCH 5/9] fix --- application/views/cache/update.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/cache/update.php b/application/views/cache/update.php index ba5145e3..a624da67 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -176,8 +176,7 @@ 更新 @@ -197,6 +196,7 @@ $it) { $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8')); $_it = mb_convert_encoding($it, 'UTF8', $encode); + $_it = preg_replace('/#(.*)$/i', '', $_it); ?> From a136eefbe64973c7d47f97b36ae97e270a338846 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 3 Apr 2024 09:37:47 +0800 Subject: [PATCH 6/9] tewt --- application/views/cache/update.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/cache/update.php b/application/views/cache/update.php index a624da67..17140bf7 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -194,8 +194,8 @@ $it) { - $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8')); - $_it = mb_convert_encoding($it, 'UTF8', $encode); + // $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8')); + // $_it = mb_convert_encoding($it, 'UTF8', $encode); $_it = preg_replace('/#(.*)$/i', '', $_it); ?> From f7cdf689b5d3c28b489e6a3475f250e1cbe31453 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 3 Apr 2024 09:45:54 +0800 Subject: [PATCH 7/9] da --- application/views/cache/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/cache/update.php b/application/views/cache/update.php index 17140bf7..099e8704 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -213,7 +213,7 @@ - + 无操作 From 6c7d943631f820196e4d6a2922f5903ba282d950 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 3 Apr 2024 09:46:39 +0800 Subject: [PATCH 8/9] fix --- application/views/cache/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/cache/update.php b/application/views/cache/update.php index 099e8704..522d7325 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -196,7 +196,7 @@ $it) { // $encode = mb_detect_encoding($it, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8')); // $_it = mb_convert_encoding($it, 'UTF8', $encode); - $_it = preg_replace('/#(.*)$/i', '', $_it); + $_it = preg_replace('/#(.*)$/i', '', $it); ?> From a269b1fdf454c4534d9f0f92ad131675a0263294 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 3 Apr 2024 09:52:14 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0about=20us?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 29 ++++-------------------- application/views/mobile_first/ch.php | 1 + 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index c0943d05..5a707d10 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -128,8 +128,10 @@
  • Yunnan
    • -
  • Hong Kong
    • +
  • Asia Tours
    • @@ -255,30 +257,6 @@
    -
  • Asia Tours -
    - -
    -
  • Day Tours
      @@ -297,6 +275,7 @@
    • +
  • About us
  • Contact us
    • diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 3a9bf84b..3b3480dd 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -118,6 +118,7 @@ href="#">Day Tours +