From 0999f5fbcdeb87ce928888c217011ff5c933494f Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 13 Mar 2024 10:17:29 +0800 Subject: [PATCH 01/48] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 31e6e6c6..14dfea0c 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -219,17 +219,20 @@
-

Why Asia Highlights (10,000+ reviews & 98.8% 5-star rating)

+

Why Asia Highlights (10,000+ reviews & 98.8% 5-star rating)

+ -
+ From 3fd1a82def5f57071ef5c7d8fc0fd666a7d7c56e Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 13 Mar 2024 10:38:38 +0800 Subject: [PATCH 02/48] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 7e4f12df..ec6cbe19 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -204,17 +204,20 @@
-

Why Global Highlights (10,000+ reviews & 98.8% 5-star rating)

+

Why Global Highlights (10,000+ reviews & 98.8% 5-star rating)

+
    -
  • Save Your Time: Less research, more enjoyment!
    -Real-time 1V1 expert planning
    • -
  • Maximize Your Flexibility: Personal local guide and ride
    -Explore at your own pace -
    • -
  • Celebrate Your Journeys: Specially-crafted family adventures
    -Celebrate milestones with style!
    • +
  • Save Your Time:
    • +
  • Less research, more enjoyment!
    • +
  • Real-time 1V1 expert planning
    • +
  • Maximize Your Flexibility:
    • +
  • Personal local guide and ride
    • +
  • Explore at your own pace
    • +
  • Celebrate Your Journeys:
    • +
  • Specially-crafted family adventures
    • +
  • Celebrate milestones with style!
