From 56ac332d043527f23d968ba722680466e37f194d Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 10:24:50 +0800 Subject: [PATCH 01/21] 11 --- .../views/mobile_first/gh-feedback-30-list.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/application/views/mobile_first/gh-feedback-30-list.php b/application/views/mobile_first/gh-feedback-30-list.php index a3eb74d5..4513df98 100644 --- a/application/views/mobile_first/gh-feedback-30-list.php +++ b/application/views/mobile_first/gh-feedback-30-list.php @@ -14,7 +14,7 @@ width="175px" class="img-responsive"> - + $feedback) {?>
@@ -24,18 +24,5 @@
-
-
Asia Highlights Reviews
- -
- -
-
+ \ No newline at end of file From 674dc67cdd5a2b2d208a4573c40c9d32ae4a7bd7 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 10:51:14 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=96=B0=E5=A2=9EGH=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile_first/gh-feedback-city-list.php | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 application/views/mobile_first/gh-feedback-city-list.php diff --git a/application/views/mobile_first/gh-feedback-city-list.php b/application/views/mobile_first/gh-feedback-city-list.php new file mode 100644 index 00000000..c0a71e27 --- /dev/null +++ b/application/views/mobile_first/gh-feedback-city-list.php @@ -0,0 +1,99 @@ + + + +

Thailand Travel Reviews

+ + $feedback) {?> + + + + + + +

Vietnam Travel Reviews

+ + $feedback) {?> + + + + + + +

Cambodia Travel Reviews

+ + $feedback) {?> + + + + + + +

Japan Travel Reviews

+ + $feedback) {?> + + + + + + + + +

Myanmar Travel Reviews

+ + $feedback) {?> + + + + + + +

China Travel Reviews

+ + $feedback) {?> + + + \ No newline at end of file From 890b15f7ba120e4b27809fc2ce674f645aa9fc4a Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 10:52:58 +0800 Subject: [PATCH 03/21] 11 --- application/views/mobile_first/ah-pc.php | 4 ++++ application/views/mobile_first/ah.php | 4 ++++ application/views/mobile_first/ch-pc.php | 4 ++++ application/views/mobile_first/ch.php | 5 ++++- application/views/mobile_first/gh-pc.php | 4 ++++ application/views/mobile_first/gh.php | 4 ++++ 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 4bb01b6a..a44f472d 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -422,6 +422,10 @@
+

Where can we take you to day?

diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 98334d2b..b3b53d68 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -397,6 +397,10 @@
+

Where can we take you to day?

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index a5eefb7a..aee8ece9 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -408,6 +408,10 @@
+

Where can we take you to day?

diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index e5760f40..96e1c218 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -423,7 +423,10 @@
- +

Where can we take you to day?

    diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 74efa8c0..1ab5eefe 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -441,6 +441,10 @@
    +

    Where can we take you to day?

    diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index ee0fe744..1b093ea5 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -294,6 +294,10 @@ aria-label="festival">
    +

    Where can we take you to day?

    From 018ceef54226daa8b5616a80c3024268d0a71c6f Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 13:42:54 +0800 Subject: [PATCH 04/21] 11 --- application/views/mobile_first/ah-pc.php | 2 +- application/views/mobile_first/ah.php | 2 +- application/views/mobile_first/ch-pc.php | 2 +- application/views/mobile_first/ch.php | 2 +- application/views/mobile_first/gh-pc.php | 2 +- application/views/mobile_first/gh.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index a44f472d..d4da2a90 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -425,7 +425,7 @@

    Where can we take you to day?

    +">Where Can We Take You Today?/h2>
    diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index b3b53d68..407c20ee 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -400,7 +400,7 @@

    Where can we take you to day?

    +">Where Can We Take You Today?
    diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index aee8ece9..d4e2a122 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -411,7 +411,7 @@

    Where can we take you to day?

    +">Where Can We Take You Today?
    diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index 96e1c218..1ab177c1 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -426,7 +426,7 @@

    Where can we take you to day?

    +">Where Can We Take You Today?
      diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 1ab5eefe..abaa9453 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -444,7 +444,7 @@

      Where can we take you to day?

      +">Where Can We Take You Today?
      diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 1b093ea5..d3f5b041 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -297,7 +297,7 @@ aria-label="festival">

      Where can we take you to day?

      +">Where Can We Take You Today?
      From cb96cc231f957080b7bcb4c93992909f4e53d509 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 13:45:24 +0800 Subject: [PATCH 05/21] 11 --- application/views/mobile_first/ah-pc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index d4da2a90..00011776 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -425,7 +425,7 @@

      Where Can We Take You Today?/h2> +">Where Can We Take You Today?

      From f69bd6b2ff09a2a806aade92852983df1540dfab Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Mon, 10 Jul 2023 13:54:08 +0800 Subject: [PATCH 06/21] =?UTF-8?q?CH=E3=80=81GH=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=E9=9B=86=E5=90=88=E9=A1=B5=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 56 ++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 3cc5b5fa..0d7c22cf 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -678,6 +678,33 @@ class Information extends CI_Controller } } + // 集合页面反馈标签 + $feedback_city_array = []; + preg_match_all('^^', $information->ic_content, $feedback_city_array); + if (!empty($feedback_city_array)) { + foreach ($feedback_city_array[0] as $index => $tag_name) { + $city_name_string = $feedback_city_array[1][$index]; + $city_name_list = explode(',', $city_name_string); + $feedback_city_list = []; + foreach ($city_name_list as $index => $city_name) { + $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5); + $data_name = str_replace(" ", "_", $city_name); + $feedback_city_list[$data_name] = $feedback_list; + } + + $feedback_city_content = $this->load->view( + 'mobile_first/ch-feedback-city-list', + $feedback_city_list, + true + ); + $information->ic_content = str_replace( + $tag_name, + $feedback_city_content, + $information->ic_content + ); + } + } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); $feedback_newest_content = $this->load->view( $template_path . '-feedback-newest', @@ -1451,6 +1478,33 @@ class Information extends CI_Controller } } + // 集合页面反馈标签 + $feedback_city_array = []; + preg_match_all('^^', $information->ic_content, $feedback_city_array); + if (!empty($feedback_city_array)) { + foreach ($feedback_city_array[0] as $index => $tag_name) { + $city_name_string = $feedback_city_array[1][$index]; + $city_name_list = explode(',', $city_name_string); + $feedback_city_list = []; + foreach ($city_name_list as $index => $city_name) { + $feedback_list = $this->Feedback_model->get_feedback_by_city_name($city_name, 5); + $data_name = str_replace(" ", "_", $city_name); + $feedback_city_list[$data_name] = $feedback_list; + } + + $feedback_city_content = $this->load->view( + 'mobile_first/gh-feedback-city-list', + $feedback_city_list, + true + ); + $information->ic_content = str_replace( + $tag_name, + $feedback_city_content, + $information->ic_content + ); + } + } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); $feedback_newest_content = $this->load->view( $template_path . '-feedback-newest', @@ -2711,4 +2765,4 @@ class Information extends CI_Controller echo json_encode($data); return true; } -} \ No newline at end of file +} From f9c40e747ecdf839b3f3e90d5f761ac82d3b2aef Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 14:27:41 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0reviews?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 1 + application/views/mobile_first/gh.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index abaa9453..a502003e 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -241,6 +241,7 @@
    • About Us
      • +
    • Reviews
    • Contact Us
      • diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index d3f5b041..64acc6be 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -97,6 +97,7 @@ height="0" width="0" style="display:none;visibility:hidden"> +
    From c2dc9618684812658bf794f2b638d85098a6b95e Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 16:40:08 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E9=9B=86=E5=90=88=E9=A1=B5=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile_first/ch-feedback-city-list.php | 196 ++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 application/views/mobile_first/ch-feedback-city-list.php diff --git a/application/views/mobile_first/ch-feedback-city-list.php b/application/views/mobile_first/ch-feedback-city-list.php new file mode 100644 index 00000000..4a4e4c69 --- /dev/null +++ b/application/views/mobile_first/ch-feedback-city-list.php @@ -0,0 +1,196 @@ + + + +

    Beijing Travel Reviews

    + + $feedback) {?> + + + + + + +

    Xi'an Travel Reviews

    + + $feedback) {?> + + + + + + +

    Chengdu Travel Reviews

    + + $feedback) {?> + + + + + + +

    Guilin Travel Reviews

    + + $feedback) {?> + + + + + + +

    Tibet Travel Reviews

    + + $feedback) {?> + + + + + + +

    Suzhou Travel Reviews

    + + $feedback) {?> + + + + + + +

    Shanghai Travel Reviews

    + + $feedback) {?> + + + + + + +

    Zhangjiajie Travel Reviews

    + + $feedback) {?> + + + + + + +

    Lijiang Travel Reviews

    + + $feedback) {?> + + + + + + +

    Dali Travel Reviews

    + + $feedback) {?> + + + + + + +

    Kunming Travel Reviews

    + + $feedback) {?> + + + + + + +

    Huangshan Travel Reviews

    + + $feedback) {?> + + + + + + +

    China Panda Travel Reviews

    + + $feedback) {?> + + + + + + +

    Hangzhou Travel Reviews

    + + $feedback) {?> + + + \ No newline at end of file From 50c4a550a8b3bfa359941c6326520a26b10b4133 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 10 Jul 2023 16:50:08 +0800 Subject: [PATCH 09/21] 11 --- .../mobile_first/ch-feedback-city-list.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-city-list.php b/application/views/mobile_first/ch-feedback-city-list.php index 4a4e4c69..4a8741d9 100644 --- a/application/views/mobile_first/ch-feedback-city-list.php +++ b/application/views/mobile_first/ch-feedback-city-list.php @@ -58,8 +58,8 @@

    Tibet Travel Reviews

    - - $feedback) {?> + + $feedback) {?>
-
Middle East
+
Middle East
  • Egypt
    • diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index 64acc6be..3501a990 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -87,7 +87,7 @@ height="0" width="0" style="display:none;visibility:hidden"> - + From a478a10accdd5dc9dce321de7c3152c36afd2264 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 11 Jul 2023 09:56:08 +0800 Subject: [PATCH 11/21] 11 --- application/views/mobile_first/gh-tour-form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php index d9e1031e..931ad114 100644 --- a/application/views/mobile_first/gh-tour-form.php +++ b/application/views/mobile_first/gh-tour-form.php @@ -263,7 +263,7 @@ - +

    Having a phone number, especially with WhatsApp/iMessage capability will improve communication From 2766389cfbbe6a042ad3c6f440a7bac9dd9f8612 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 11 Jul 2023 10:40:52 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0reviews=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 | 4 +--- application/views/mobile_first/ah.php | 1 + application/views/mobile_first/ch-pc.php | 5 ++--- application/views/mobile_first/ch.php | 2 ++ application/views/mobile_first/gh-pc.php | 1 + application/views/mobile_first/gh.php | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 00011776..5b6d8fa9 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -526,11 +526,9 @@ style="width: 70%;" originalsrc="https://data.chinahighlights.com/pic/guide/info-template-feature-on.png" alt="Medias" class="img-responsive bottomfeature" style="opacity: 1; transition: opacity 0.5s ease-in-out 0s;"> -

- -
+
+
- +
  • Asia
  • Global
    • From e0039563b4b404de00ebbbbe66b6fae8432668ee Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 11 Jul 2023 16:32:31 +0800 Subject: [PATCH 15/21] 11 --- application/views/mobile_first/ah.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 80b3d7e0..7a558343 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -99,8 +99,9 @@ aria-owns="submenu-8">4-Week Itinerary - + +