From ffec751badf3581367dfda2f5664f8cae0fc1afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 16 Aug 2021 14:17:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8A=A0=E8=B0=B7=E6=AD=8C=E5=B9=BF?= =?UTF-8?q?=E5=91=8A=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/chinatravel-pc.php | 2 ++ application/views/mobile_first/chinatravel.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 7ec6bb62..55545103 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -280,6 +280,8 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c + + diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index 79d65de3..c3ff4293 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -283,6 +283,8 @@ gtag('js', new Date()); gtag('config', 'AW-823612164'); + + From 696d8e5228d0446bc0dd1f2c5438b338ae308735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 16 Aug 2021 15:11:43 +0800 Subject: [PATCH 2/8] =?UTF-8?q?CT=E8=B0=B7=E6=AD=8C=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/chinatravel-pc.php | 2 +- application/views/mobile_first/chinatravel.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 55545103..f14f8a68 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -281,7 +281,7 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c - + diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index c3ff4293..ae9c937b 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -284,7 +284,7 @@ gtag('config', 'AW-823612164'); - + From 2e17795eac96a5c5c5d350a13db00258c16c9f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 16 Aug 2021 15:47:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?CT=E4=BC=98=E5=8C=96=E5=B9=BF=E5=91=8A?= =?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/controllers/information.php | 2 ++ application/views/mobile_first/chinatravel-pc.php | 4 +++- application/views/mobile_first/chinatravel.php | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 1e846a4c..4195aa36 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -919,12 +919,14 @@ class Information extends CI_Controller //非产品页面 $data["PRODUCTJS"] = ""; + $data["ISPRODUCT"] = false; //判断是否是产品页 $template_path = 'mobile_first/' . $this->config->item('site_code'); $data["addthis_widget"] = ""; if (empty(get_meta($information->ic_id, 'meta_product_code'))) { $data["addthis_widget"] = $this->load->view($template_path . '-add-this', false, true); //社媒代码addthis } else { // $data["PRODUCTJS"] = ''; + $data["ISPRODUCT"] = true; } //顶部全屏大图 diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index f14f8a68..4209dbbe 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -117,7 +117,7 @@
  • Create My Trip
  • -
  • About Us +
  • About Us
  • @@ -280,8 +280,10 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c + + diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index ae9c937b..89b8a5c5 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -283,8 +283,10 @@ gtag('js', new Date()); gtag('config', 'AW-823612164'); + + From 6bbbb1d5d81e115125f858ed91fdee50b0db086f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 16 Aug 2021 15:51:50 +0800 Subject: [PATCH 4/8] fix --- application/controllers/information.php | 4 ++-- application/views/mobile_first/chinatravel-pc.php | 2 +- application/views/mobile_first/chinatravel.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 4195aa36..60d793b9 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -919,14 +919,14 @@ class Information extends CI_Controller //非产品页面 $data["PRODUCTJS"] = ""; - $data["ISPRODUCT"] = false; //判断是否是产品页 + $data["ISPRODUCT"] = "no"; //判断是否是产品页 $template_path = 'mobile_first/' . $this->config->item('site_code'); $data["addthis_widget"] = ""; if (empty(get_meta($information->ic_id, 'meta_product_code'))) { $data["addthis_widget"] = $this->load->view($template_path . '-add-this', false, true); //社媒代码addthis } else { // $data["PRODUCTJS"] = ''; - $data["ISPRODUCT"] = true; + $data["ISPRODUCT"] = "yes"; } //顶部全屏大图 diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 4209dbbe..5cfbb210 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -280,7 +280,7 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c - + diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index 89b8a5c5..236c0e36 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -283,7 +283,7 @@ gtag('js', new Date()); gtag('config', 'AW-823612164'); - + From 0ebf6029f7a6101d4abf2d797778331cbb64cfd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 16 Aug 2021 17:11:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/chinatravel-pc.php | 16 ++++++++---- .../views/mobile_first/chinatravel.php | 25 +++++++++++-------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 5cfbb210..26c37394 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -93,13 +93,14 @@ -
  • China Guide +
  • Travel Guide @@ -117,7 +118,12 @@
  • Create My Trip
  • -
  • About Us +
  • Trains +
  • @@ -212,7 +218,7 @@