-
+
Create From fca64df64d8851a6eb115554131f9b20fd892c01 Mon Sep 17 00:00:00 2001 From: candice Date: Wed, 13 Mar 2024 16:56:05 +0800 Subject: [PATCH 03/48] =?UTF-8?q?html=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-tips-right-list.php | 12 ++++++------ .../views/mobile_first/ch-tips-right-list.php | 15 +++++++++------ .../views/mobile_first/gh-tips-right-list.php | 12 ++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/ah-tips-right-list.php index 211b7943..c0c9480c 100644 --- a/application/views/mobile_first/ah-tips-right-list.php +++ b/application/views/mobile_first/ah-tips-right-list.php @@ -1,22 +1,22 @@
-
Popular tours
-
+ +
Popular tours
-
Make the most of your time
-
+ +
Make the most of your time
-
Choose the best time to visit
-
+ +
Choose the best time to visit
    $info) {?>
  • ic_title ?>
    • diff --git a/application/views/mobile_first/ch-tips-right-list.php b/application/views/mobile_first/ch-tips-right-list.php index 211b7943..8ee5a50d 100644 --- a/application/views/mobile_first/ch-tips-right-list.php +++ b/application/views/mobile_first/ch-tips-right-list.php @@ -1,22 +1,25 @@
    -
    Popular tours
    -
    + +
    +
    Popular tours
    -
    Make the most of your time
    -
    + +
    +
    Make the most of your time
    -
    Choose the best time to visit
    -
    + +
    +
    Choose the best time to visit
      $info) {?>
    • ic_title ?>
      • diff --git a/application/views/mobile_first/gh-tips-right-list.php b/application/views/mobile_first/gh-tips-right-list.php index 211b7943..c0c9480c 100644 --- a/application/views/mobile_first/gh-tips-right-list.php +++ b/application/views/mobile_first/gh-tips-right-list.php @@ -1,22 +1,22 @@
      -
      Popular tours
      -
      + +
      Popular tours
      -
      Make the most of your time
      -
      + +
      Make the most of your time
      -
      Choose the best time to visit
      -
      + +
      Choose the best time to visit
        $info) {?>
      • ic_title ?>
        • From ad26727400ac6eefed2287ffc848c3523f53808a Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 14 Mar 2024 14:44:09 +0800 Subject: [PATCH 04/48] =?UTF-8?q?=E5=BA=95=E9=83=A8newsletter=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=88=A0=E9=99=A4=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=B8=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E7=9B=B8=E5=85=B3JS=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 73 +--------------------- application/views/mobile_first/ah.php | 77 +----------------------- 2 files changed, 2 insertions(+), 148 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index 14dfea0c..a1b4b218 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -265,18 +265,7 @@

        Sign up to Our Newsletter

        Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our team of experts.

        -
        - - - -
        + Click to sign up
      @@ -445,66 +434,6 @@
      - - - - diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 2668e062..943b9cec 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -177,23 +177,7 @@

      Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our team of experts.

      -
      - - - -
      + Click to sign up
    @@ -377,65 +361,6 @@ © 2016-2024 Asia Highlights
    — Discovery Your Way!
    - - - From 027ba24b247ec345422c778d10335ed09b8acc69 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 14 Mar 2024 15:12:50 +0800 Subject: [PATCH 05/48] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E5=A4=A7=E5=9B=BE=EF=BC=8CPC=E5=92=8C=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E4=B8=80=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 4df674c9..4c8bbc99 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -1,11 +1,5 @@
    - - - - <?php echo !empty($information->ic_title)?$information->ic_title:'H1 title asiahighlights mobile first template'; ?> -
    Home From b51c18ac5fb789bdd5a19cfd9bfc0e14a1d1afc3 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 15 Mar 2024 09:51:26 +0800 Subject: [PATCH 06/48] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=92=8C=E7=9B=B8=E5=85=B3=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 15 --------------- application/views/mobile_first/ah.php | 16 ---------------- 2 files changed, 31 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index a1b4b218..e667c5ec 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -549,20 +549,5 @@ - - \ No newline at end of file diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index 943b9cec..cfdf1c98 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -489,20 +489,4 @@ - - - \ No newline at end of file From 3f6a3b96561bcc5503ce4037bd5f4c87ba4d386e Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 15 Mar 2024 14:48:32 +0800 Subject: [PATCH 07/48] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E5=87=BA=E5=8F=91?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-info-page-form.php | 11 +-- .../views/mobile_first/ah-inquiry-form.php | 10 ++- .../views/mobile_first/ah-tour-list-form.php | 77 +++++++++--------- .../views/mobile_first/gh-info-page-form.php | 79 +++++++++---------- .../views/mobile_first/gh-tour-form.php | 78 +++++++++--------- 5 files changed, 129 insertions(+), 126 deletions(-) diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index 2960f076..b6548e6c 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -168,9 +168,8 @@
    diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 689050e4..141fc024 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -187,8 +187,8 @@
    diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php index 1f500f3f..fae30aaf 100644 --- a/application/views/mobile_first/ah-tour-list-form.php +++ b/application/views/mobile_first/ah-tour-list-form.php @@ -171,44 +171,45 @@
    diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php index 8369244c..b486cc21 100644 --- a/application/views/mobile_first/gh-info-page-form.php +++ b/application/views/mobile_first/gh-info-page-form.php @@ -180,46 +180,45 @@
    diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php index d3c68613..4e5b7ccd 100644 --- a/application/views/mobile_first/gh-tour-form.php +++ b/application/views/mobile_first/gh-tour-form.php @@ -172,45 +172,45 @@
From 171dc0481ea831e438c3fb13ef9f994b4775037e Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 15 Mar 2024 14:59:53 +0800 Subject: [PATCH 08/48] 11 --- application/views/mobile_first/ah-info-page-form.php | 4 ++-- application/views/mobile_first/ah-inquiry-form.php | 7 +++---- application/views/mobile_first/ah-tour-list-form.php | 3 ++- application/views/mobile_first/gh-info-page-form.php | 3 ++- application/views/mobile_first/gh-tour-form.php | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/ah-info-page-form.php index b6548e6c..03df062e 100644 --- a/application/views/mobile_first/ah-info-page-form.php +++ b/application/views/mobile_first/ah-info-page-form.php @@ -168,7 +168,7 @@
diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 141fc024..20f6bb0f 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -186,9 +186,8 @@
diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php index fae30aaf..0dce98f5 100644 --- a/application/views/mobile_first/ah-tour-list-form.php +++ b/application/views/mobile_first/ah-tour-list-form.php @@ -171,6 +171,7 @@
diff --git a/application/views/mobile_first/gh-info-page-form.php b/application/views/mobile_first/gh-info-page-form.php index b486cc21..6ff6bb61 100644 --- a/application/views/mobile_first/gh-info-page-form.php +++ b/application/views/mobile_first/gh-info-page-form.php @@ -180,6 +180,7 @@ diff --git a/application/views/mobile_first/gh-tour-form.php b/application/views/mobile_first/gh-tour-form.php index 4e5b7ccd..0a4993f1 100644 --- a/application/views/mobile_first/gh-tour-form.php +++ b/application/views/mobile_first/gh-tour-form.php @@ -171,7 +171,7 @@ From 75d0f6ec4c669b9cc4d48a106c57940205a3526b Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 19 Mar 2024 16:36:32 +0800 Subject: [PATCH 09/48] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AALogo?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-pc.php | 314 +++++++++++++---------- 1 file changed, 181 insertions(+), 133 deletions(-) diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index e667c5ec..f0a419d5 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -50,10 +50,10 @@
How to Plan an Incredible Family Trip to Japan in 2024/2025. Learn more.
- + @@ -220,7 +241,7 @@

Why Asia Highlights (10,000+ reviews & 98.8% 5-star rating)

- +
  • Save Your Time:
  • Less research, more enjoyment!
    • @@ -232,11 +253,12 @@
  • Specially-crafted family adventures
  • Celebrate milestones with style!
-
+ -
Create my trip +
Create + my trip
@@ -249,8 +271,8 @@
- Start planning your tailor-made tour with 1-1 help - from our travel advisors. + Start planning your tailor-made tour with 1-1 help + from our travel advisors. Create My Trip @@ -262,14 +284,15 @@
+ -
+

Why Asia Highlights

@@ -277,55 +300,59 @@ - + @@ -336,19 +363,21 @@
-

Where Can We Take You Today?

- -
- -
+ +
+ +
@@ -356,70 +385,89 @@
-
-
- -
- - Rated 5 out of 5 | 98.8% Excellence
- China Highlights International
Travel Service Co., LTD -
-
- -
-
-
Company
- -
-
-
Language
- -
-
-
Follow Us
- -
-
-
Featured on
- China Highlights was featured on these medias. -
- -

Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China

-
-
+
+
+ +
+ + Rated 5 out of 5 | 98.8% Excellence
+ China Highlights International
Travel Service Co., LTD +
+
+ +
+
+
Company
+ +
+
+
Language
+ +
+
+
Follow Us
+ +
+
+
Featured on
+ China Highlights was featured on these medias. +
+ +

Address: Building 6, Chuangyi Business + Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China

+
+
From bcf9bdccd115b73a14ab909cb006ec069fecc8af Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 19 Mar 2024 16:47:50 +0800 Subject: [PATCH 10/48] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AAlogo?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/gh-pc.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index ec6cbe19..f260eaf0 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -66,11 +66,10 @@ - From 2fec3cafc483bda206504459bb9648168d7b8f2c Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 19 Mar 2024 17:00:44 +0800 Subject: [PATCH 11/48] 11 --- application/views/mobile_first/gh-pc.php | 400 ++++++++++++----------- 1 file changed, 216 insertions(+), 184 deletions(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index f260eaf0..b4bf250e 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -66,129 +66,129 @@ - @@ -204,7 +204,7 @@

Why Global Highlights (10,000+ reviews & 98.8% 5-star rating)

- +
  • Save Your Time:
  • Less research, more enjoyment!
    • @@ -216,7 +216,7 @@
  • Specially-crafted family adventures
  • Celebrate milestones with style!
-
+
Create @@ -268,50 +268,61 @@
- + @@ -329,15 +340,18 @@ text-align: center; ">Where Can We Take You Today? -
- -
+
+ +
@@ -345,68 +359,86 @@
- +
- + Rated 4.6 out of 5 | Excellence
China Highlights International
Travel Service Co., LTD
- +
Company
+
  • Travel Agents
    • +
  • Reviews
    • +
  • History
    • +
  • Contact us
    • +
  • Privacy Policy
    • +
  • Terms
    • +
    Language
    + +
  • Deutsch
    • +
  • Français
    • +
  • Español
    • +
  • Italiano
    • +
  • Русский
    • +
  • 日本語
    • +
    Follow Us
    +
  • + + + + Facebook
    • +
  • + + + Twitter +
    • +
  • + + + + Instagram
    • +
    -
    -
    Featured on
    - Global Highlights was featured on these medias. -
    - -

    Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China

    -
    +
    +
    Featured on
    + Global Highlights was featured on these medias. +
    + +

    Address: Building 6, Chuangyi + Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China

    + diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index 294f3fcc..f067b643 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -62,7 +62,12 @@
    + name="adult" style="width: 50px; + height: 22px; + top: -5px; + position: relative; + text-align: center; + font-size: 20px;">
    diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index cff78d54..86723a41 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -63,7 +63,12 @@
    + name="adult" style="width: 50px; + height: 22px; + top: -5px; + position: relative; + text-align: center; + font-size: 20px;">
    From fbad1da0e0b614a9f80c641559a17652d797eb44 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 22 Mar 2024 09:58:00 +0800 Subject: [PATCH 22/48] fix gh_gm tpl --- 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 6af5ea3d..d322d73d 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -334,7 +334,7 @@ class Information extends CI_Controller } //可选的展示模板 - if (in_array($this->config->item('site_code'), array('gh_vac', 'gh_vc', 'gh_jp', 'gh_ru', 'gh_it'))) { + if (in_array($this->config->item('site_code'), array('gh_vac', 'gh_vc', 'gh_jp', 'gh_ru', 'gh_it', 'gh_gm'))) { $this->config->set_item('templates', $this->config->item('templates_gh')); } From e54fd396d3fb42b4c1847aec740ef66bf67e8076 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 09:45:30 +0800 Subject: [PATCH 23/48] add test gm database --- application/controllers/information.php | 144 +++++++++++++++++++++++- 1 file changed, 140 insertions(+), 4 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index d322d73d..3d94d096 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -105,19 +105,155 @@ class Information extends CI_Controller return true; } - //复制节点结构到任意站点的节点下面。-- lmr - 1225 - //is_id 信息结构ID， - //复制节点结构到任意站点的节点下面。-- lmr + //[国际->国际]复制节点结构到任意站点的节点下面。-- lmr //is_id 信息结构ID， public function copy_by_is_id($src_is_id, $dest_is_id) { if (empty ($src_is_id) || empty ($src_is_id)) { - echo 'need 2 is_id'; + echo 'need 2 is_id v1'; + return false; + } + + $data = array(); + if ($src_is_id == $dest_is_id || empty ($src_is_id) || empty ($dest_is_id)) { + echo 'need 2 is_id v2'; + return false; + } + // 源节点 + $src = $this->InfoStructures_model->Detail($src_is_id); + $src_path = $this->Information_model->get_list_by_path($src->is_path, false, $src->is_sitecode); + // 源子节点 + foreach ($src_path as $n => $item) { + if ($item->is_id === $src->is_id) { + unset($src_path[$n]); + } + } + // 目标节点结构 + $dest = $this->InfoStructures_model->Detail($dest_is_id); + $dest_path = $this->Information_model->get_list_by_path($dest->is_path, false, $dest->is_sitecode); + // 目标子节点 + foreach ($dest_path as $n => $item) { + if ($item->is_id === $dest->is_id) { + unset($dest_path[$n]); + } + } + + // 新旧节点对应表 + $node_map = array(); + // 循环复制各个层级的节点。 + foreach ($src_path as $n => $item) { + + // 定位复制的父节点 + $target_is_id = $dest->is_id; + foreach ($node_map as $old => $new) { + if ($item->is_parent_id == $old) { + $target_is_id = $new; + } + } + // info_content + $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); + $this->InfoContents_model->Add_with_sitecode( + $item_info_content->ic_url, + $item_info_content->ic_url_title, + $item_info_content->ic_type, + $item_info_content->ic_title, + $item_info_content->ic_content, + $item_info_content->ic_summary, + $item_info_content->ic_seo_title, + $item_info_content->ic_seo_description, + $item_info_content->ic_seo_keywords, + $item_info_content->ic_show_bread_crumbs, + $item_info_content->ic_status, + $item_info_content->ic_template, + $item_info_content->ic_photo, + $item_info_content->ic_photo_width, + $item_info_content->ic_photo_height, + $item_info_content->ic_recommend_tours, + $item_info_content->ic_recommend_packages, + $item_info_content->ic_ht_area_id, + $item_info_content->ic_ht_area_type, + $item_info_content->ic_ht_product_id, + $item_info_content->ic_ht_product_type, + $item_info_content->ic_author, + $dest->is_sitecode + ); + + // info_meta + $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); + $item_meta_ampbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY'); + $item_meta_ampcss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS'); + $item_meta_ampscript = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCRIPT'); + $item_meta_ampjson = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_JSON'); + $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); + $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); + $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); + $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); + $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); + + if (!empty ($item_meta_amp)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); + if (!empty ($item_meta_ampbody)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY', $item_meta_ampbody); + if (!empty ($item_meta_ampcss)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS', $item_meta_ampcss); + if (!empty ($item_meta_ampscript)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCRIPT', $item_meta_ampscript); + if (!empty ($item_meta_ampjson)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_JSON', $item_meta_ampjson); + if (!empty ($item_meta_ampstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_STATUS', $item_meta_ampstatus); + if (!empty ($item_meta_pcstatus)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC_STATUS', $item_meta_pcstatus); + if (!empty ($item_meta_pcbody)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_BODY_PC', $item_meta_pcbody); + if (!empty ($item_meta_pccss)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_CSS_PC', $item_meta_pccss); + if (!empty ($item_meta_pcschema)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); + + // gm 补充meta + $item_meta_addon_css = $this->InfoMetas_model->get($item->is_ic_id, 'meta_addon_css'); + if (!empty ($item_meta_addon_css)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'meta_addon_css', $item_meta_addon_css); + + $item_meta_addon_js = $this->InfoMetas_model->get($item->is_ic_id, 'meta_addon_js'); + if (!empty ($item_meta_addon_js)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'meta_addon_js', $item_meta_addon_js); + + $item_meta_use_list_picture = $this->InfoMetas_model->get($item->is_ic_id, 'meta_use_list_picture'); + if (!empty ($item_meta_use_list_picture)) + $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'meta_use_list_picture', $item_meta_use_list_picture); + + // 添加节点 + $this->InfoStructures_model->Add_with_sitecode($target_is_id, $this->InfoContents_model->insert_id, 999, $dest->is_sitecode); + $node_map[$item->is_id] = $this->InfoStructures_model->insert_id; + + } + + print_r($node_map); + // print_r($src); + // print_r($src_path); + // print_r($dest); + // print_r($dest_path); + + //返回状态 + $data[] = array('name' => 'ok', 'value' => 'copy_by_is_id() success!'); + echo json_encode($data); + return true; + } + + //[德语->国际]复制节点结构到任意站点的节点下面。-- lmr + //is_id 信息结构ID， + public function copy_by_is_id_gm($src_is_id, $dest_is_id) + { + if (empty ($src_is_id) || empty ($src_is_id)) { + echo 'need 2 is_id v1'; return false; } $data = array(); if ($src_is_id == $dest_is_id || empty ($src_is_id) || empty ($dest_is_id)) { + echo 'need 2 is_id v2'; return false; } // 源节点 From d07f37173a052c1f2c95f08ca784fc3a2f95a2ce Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 10:06:19 +0800 Subject: [PATCH 24/48] test link gm database --- application/controllers/information.php | 7 +- application/models/infoStructures_model.php | 24 ++++- application/models/information_model.php | 100 +++++++++++++++++++- 3 files changed, 125 insertions(+), 6 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 3d94d096..35b89c22 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -256,8 +256,9 @@ class Information extends CI_Controller echo 'need 2 is_id v2'; return false; } + // 源节点 - $src = $this->InfoStructures_model->Detail($src_is_id); + $src = $this->InfoStructures_model->Detail_gm($src_is_id); $src_path = $this->Information_model->get_list_by_path($src->is_path, false, $src->is_sitecode); // 源子节点 foreach ($src_path as $n => $item) { @@ -265,6 +266,10 @@ class Information extends CI_Controller unset($src_path[$n]); } } + print_r($src); + print_r($src_path); + return false; + // 目标节点结构 $dest = $this->InfoStructures_model->Detail($dest_is_id); $dest_path = $this->Information_model->get_list_by_path($dest->is_path, false, $dest->is_sitecode); diff --git a/application/models/infoStructures_model.php b/application/models/infoStructures_model.php index fccabaf2..f88cfb5b 100644 --- a/application/models/infoStructures_model.php +++ b/application/models/infoStructures_model.php @@ -35,6 +35,28 @@ class InfoStructures_model extends CI_Model } } + function Detail_gm($is_id) + { + $sql = "SELECT TOP 1 is1.is_id, \n" + . " is1.is_parent_id, \n" + . " is1.is_path, \n" + . " is1.is_level, \n" + . " is1.is_sort, \n" + . " is1.is_sitecode, \n" + . " is1.is_datetime, \n" + . " is1.is_ic_id \n" + . "FROM information_gm.dbo.infoStructures is1 \n" + . "WHERE is1.is_id = ?"; + $query = $this->HT->query($sql, array($is_id)); + //print_r($this->HT->queries); + if ($query->result()) { + $row = $query->row(); + return $row; + } else { + return FALSE; + } + } + function Add($is_parent_id, $is_ic_id = -1, $is_sort = 999) { @@ -75,7 +97,7 @@ class InfoStructures_model extends CI_Model function Add_with_sitecode($is_parent_id, $is_ic_id = -1, $is_sort = 999, $site_code = '') { - if (empty($site_code)) { + if (empty ($site_code)) { $site_code = $this->config->item('site_code'); } if ($is_parent_id == 0) { diff --git a/application/models/information_model.php b/application/models/information_model.php index a80ffa61..8e37ebc8 100644 --- a/application/models/information_model.php +++ b/application/models/information_model.php @@ -155,6 +155,18 @@ class Information_model extends CI_Model return $this->GetList($filed, $site_code); } + //根据根节点路径获取子节点列表 + function get_list_by_path_gm($path, $level = false, $site_code = false, $filed = false) + { + $this->init(); + if ($level !== false) { + $this->level = " AND is1.is_level= '$level' "; + } + $this->path = " AND is1.is_path LIKE '$path%' "; + $this->orderBy = ' ORDER BY is1.is_level ASC, is1.is_sort ASC,is1.is_path ASC '; + return $this->GetList_gm($filed, $site_code); + } + /** * 获取当前页面的面包屑，不包括当前节点 */ @@ -303,7 +315,7 @@ class Information_model extends CI_Model function Detail($ic_url_is_id, $filed = '', $site_code = '') { - if (empty($ic_url_is_id)) { + if (empty ($ic_url_is_id)) { return false; } $this->init(); @@ -318,7 +330,7 @@ class Information_model extends CI_Model function detail_by_ic_id($ic_id) { - if (empty($ic_id)) { + if (empty ($ic_id)) { return false; } $this->init(); @@ -330,7 +342,7 @@ class Information_model extends CI_Model function GetList($filed = "", $site_code = "") { $this->topNum ? $sql = "SELECT TOP " . $this->topNum : $sql = "SELECT "; - if (empty($filed)) { + if (empty ($filed)) { $sql .= " is1.is_id, \n" . " is1.is_parent_id, \n" . " is1.is_path, \n" @@ -407,6 +419,86 @@ class Information_model extends CI_Model } } + function GetList_gm($filed = "", $site_code = "") + { + $this->topNum ? $sql = "SELECT TOP " . $this->topNum : $sql = "SELECT "; + if (empty ($filed)) { + $sql .= " is1.is_id, \n" + . " is1.is_parent_id, \n" + . " is1.is_path, \n" + . " is1.is_level, \n" + . " is1.is_sort, \n" + . " is1.is_sitecode, \n" + . " is1.is_datetime, \n" + . " is1.is_ic_id, \n" + . " ic.ic_id, \n" + . " ic.ic_url, \n" + . " ic.ic_url_title, \n" + . " ic.ic_type, \n" + . " ic.ic_title, \n" + . " ic.ic_content, \n" + . " ic.ic_summary, \n" + . " ic.ic_seo_title, \n" + . " ic.ic_seo_description, \n" + . " ic.ic_seo_keywords, \n" + . " ic.ic_show_bread_crumbs, \n" + . " ic.ic_status, \n" + . " ic.ic_template, \n" + . " ic.ic_photo, \n" + . " ic.ic_photo_width, \n" + . " ic.ic_photo_height, \n" + . " ic.ic_sitecode, \n" + . " ic.ic_recommend_tours, \n" + . " ic.ic_recommend_packages, \n" + . " ic.ic_datetime, \n" + . " ic.ic_ht_area_id, \n" + . " ic.ic_ht_area_type, \n" + . " ic.ic_ht_product_id, \n" + . " ic.ic_ht_product_type, \n" + . " ic.SRMS_SIC_Code, \n" + . " ic.SRMS_SIIT_Code, \n" + . " ic.ic_author \n"; + } else { + $sql .= " $filed "; + } + //添加查询AMP发布状态 + //$sql.=",isnull((select top 1 CONVERT(varchar, im_value) from infoMetas where im_ic_id=ic_id and im_key='AMP_STATUS'),0) as amp_status "; + $sql .= ",0 as amp_status "; + $sql .= "FROM information_gm.dbo.infoStructures is1 \n" + . " INNER JOIN information_gm.dbo.infoContents ic ON ic.ic_id = is1.is_ic_id \n" + . " left JOIN information_gm.dbo.infoMetas map on ic.ic_id = map.im_ic_id AND map.im_key = 'meta_addon_picture' \n" + . " left JOIN information_gm.dbo.infoMetas mapm on ic.ic_id = mapm.im_ic_id AND mapm.im_key = 'meta_addon_picture_mobile' \n" + . " AND ic.ic_sitecode = is1.is_sitecode \n" + . "WHERE is1.is_sitecode = ? "; + $this->search_title ? $sql .= $this->search_title : false; + $this->search_url ? $sql .= $this->search_url : false; + $this->search ? $sql .= $this->search : false; + $this->path ? $sql .= $this->path : false; + $this->level ? $sql .= $this->level : false; + $this->is_parent_id ? $sql .= $this->is_parent_id : false; + $this->is_id_array ? $sql .= $this->is_id_array : false; + $this->ic_url_is_id ? $sql .= $this->ic_url_is_id : false; + $this->ic_id ? $sql .= $this->ic_id : false; + $this->ic_type ? $sql .= $this->ic_type : false; + $this->ic_ht_area_type ? $sql .= $this->ic_ht_area_type : false; + $this->ic_ht_area_id ? $sql .= $this->ic_ht_area_id : false; + + $this->orderBy ? $sql .= $this->orderBy : false; + + $query = $this->HT->query($sql, array($site_code ? $site_code : $this->config->item('site_code'))); + //print_r($this->HT->queries); + if ($this->topNum === 1) { + if ($query->num_rows() > 0) { + $row = $query->row(); + return $row; + } else { + return FALSE; + } + } else { + return $query->result(); + } + } + //根据区域信息获取根节点 function GetRoot($ic_ht_area_type, $ic_ht_area_id) { @@ -444,7 +536,7 @@ class Information_model extends CI_Model WHERE is1.is_id=?"; $query = $this->HT->query($sql, array($is_id)); $result = $query->result(); - if (!empty($result)) { + if (!empty ($result)) { return $result[0]->CII_PRI_SN; } else { return false; From 58e99b79f43abaebb761baf7d6aae8f8860097c8 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 10:06:29 +0800 Subject: [PATCH 25/48] +2 --- 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 35b89c22..48b0b2bf 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -259,7 +259,7 @@ class Information extends CI_Controller // 源节点 $src = $this->InfoStructures_model->Detail_gm($src_is_id); - $src_path = $this->Information_model->get_list_by_path($src->is_path, false, $src->is_sitecode); + $src_path = $this->Information_model->get_list_by_path_gm($src->is_path, false, $src->is_sitecode); // 源子节点 foreach ($src_path as $n => $item) { if ($item->is_id === $src->is_id) { From f7b7fd5e74c1dc694eb8cc732d097abcccce3186 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 10:10:59 +0800 Subject: [PATCH 26/48] v3 --- application/controllers/information.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 48b0b2bf..9f318aef 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -266,9 +266,6 @@ class Information extends CI_Controller unset($src_path[$n]); } } - print_r($src); - print_r($src_path); - return false; // 目标节点结构 $dest = $this->InfoStructures_model->Detail($dest_is_id); From 460d640211947192eb4880a7a976fac808927396 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 10:23:10 +0800 Subject: [PATCH 27/48] up 3 --- application/controllers/information.php | 28 +++---- application/models/infoContents_model.php | 96 ++++++++++++++++++++--- application/models/infoMetas_model.php | 14 ++++ 3 files changed, 111 insertions(+), 27 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 9f318aef..7f166e39 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -290,7 +290,7 @@ class Information extends CI_Controller } } // info_content - $item_info_content = $this->InfoContents_model->get_ic_contents2($item->is_ic_id); + $item_info_content = $this->InfoContents_model->get_ic_contents2_gm($item->is_ic_id); $this->InfoContents_model->Add_with_sitecode( $item_info_content->ic_url, $item_info_content->ic_url_title, @@ -318,16 +318,16 @@ class Information extends CI_Controller ); // info_meta - $item_meta_amp = $this->InfoMetas_model->get($item->is_ic_id, 'AMP'); - $item_meta_ampbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY'); - $item_meta_ampcss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS'); - $item_meta_ampscript = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCRIPT'); - $item_meta_ampjson = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_JSON'); - $item_meta_ampstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_STATUS'); - $item_meta_pcstatus = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC_STATUS'); - $item_meta_pcbody = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_BODY_PC'); - $item_meta_pccss = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_CSS_PC'); - $item_meta_pcschema = $this->InfoMetas_model->get($item->is_ic_id, 'AMP_SCHEMA'); + $item_meta_amp = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP'); + $item_meta_ampbody = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_BODY'); + $item_meta_ampcss = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_CSS'); + $item_meta_ampscript = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_SCRIPT'); + $item_meta_ampjson = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_JSON'); + $item_meta_ampstatus = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_STATUS'); + $item_meta_pcstatus = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_BODY_PC_STATUS'); + $item_meta_pcbody = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_BODY_PC'); + $item_meta_pccss = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_CSS_PC'); + $item_meta_pcschema = $this->InfoMetas_model->get_gm($item->is_ic_id, 'AMP_SCHEMA'); if (!empty ($item_meta_amp)) $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP', $item_meta_amp); @@ -351,15 +351,15 @@ class Information extends CI_Controller $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'AMP_SCHEMA', $item_meta_pcschema); // gm 补充meta - $item_meta_addon_css = $this->InfoMetas_model->get($item->is_ic_id, 'meta_addon_css'); + $item_meta_addon_css = $this->InfoMetas_model->get_gm($item->is_ic_id, 'meta_addon_css'); if (!empty ($item_meta_addon_css)) $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'meta_addon_css', $item_meta_addon_css); - $item_meta_addon_js = $this->InfoMetas_model->get($item->is_ic_id, 'meta_addon_js'); + $item_meta_addon_js = $this->InfoMetas_model->get_gm($item->is_ic_id, 'meta_addon_js'); if (!empty ($item_meta_addon_js)) $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'meta_addon_js', $item_meta_addon_js); - $item_meta_use_list_picture = $this->InfoMetas_model->get($item->is_ic_id, 'meta_use_list_picture'); + $item_meta_use_list_picture = $this->InfoMetas_model->get_gm($item->is_ic_id, 'meta_use_list_picture'); if (!empty ($item_meta_use_list_picture)) $this->InfoMetas_model->Add($this->InfoContents_model->insert_id, 'meta_use_list_picture', $item_meta_use_list_picture); diff --git a/application/models/infoContents_model.php b/application/models/infoContents_model.php index 1516442a..2dbf35ab 100644 --- a/application/models/infoContents_model.php +++ b/application/models/infoContents_model.php @@ -71,14 +71,33 @@ class InfoContents_model extends CI_Model $query = $this->HT->query( $sql, array( - $ic_url, $ic_url_title, $ic_type, $ic_title, str_replace( + $ic_url, + $ic_url_title, + $ic_type, + $ic_title, + str_replace( $this->config->item('media_image_url'), $this->config->item('site_image_url'), $ic_content ), - $ic_summary, $ic_seo_title, $ic_seo_description, $ic_seo_keywords, $ic_show_bread_crumbs, $ic_status, - $ic_template, $ic_photo, $ic_photo_width, $ic_photo_height, $this->config->item('site_code'), $ic_recommend_tours, $ic_recommend_packages, - $ic_ht_area_id, $ic_ht_area_type, $ic_ht_product_id, $ic_ht_product_type, $ic_author + $ic_summary, + $ic_seo_title, + $ic_seo_description, + $ic_seo_keywords, + $ic_show_bread_crumbs, + $ic_status, + $ic_template, + $ic_photo, + $ic_photo_width, + $ic_photo_height, + $this->config->item('site_code'), + $ic_recommend_tours, + $ic_recommend_packages, + $ic_ht_area_id, + $ic_ht_area_type, + $ic_ht_product_id, + $ic_ht_product_type, + $ic_author ) ); $this->insert_id = $this->HT->last_id('infoContents'); @@ -110,7 +129,7 @@ class InfoContents_model extends CI_Model $ic_author, $site_code = '' ) { - if (empty($site_code)) { + if (empty ($site_code)) { $site_code = $this->config->item('site_code'); } $ic_content = str_replace('http:' . $this->config->item('site_image_url'), $this->config->item('site_image_url'), $ic_content); @@ -135,14 +154,33 @@ class InfoContents_model extends CI_Model $query = $this->HT->query( $sql, array( - $ic_url, $ic_url_title, $ic_type, $ic_title, str_replace( + $ic_url, + $ic_url_title, + $ic_type, + $ic_title, + str_replace( $this->config->item('media_image_url'), $this->config->item('site_image_url'), $ic_content ), - $ic_summary, $ic_seo_title, $ic_seo_description, $ic_seo_keywords, $ic_show_bread_crumbs, $ic_status, - $ic_template, $ic_photo, $ic_photo_width, $ic_photo_height, $site_code, $ic_recommend_tours, $ic_recommend_packages, - $ic_ht_area_id, $ic_ht_area_type, $ic_ht_product_id, $ic_ht_product_type, $ic_author + $ic_summary, + $ic_seo_title, + $ic_seo_description, + $ic_seo_keywords, + $ic_show_bread_crumbs, + $ic_status, + $ic_template, + $ic_photo, + $ic_photo_width, + $ic_photo_height, + $site_code, + $ic_recommend_tours, + $ic_recommend_packages, + $ic_ht_area_id, + $ic_ht_area_type, + $ic_ht_product_id, + $ic_ht_product_type, + $ic_author ) ); $this->insert_id = $this->HT->last_id('infoContents'); @@ -214,10 +252,30 @@ class InfoContents_model extends CI_Model $query = $this->HT->query( $sql, array( - $ic_url, $ic_url_title, $ic_type, $ic_title, $ic_content, $ic_summary, - $ic_seo_title, $ic_seo_description, $ic_seo_keywords, $ic_show_bread_crumbs, $ic_status, $ic_template, $ic_photo, $ic_photo_width, $ic_photo_height, - $ic_recommend_tours, $ic_recommend_packages, $ic_ht_area_id, - $ic_ht_area_type, $ic_ht_product_id, $ic_ht_product_type, $ic_author, $ic_id, $this->config->item('site_code') + $ic_url, + $ic_url_title, + $ic_type, + $ic_title, + $ic_content, + $ic_summary, + $ic_seo_title, + $ic_seo_description, + $ic_seo_keywords, + $ic_show_bread_crumbs, + $ic_status, + $ic_template, + $ic_photo, + $ic_photo_width, + $ic_photo_height, + $ic_recommend_tours, + $ic_recommend_packages, + $ic_ht_area_id, + $ic_ht_area_type, + $ic_ht_product_id, + $ic_ht_product_type, + $ic_author, + $ic_id, + $this->config->item('site_code') ) ); return $query; @@ -278,6 +336,18 @@ class InfoContents_model extends CI_Model } } + public function get_ic_contents2_gm($ic_id) + { + $sql = "SELECT top 1 * from information_gm.dbo.infoContents where ic_id=?"; + $query = $this->HT->query($sql, array($ic_id)); + if ($query->result()) { + $row = $query->row(); + return $row; + } else { + return FALSE; + } + } + public function get_ic_contents_by_list($ic_id_list) { $ic_id_list = trim($ic_id_list); diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php index 554c67f7..e47ab475 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -152,6 +152,20 @@ class InfoMetas_model extends CI_Model } } + function get_gm($im_ic_id, $im_key) + { + $sql = "SELECT im.im_value \n" + . "FROM information_gm.dbo.infoMetas im \n" + . "WHERE im.im_ic_id = ? \n" + . " AND im.im_key = ?"; + $query = $this->HT->query($sql, array($im_ic_id, $im_key)); + if ($query->num_rows() > 0) { + return $query->row()->im_value; + } else { + return false; + } + } + function detail($im_ic_id, $im_key) { $sql = "SELECT im.im_value \n" From c31bd10968ca84d2c426fe2643e938e17a320911 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 15:07:50 +0800 Subject: [PATCH 28/48] add gj_gm update cache --- application/controllers/information.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index 7f166e39..2a886124 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -3428,6 +3428,7 @@ class Information extends CI_Controller case 'gh_it': case 'gh_ru': case 'gh_jp': + case 'gh_de': $information = $this->Information_model->Detail($url); $meta_pc_amp = @get_meta($information->ic_id, 'AMP_BODY_PC_STATUS'); if ($delete_only) { From cb1299576320a6e5d9ceca8b52d5a111101c6f4d Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 15:09:09 +0800 Subject: [PATCH 29/48] fix --- 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 2a886124..99bd936e 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -3428,7 +3428,7 @@ class Information extends CI_Controller case 'gh_it': case 'gh_ru': case 'gh_jp': - case 'gh_de': + case 'gh_gm': $information = $this->Information_model->Detail($url); $meta_pc_amp = @get_meta($information->ic_id, 'AMP_BODY_PC_STATUS'); if ($delete_only) { From e85bb4c117303ecb588ba9a4cdeadce2a151139d Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 25 Mar 2024 15:40:26 +0800 Subject: [PATCH 30/48] fix --- 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 99bd936e..003092e7 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -3422,7 +3422,7 @@ class Information extends CI_Controller } } break; - //国际站 - GH + //国际站 - GH - add gm case 'gh_vac': case 'gh_vc': case 'gh_it': From 26098a350be53c2c478a2e56b95566c3c8bdc70c Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 26 Mar 2024 16:15:40 +0800 Subject: [PATCH 31/48] 11 --- application/views/mobile_first/ch-pc.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index 19125d18..f08a586f 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -454,11 +454,6 @@
  • Japan, South Korea
  • India, Nepal, Bhutan, and Sri lanka
  • Central Asia
    • - - - -
    -
    • Europe
    • Middle East
    • African Safari
      • From d0794575e071c4993cb5f5eec9ea8e57e38b4a63 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 28 Mar 2024 14:03:49 +0800 Subject: [PATCH 32/48] 11 --- .../views/mobile_first/ah-feedback-city-list.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/ah-feedback-city-list.php index 45dea0d3..0a881c28 100644 --- a/application/views/mobile_first/ah-feedback-city-list.php +++ b/application/views/mobile_first/ah-feedback-city-list.php @@ -7,7 +7,7 @@ @@ -22,7 +22,7 @@ @@ -37,7 +37,7 @@ @@ -52,7 +52,7 @@ @@ -69,7 +69,7 @@ @@ -84,7 +84,7 @@ From 991e8971a1dcedcbd33198451c96e62749c9cc4d Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 28 Mar 2024 14:06:11 +0800 Subject: [PATCH 33/48] 11 --- .../views/mobile_first/ah-feedback-city-list.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/ah-feedback-city-list.php index 0a881c28..21d15ea3 100644 --- a/application/views/mobile_first/ah-feedback-city-list.php +++ b/application/views/mobile_first/ah-feedback-city-list.php @@ -5,7 +5,7 @@ $feedback) {?>
      More Myanmar reviews
      @@ -85,7 +85,7 @@

      - More + More
      ,
    More China reviews
    diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php index fc79fcb8..2b0f2bd7 100644 --- a/application/views/mobile_first/ah-feedback-list.php +++ b/application/views/mobile_first/ah-feedback-list.php @@ -25,7 +25,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/ah-feedback-newest-10.php b/application/views/mobile_first/ah-feedback-newest-10.php index 46e7df8a..b99aba1b 100644 --- a/application/views/mobile_first/ah-feedback-newest-10.php +++ b/application/views/mobile_first/ah-feedback-newest-10.php @@ -17,7 +17,7 @@

    - more + more
    ,
    diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php index 0507299c..90d8a87d 100644 --- a/application/views/mobile_first/ah-feedback-newest.php +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -26,7 +26,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/ah-feedback-right.php b/application/views/mobile_first/ah-feedback-right.php index a826d769..de183463 100644 --- a/application/views/mobile_first/ah-feedback-right.php +++ b/application/views/mobile_first/ah-feedback-right.php @@ -14,7 +14,7 @@

    - More + More
    ,
    From 38d6e033e89377148d661fd05e6d113025063895 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 28 Mar 2024 16:40:57 +0800 Subject: [PATCH 35/48] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20rel=3D"nofollow"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile_first/ch-feedback-30-list.php | 2 +- .../mobile_first/ch-feedback-city-list.php | 26 +++++++++---------- .../views/mobile_first/ch-feedback-list.php | 2 +- .../views/mobile_first/ch-feedback-newest.php | 2 +- .../views/mobile_first/ch-feedback.php | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-30-list.php b/application/views/mobile_first/ch-feedback-30-list.php index 2510cbf5..c473548a 100644 --- a/application/views/mobile_first/ch-feedback-30-list.php +++ b/application/views/mobile_first/ch-feedback-30-list.php @@ -18,7 +18,7 @@ padding-bottom: 0;">Discover real reviews of

    -     More + More
    ,
    diff --git a/application/views/mobile_first/ch-feedback-city-list.php b/application/views/mobile_first/ch-feedback-city-list.php index 8b76a970..e3a457d4 100644 --- a/application/views/mobile_first/ch-feedback-city-list.php +++ b/application/views/mobile_first/ch-feedback-city-list.php @@ -8,7 +8,7 @@

    - More + More
    ,
    @@ -23,7 +23,7 @@

    - More + More
    ,
    @@ -38,7 +38,7 @@

    - More + More
    ,
    @@ -53,7 +53,7 @@

    - More + More
    ,
    @@ -68,7 +68,7 @@

    - More + More
    ,
    @@ -83,7 +83,7 @@

    - More + More
    ,
    @@ -98,7 +98,7 @@

    - More + More
    ,
    @@ -113,7 +113,7 @@

    - More + More
    ,
    @@ -128,7 +128,7 @@

    - More + More
    ,
    @@ -143,7 +143,7 @@

    - More + More
    ,
    @@ -158,7 +158,7 @@

    - More + More
    ,
    @@ -173,7 +173,7 @@

    - More + More
    ,
    @@ -188,7 +188,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php index 94171187..7e07d6d8 100644 --- a/application/views/mobile_first/ch-feedback-list.php +++ b/application/views/mobile_first/ch-feedback-list.php @@ -26,7 +26,7 @@

    - more + more
    ,
    diff --git a/application/views/mobile_first/ch-feedback-newest.php b/application/views/mobile_first/ch-feedback-newest.php index 1847fb37..64f32b5d 100644 --- a/application/views/mobile_first/ch-feedback-newest.php +++ b/application/views/mobile_first/ch-feedback-newest.php @@ -23,7 +23,7 @@

    - more + more
    ,
    diff --git a/application/views/mobile_first/ch-feedback.php b/application/views/mobile_first/ch-feedback.php index 2a7b75a4..f3da1119 100644 --- a/application/views/mobile_first/ch-feedback.php +++ b/application/views/mobile_first/ch-feedback.php @@ -6,6 +6,6 @@
    Trip Advisor travelers' choice 2022

    reviewed ,
    -

     more

    +

     more

    \ No newline at end of file From 4700c8d0d0b68259d6989b600125da1475ab7154 Mon Sep 17 00:00:00 2001 From: candice Date: Thu, 28 Mar 2024 16:41:53 +0800 Subject: [PATCH 36/48] =?UTF-8?q?=E6=96=B0=E5=A2=9Erel=3D"nofollow"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/gh-feedback-30-list.php | 2 +- .../views/mobile_first/gh-feedback-city-list.php | 12 ++++++------ .../views/mobile_first/gh-feedback-newest.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/gh-feedback-30-list.php b/application/views/mobile_first/gh-feedback-30-list.php index 0e03b4ec..ec8224bf 100644 --- a/application/views/mobile_first/gh-feedback-30-list.php +++ b/application/views/mobile_first/gh-feedback-30-list.php @@ -20,7 +20,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/gh-feedback-city-list.php b/application/views/mobile_first/gh-feedback-city-list.php index 6987fab0..c606e8ad 100644 --- a/application/views/mobile_first/gh-feedback-city-list.php +++ b/application/views/mobile_first/gh-feedback-city-list.php @@ -7,7 +7,7 @@

    - More + More
    ,
    @@ -22,7 +22,7 @@

    - More + More
    ,
    @@ -37,7 +37,7 @@

    - More + More
    ,
    @@ -52,7 +52,7 @@

    - More + More
    ,
    @@ -68,7 +68,7 @@

    - More + More
    ,
    @@ -83,7 +83,7 @@

    - More + More
    ,
    diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php index c0644c18..04a8b32f 100644 --- a/application/views/mobile_first/gh-feedback-newest.php +++ b/application/views/mobile_first/gh-feedback-newest.php @@ -25,7 +25,7 @@

    - More + More
    ,
    From 07f42b20514413db3bef1ba0d49b76527e7ca2df Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 29 Mar 2024 11:18:32 +0800 Subject: [PATCH 37/48] 11 --- .../mobile_first/ch-feedback-city-list.php | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-city-list.php b/application/views/mobile_first/ch-feedback-city-list.php index e3a457d4..e7b804e6 100644 --- a/application/views/mobile_first/ch-feedback-city-list.php +++ b/application/views/mobile_first/ch-feedback-city-list.php @@ -193,43 +193,4 @@ -

    Read more Hangzhou travel reviews.

    - -

    All Destinations' Feedbacks

    -
    -
    - -
    -
    - -
    -
    - -
    - - -
    \ No newline at end of file +

    Read more Hangzhou travel reviews.

    \ No newline at end of file From 8ee88e233bbb7afc3cf68198eb27cbb62cfa0736 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 29 Mar 2024 13:59:47 +0800 Subject: [PATCH 38/48] 11 --- application/views/mobile_first/ch-feedback-30-list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-30-list.php b/application/views/mobile_first/ch-feedback-30-list.php index c473548a..a8a1f839 100644 --- a/application/views/mobile_first/ch-feedback-30-list.php +++ b/application/views/mobile_first/ch-feedback-30-list.php @@ -1,9 +1,9 @@

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    +padding-bottom: 0;" class="city_feedback">Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    -
    +
    From 668658776ea263bbe9467fbb753c3ec4524640d5 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 29 Mar 2024 14:37:39 +0800 Subject: [PATCH 39/48] 11 --- application/views/mobile_first/ah-feedback-list.php | 2 +- application/views/mobile_first/ah-feedback-newest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php index 2b0f2bd7..45f6f280 100644 --- a/application/views/mobile_first/ah-feedback-list.php +++ b/application/views/mobile_first/ah-feedback-list.php @@ -1,5 +1,5 @@ -

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    +

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php index 90d8a87d..15b485cf 100644 --- a/application/views/mobile_first/ah-feedback-newest.php +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -1,5 +1,5 @@ -

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    +

    Discover real reviews of Highlights Travel Family's best-rated service across trusted platforms.

    From 9057b6c6875161ea6b60cbef65b737728894c1e7 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Fri, 29 Mar 2024 14:51:44 +0800 Subject: [PATCH 40/48] =?UTF-8?q?AH=E3=80=81CH=E3=80=81GH=20=E6=92=A4?= =?UTF-8?q?=E4=B8=8B=E9=A1=B5=E5=A4=B4=E7=9A=84=E5=8D=95=E5=85=83=E5=B9=BF?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 19 ------------------- application/views/mobile_first/ch-h1.php | 18 ------------------ 2 files changed, 37 deletions(-) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 4c8bbc99..9f8de67a 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -16,24 +16,5 @@
    - - - - - -
    diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index 11b7b02c..5dce5776 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -19,23 +19,5 @@

    Written by Updated
    - - - -
    -
    \ No newline at end of file From 4f8f5465b8b0f6e3af523312a2a68e86986fe5c0 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Mon, 1 Apr 2024 09:36:33 +0800 Subject: [PATCH 41/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Google=20Ad=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 4 ++++ application/views/mobile_first/ch-h1.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index 9f8de67a..fd6aa71c 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -16,5 +16,9 @@ + + + diff --git a/application/views/mobile_first/ch-h1.php b/application/views/mobile_first/ch-h1.php index 5dce5776..aea0a4fa 100644 --- a/application/views/mobile_first/ch-h1.php +++ b/application/views/mobile_first/ch-h1.php @@ -19,5 +19,9 @@

    Written by Updated
    + + + \ No newline at end of file From cac450b43f6a012c7109457db98a2af3834dc1d6 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 2 Apr 2024 09:28:17 +0800 Subject: [PATCH 42/48] =?UTF-8?q?AH=20=E6=92=A4=E4=B8=8BGG=20Ads?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ah-h1.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/ah-h1.php index fd6aa71c..9f8de67a 100644 --- a/application/views/mobile_first/ah-h1.php +++ b/application/views/mobile_first/ah-h1.php @@ -16,9 +16,5 @@ - - - From 8594ba2400a2b1b2bfce57d62990aaf627c47c0d Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 10:18:24 +0800 Subject: [PATCH 43/48] =?UTF-8?q?=E7=A5=A8=E4=BB=B7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=B0=E9=93=A2=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-lantern-form-info-page.php | 8 ++++---- application/views/mobile_first/ah-lantern-form.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/views/mobile_first/ah-lantern-form-info-page.php b/application/views/mobile_first/ah-lantern-form-info-page.php index f067b643..26a0f985 100644 --- a/application/views/mobile_first/ah-lantern-form-info-page.php +++ b/application/views/mobile_first/ah-lantern-form-info-page.php @@ -25,7 +25,7 @@ @@ -35,7 +35,7 @@ @@ -45,7 +45,7 @@ @@ -415,7 +415,7 @@ var currentTarget = event.currentTarget; var adultNumberValue = parseInt(adultNumberNode.value); if (currentTarget.value === 'Premium+Transfer+Dinner') { - ticketPrice = 199; + ticketPrice = 179; } else if (currentTarget.value === 'Standard+Transfer+Dinner') { ticketPrice = 129; } else if (currentTarget.value === 'VIP+Transfer+Dinner') { diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/ah-lantern-form.php index 86723a41..0e548eec 100644 --- a/application/views/mobile_first/ah-lantern-form.php +++ b/application/views/mobile_first/ah-lantern-form.php @@ -26,7 +26,7 @@ @@ -36,7 +36,7 @@ @@ -46,7 +46,7 @@ @@ -412,7 +412,7 @@ var currentTarget = event.currentTarget; var adultNumberValue = parseInt(adultNumberNode.value); if (currentTarget.value === 'Premium+Transfer+Dinner') { - ticketPrice = 199; + ticketPrice = 179; } else if (currentTarget.value === 'Standard+Transfer+Dinner') { ticketPrice = 129; } else if (currentTarget.value === 'VIP+Transfer+Dinner') { From 3da7745c6e7d3f5082d1510777ea9fa1bc3ffa79 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 2 Apr 2024 10:53:15 +0800 Subject: [PATCH 44/48] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=95=E9=83=A8newsl?= =?UTF-8?q?etter=E8=A1=A8=E5=8D=95=E5=92=8C=E7=9B=B8=E5=85=B3JS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-pc.php | 74 +----------------------- application/views/mobile_first/ch.php | 72 +---------------------- 2 files changed, 4 insertions(+), 142 deletions(-) diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php index f08a586f..17ef0b94 100644 --- a/application/views/mobile_first/ch-pc.php +++ b/application/views/mobile_first/ch-pc.php @@ -362,19 +362,9 @@

    Sign up to Our Newsletter

    Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our - team of experts.

    -
    - - - - + team of experts.

    + Click to Sign up +
    @@ -568,65 +558,7 @@ } })(window, document, 'header'); - - - diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index c2e6d85c..1ddea8af 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -366,18 +366,7 @@

    Sign up to Our Newsletter

    Be the first to receive exciting updates, exclusive promotions, and valuable travel tips from our team of experts.

    -
    - - - - + Click to Sign up
    @@ -560,65 +549,6 @@ Travel Service Co., LTD - - - - + diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php index b2ec7eab..500a9a23 100644 --- a/application/views/mobile_first/ch.php +++ b/application/views/mobile_first/ch.php @@ -334,7 +334,6 @@ - From 6b2f5f0671c581e66e47f34740c91ca5c56f4e01 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Tue, 2 Apr 2024 14:42:02 +0800 Subject: [PATCH 48/48] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=A1=B5=E4=BF=A1=E6=81=AF=E9=A1=B5=E5=A4=B4=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 33 +++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index a905f94d..599b2b76 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1094,8 +1094,37 @@ class Information extends CI_Controller $template = str_replace('?product_code=', '?product_code=' . $meta_product_code, $template); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); - $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true); - $information->ic_content = str_replace('', $breadcrumb_content, $information->ic_content); + $ads_by_google = !empty ($meta_google_ad_article); + //H1模板替换 + $data_H1 = array(); + $data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类，获取信息顶级节点内容 + $data_H1['author'] = ''; //获取作者信息 + $author = $this->Operator_model->get_author_nikename($information->ic_author); + if (!empty ($author)) { + $data_H1['author'] = $author->OPI_FirstName; + } else { + $author_web = $this->Infoauthors_model->detail_by_id($information->ic_author); //原始作者，可能是在线作者等 + if (!empty ($author_web)) { + $data_H1['author'] = $author_web->a_name; + } + } + + // 检查图片地址格式 + $parsed_photo = $information->ic_photo; + $parsed_photo_url = parse_url($information->ic_photo); + if ( + (!isset ($parsed_photo_url['host']) || !isset ($parsed_photo_url['scheme'])) && isset ($parsed_photo_url['path']) + ) { + $parsed_photo = 'https://images.chinahighlights.com' . $parsed_photo_url['path']; + } + + $data_H1['ic_title'] = $information->ic_title; + $data_H1['ic_photo'] = $parsed_photo; + $data_H1['breadcrumb_data'] = $breadcrumb_data; + $data_H1['ads_by_google'] = $ads_by_google; + $data_H1['ic_datetime'] = $information->ic_datetime; + $template_H1 = $this->load->view($template_path . '-h1', $data_H1, true); + $template = str_replace('', $template_H1, $template); } // CH: 1; AH: 28; GH : 33
    -
    Save Your Time
    - -

    Save Your Time

    +
    Save Your Time
    + +

    Save Your Time

    • Less research, more enjoyment!
      • -
    • Real-time 1V1 expert planning.
      • -
    • Seamless coordination
      • +
    • Real-time 1V1 expert planning.
      • +
    • Seamless coordination
    - +
    -
    Maximize Your Flexibility
    +
    Maximize Your Flexibility

    Maximize Your Flexibility

    • Your own personal guide and ride.
      • -
    • Explore at your own pace.
      • -
    • Unparalleled flexibility, impossible on a group tour.
      • +
    • Explore at your own pace.
      • +
    • Unparalleled flexibility, impossible on a group tour.
    -
    Ensure Your Satisfactory
    +
    Ensure Your Satisfactory

    Ensure Your Satisfactory

    • Well-trained elite 20% of guides.
      • -
    • 20% vacancy on vehicles.
      • -
    • 24/7 emergency support.
      • +
    • 20% vacancy on vehicles.
      • +
    • 24/7 emergency support.
    -
    Celebrate Your Journey
    +
    Celebrate Your Journey +

    Celebrate Your Journey

    • Family adventures
      • -
    • Celebrate milestones with style!
      • -
    • Photographer service for special moments
      • +
    • Celebrate milestones with style!
      • +
    • Photographer service for special moments
    - +
    -
    Save Your Time
    - -

    Save Your Time

    +
    Save Your Time
    + +

    Save Your Time

    • Less research, more enjoyment!
      • -
    • Real-time 1V1 expert planning.
      • -
    • Seamless coordination
      • +
    • Real-time 1V1 expert planning.
      • +
    • Seamless coordination
    - +
    -
    Maximize Your Flexibility
    +
    Maximize Your Flexibility

    Maximize Your Flexibility

    • Your own personal guide and ride.
      • -
    • Explore at your own pace.
      • -
    • Unparalleled flexibility, impossible on a group tour.
      • +
    • Explore at your own pace.
      • +
    • Unparalleled flexibility, impossible on a group tour.
    -
    Ensure Your Satisfactory
    +
    Ensure Your Satisfactory

    Ensure Your Satisfactory

    • Well-trained elite 20% of guides.
      • -
    • 20% vacancy on vehicles.
      • -
    • 24/7 emergency support.
      • +
    • 20% vacancy on vehicles.
      • +
    • 24/7 emergency support.
    -
    Celebrate Your Journey
    +
    Celebrate Your Journey

    Celebrate Your Journey

    • Family adventures
      • -
    • Celebrate milestones with style!
      • -
    • Photographer service for special moments
      • +
    • Celebrate milestones with style!
      • +
    • Photographer service for special moments
    - +