From 58604e364afcf72b05a1a91cb9276ea7987e6739 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Thu, 8 Jun 2023 16:23:14 +0800
Subject: [PATCH 01/43] add gm hw meta
---
.../views/bootstrap3/information_edit.php | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 23aebf64..f7c809ca 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -1718,6 +1718,29 @@ $meta_subnavi_arr = array(
+ config->item('site_code') == 'gm') {?>
+
+
海外页面标签
+
+
+
+
+
+ ic_id, 'meta_haiwai');?>
+ selected="selected" value="">无
+ selected="selected" value="info">海外信息
+
+ selected="selected" value="tour">海外线路
+
+
+
+
+
ic_ht_area_type == 'g') {?>
From 35b0a20423a169572b93c2118519b397743f5a7d Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 8 Jun 2023 16:45:56 +0800
Subject: [PATCH 02/43] =?UTF-8?q?=E6=8C=8912=E4=B8=AA=E6=AF=8F=E7=BB=84?=
=?UTF-8?q?=E5=88=92=E5=88=86=E6=8E=A8=E8=8D=90=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/controllers/information.php | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/application/controllers/information.php b/application/controllers/information.php
index a9231e06..435bf8ef 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -994,7 +994,14 @@ class Information extends CI_Controller
$tipsRightList[] = $recommand_information[$key];
}
}
+
+ $firstList = array_slice($tipsRightList, 0, 12);
+ $secondList = array_slice($tipsRightList, 12, 12);
+ $thirdList = array_slice($tipsRightList, 24, 12);
var_dump($tipsRightList);
+ var_dump($firstList);
+ var_dump($secondList);
+ var_dump($thirdList);
}
public function test_feedback()
From a0106af21b7b40db60afedd1a8b050f06bc08d57 Mon Sep 17 00:00:00 2001
From: candice
Date: Fri, 9 Jun 2023 09:51:22 +0800
Subject: [PATCH 03/43] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AAconta?=
=?UTF-8?q?ct=20us=E6=8C=89=E9=92=AE=E5=92=8C=E5=B7=A6=E4=B8=8B=E8=A7=92TM?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BA=92=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/views/mobile_first/ch-pc.php | 4 ++--
application/views/mobile_first/ch.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index ff3007e0..91eecb7b 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -209,7 +209,7 @@
- Create my trip
+ Contact us
@@ -240,7 +240,7 @@
-
+
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index a72d51ec..c10172fd 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -46,7 +46,7 @@
@@ -274,7 +274,7 @@
-
From 32a20ef4153cdce786f948b489a248362911bae9 Mon Sep 17 00:00:00 2001
From: candice
Date: Fri, 9 Jun 2023 09:58:43 +0800
Subject: [PATCH 04/43] 11
---
application/views/mobile_first/ch.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index c10172fd..53df6124 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -46,7 +46,7 @@
@@ -274,7 +274,7 @@
-
From 5d1d5908cf947deb9809bf60ec721e653eb07c42 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 9 Jun 2023 10:59:43 +0800
Subject: [PATCH 05/43] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=B3=E4=BE=A7?=
=?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B9=BF=E5=91=8A=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/controllers/information.php | 12 +++++++++-
.../views/mobile_first/ah-list-tips-right.php | 24 +++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 application/views/mobile_first/ah-list-tips-right.php
diff --git a/application/controllers/information.php b/application/controllers/information.php
index 435bf8ef..33281573 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -988,7 +988,7 @@ class Information extends CI_Controller
$information = $this->Information_model->Detail($this->input->get('is_id'));
$recommand_information = $this->recommand_information($information);
$tipsRightList = [];
- for ($i=0; $i < 36; $i++) {
+ for ($i=1; $i <= 36; $i++) {
$key = 'List Tips Right '.$i;
if (array_key_exists($key, $recommand_information)) {
$tipsRightList[] = $recommand_information[$key];
@@ -1002,6 +1002,16 @@ class Information extends CI_Controller
var_dump($firstList);
var_dump($secondList);
var_dump($thirdList);
+
+ $tips_right_list_content = $this->load->view(
+ 'ah-list-tips-right',
+ array(
+ 'tips_right_first' => $firstList,
+ 'tips_right_second' => $secondList,
+ 'tips_right_third' => $thirdList),
+ true
+ );
+ echo $tips_right_list_content;
}
public function test_feedback()
diff --git a/application/views/mobile_first/ah-list-tips-right.php b/application/views/mobile_first/ah-list-tips-right.php
new file mode 100644
index 00000000..45fb2901
--- /dev/null
+++ b/application/views/mobile_first/ah-list-tips-right.php
@@ -0,0 +1,24 @@
+Choose best time to visit
+
+Popular Asia tours
+
+Make the most of Your Time
+
\ No newline at end of file
From 98e72fb483b537b54745d8c98b6be59065784123 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 9 Jun 2023 11:01:21 +0800
Subject: [PATCH 06/43] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=86=E5=9B=BE?=
=?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/controllers/information.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/controllers/information.php b/application/controllers/information.php
index 33281573..f4e9c065 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1004,7 +1004,7 @@ class Information extends CI_Controller
var_dump($thirdList);
$tips_right_list_content = $this->load->view(
- 'ah-list-tips-right',
+ 'mobile_first/ah-list-tips-right',
array(
'tips_right_first' => $firstList,
'tips_right_second' => $secondList,
From 378fa4364a73875cb44f45387452ef99b7ae11d4 Mon Sep 17 00:00:00 2001
From: candice
Date: Fri, 9 Jun 2023 11:02:10 +0800
Subject: [PATCH 07/43] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BF?=
=?UTF-8?q?=E5=8A=A0GH=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/ch-pc.php | 20 ++++++++++++++++++++
application/views/mobile_first/ch.php | 16 +++++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 91eecb7b..de5bbf0c 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -390,6 +390,25 @@
+
+
+
-
From b4a346c5d173f783145bb5734881b8055228d02a Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 9 Jun 2023 11:04:35 +0800
Subject: [PATCH 08/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/views/mobile_first/ah-list-tips-right.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/application/views/mobile_first/ah-list-tips-right.php b/application/views/mobile_first/ah-list-tips-right.php
index 45fb2901..e23391ec 100644
--- a/application/views/mobile_first/ah-list-tips-right.php
+++ b/application/views/mobile_first/ah-list-tips-right.php
@@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@
@@ -18,7 +18,7 @@
\ No newline at end of file
From 44b504ae0198aef3b97f0b99e92c99e3a71f7ff2 Mon Sep 17 00:00:00 2001
From: candice
Date: Fri, 9 Jun 2023 11:09:39 +0800
Subject: [PATCH 09/43] 11
---
application/views/mobile_first/ch-pc.php | 313 +++++++++++++----------
application/views/mobile_first/ch.php | 1 -
2 files changed, 176 insertions(+), 138 deletions(-)
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index de5bbf0c..e196f298 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -88,21 +88,34 @@
id="china_destinations_2021">Destinations
@@ -124,20 +137,27 @@
China Weather
- 3 Weeks in China
- 17 Days in China
- 2 Weeks in China
- 12 Days in China
- 10 Days in China
- 8 Days in China
- 5 Days in China
+ 3 Weeks in
+ China
+ 17 Days in
+ China
+ 2 Weeks in
+ China
+ 12 Days in
+ China
+ 10 Days in
+ China
+ 8 Days in
+ China
+ 5 Days in
+ China
@@ -171,7 +191,8 @@
Schedules
Train Travel
Flight
- Train App
+ Train App
Download
@@ -179,13 +200,23 @@
Asia Tours
@@ -207,27 +238,30 @@
Activities
-
+
- Contact us
-
-
+ Contact us
+
+
-
@@ -240,7 +274,8 @@
-
+
@@ -258,7 +293,8 @@
We are here to help you... start planning your tailor-made tour with 1-1
help from our travel advisors.
- Create Your Trip
+ Create Your Trip
@@ -312,105 +348,108 @@
-
-
+
China Highlights tailor-makes China tours to help travelers discover China
From 7cd965fc645ea8d0b33e5f62ad7865fe7e68cead Mon Sep 17 00:00:00 2001
From: candice
Date: Fri, 9 Jun 2023 11:21:24 +0800
Subject: [PATCH 11/43] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BF?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0GH=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/ah-pc.php | 26 ++++++++++++++++++++++++
application/views/mobile_first/ah.php | 16 +++++++++++++++
application/views/mobile_first/ch.php | 2 ++
3 files changed, 44 insertions(+)
diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index fddd3712..bf01d096 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -398,6 +398,32 @@
+
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index e8a64bf1..1998a40a 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -317,6 +317,22 @@
+
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 991aa8b1..f27629a8 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -410,6 +410,8 @@
From b249a3fc3d3eb688c43314b5929999136c1bc97f Mon Sep 17 00:00:00 2001
From: candice
Date: Fri, 9 Jun 2023 11:56:54 +0800
Subject: [PATCH 12/43] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
=?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/views/mobile_first/ah-pc.php | 13 ++++++++-----
application/views/mobile_first/ah.php | 19 ++++++++++++++++---
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index bf01d096..988653c1 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -71,6 +71,7 @@
@@ -190,10 +191,12 @@
@@ -219,6 +222,7 @@