From eb6e695c9c9ae459bf422a7e1a56424df899932d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 19 May 2021 10:41:37 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=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 | 35 +++++----------- .../views/mobile_first/chinatravel.php | 40 +++++++------------ 2 files changed, 24 insertions(+), 51 deletions(-) diff --git a/application/views/mobile_first/chinatravel-pc.php b/application/views/mobile_first/chinatravel-pc.php index 6987f646..6fd6a2d6 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -60,10 +60,6 @@
  • Top 10 China Tours
  • China Panda Tours
    • -
  • Family Tours
    • -
  • Silk Road
    • -
  • China Train Travel
    • -
  • Honeymoon Tours
    •  @@ -77,8 +73,8 @@
  • Zhangjiajie
  • Xi'an
  • Huangshan
    • -
  • Tibet
  • Suzhou
    • +
  • Hangzhou
    • @@ -91,7 +87,7 @@
  • Chengdu Day Trips
  • Guilin Day Trips
  • Xi'an Day Trips
    • -
  • Hong Kong Day Trips
    • +
  • Zhangjiajie Day Trips
    • @@ -99,11 +95,10 @@ @@ -111,26 +106,16 @@
  • Create My Trip
  • About Us -
    • diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index 5b07f305..d46d3c71 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -51,16 +51,12 @@ - + - - + From 2817801c393b92c28a45559ffbbd72ae78aaf8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 19 May 2021 11:03:09 +0800 Subject: [PATCH 02/13] fix --- application/views/mobile_first/chinatravel.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index d46d3c71..b24a8047 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -95,8 +95,7 @@ - - + @@ -112,10 +111,10 @@ From 78db95ca6cb8eca74f3531697dcd4c5a300bacf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Wed, 19 May 2021 11:12:22 +0800 Subject: [PATCH 03/13] fix --- application/views/mobile_first/chinatravel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index b24a8047..1decce37 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -113,7 +113,7 @@ From ae4d2ea6ef728046ab89243d72a1ba4efb5f59bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 21 May 2021 11:39:46 +0800 Subject: [PATCH 04/13] =?UTF-8?q?chengdu=E9=93=BE=E6=8E=A5fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/chinatravel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index 1decce37..24bc87ea 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -63,7 +63,7 @@ - + From 7e5efb0541937d96352e199dcceac8d421be8de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 24 May 2021 13:52:24 +0800 Subject: [PATCH 05/13] =?UTF-8?q?inquiry=20form=E8=A1=A8=E5=8D=95=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 6 ++- .../views/mobile_first/ch-inquiry-form.php | 40 +++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 application/views/mobile_first/ch-inquiry-form.php diff --git a/application/controllers/information.php b/application/controllers/information.php index dd6f73aa..f1a0f8c4 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -594,8 +594,8 @@ class Information extends CI_Controller $template = str_replace('', $information->ic_seo_keywords, $template); $template = str_replace('', $this->config->item('site_url') . $information->ic_url, $template); //非产品页面 - if (empty(get_meta($information->ic_id, 'meta_product_code'))) { - + $meta_product_code=get_meta($information->ic_id, 'meta_product_code'); + if (empty($meta_product_code)) { //H1模板替换 $data_H1 = array(); $data_H1['infocategory'] = $this->Information_model->get_detail_by_path($information->is_path, 1); //信息所属分类，获取信息顶级节点内容 @@ -612,6 +612,8 @@ class Information extends CI_Controller $template = str_replace('', $addthis_widget, $template); } else { $template = str_replace('', '', $template); + $inquiry_form_template = $this->load->view($template_path . '-inquiry-form', array('meta_product_code'=>$meta_product_code), true); + $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); } //顶部全屏大图 if ($device == 'mobile') { //移动端读取移动大图 diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php new file mode 100644 index 00000000..68bb0e30 --- /dev/null +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -0,0 +1,40 @@ +
    +
    +
    Quickly inquire about this tour via our WeChat: chinahighlightstour +
    +
    + +

    Or Submit an Inquiry Below

    + +
    +
    +

    +

    + +

    + +

    + +

    + +

    + +

    + + + +
    +
    +
    \ No newline at end of file From 13b4b2926c000262165df87c5b841916057c11af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 25 May 2021 14:39:02 +0800 Subject: [PATCH 06/13] fix --- 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 6fd6a2d6..05183e4b 100644 --- a/application/views/mobile_first/chinatravel-pc.php +++ b/application/views/mobile_first/chinatravel-pc.php @@ -24,6 +24,8 @@ + + diff --git a/application/views/mobile_first/chinatravel.php b/application/views/mobile_first/chinatravel.php index 24bc87ea..c4269ee2 100644 --- a/application/views/mobile_first/chinatravel.php +++ b/application/views/mobile_first/chinatravel.php @@ -24,6 +24,8 @@ + + From 25853867d17b6fce28d78fe116015a8f462a0481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 25 May 2021 15:47:01 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E9=9D=A09=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctmobilefirst/libraries/Currency.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/third_party/ctmobilefirst/libraries/Currency.php b/application/third_party/ctmobilefirst/libraries/Currency.php index ee25607a..1885a103 100644 --- a/application/third_party/ctmobilefirst/libraries/Currency.php +++ b/application/third_party/ctmobilefirst/libraries/Currency.php @@ -169,7 +169,8 @@ class Currency { if ($val_len == 1) return 9; - $discount = 16; + //$discount = 16; + $discount =6; $val_pow = pow(10, $val_len - 1); $min_val = $val_pow - 1; From f27931d894cbe3f4d4a8fefad2a3498bef17d387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 25 May 2021 17:11:25 +0800 Subject: [PATCH 08/13] fix --- .../third_party/ctmobilefirst/libraries/Currency.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/third_party/ctmobilefirst/libraries/Currency.php b/application/third_party/ctmobilefirst/libraries/Currency.php index 1885a103..4bd40134 100644 --- a/application/third_party/ctmobilefirst/libraries/Currency.php +++ b/application/third_party/ctmobilefirst/libraries/Currency.php @@ -165,12 +165,12 @@ class Currency { if (empty($value)) return 0; if (!is_numeric($value)) return $value; - $val_len = strlen($value); + $val_len = strlen(floatval($value)); if ($val_len == 1) return 9; - //$discount = 16; - $discount =6; + $discount = 16; + //$discount =6; $val_pow = pow(10, $val_len - 1); $min_val = $val_pow - 1; From dbdcc677d73bb6aa1d9f0fa1b3ef8838186fa61a Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 26 May 2021 12:47:03 +0800 Subject: [PATCH 09/13] ok --- application/views/bootstrap3/header.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 1204310f..7b0880cc 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -162,7 +162,11 @@ - + config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> + + + + From c859983c1a220df3dec7a645002b5627b1599c22 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 26 May 2021 13:00:14 +0800 Subject: [PATCH 10/13] fix --- application/views/bootstrap/header.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index 6bb72d76..945717e2 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -110,8 +110,12 @@ - - + config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> + + + + + From 722cb129c25b2dab07228b7f4e164b80fa87d7c4 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 26 May 2021 13:02:28 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap/header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index 945717e2..080164a5 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -111,9 +111,9 @@ config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> - + - + From 39f3ddadfcc58a8a3d75b80aa551f003a7168589 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Wed, 26 May 2021 13:03:46 +0800 Subject: [PATCH 12/13] =?UTF-8?q?+1=20=E6=96=B0=E7=AA=97=E5=8F=A3=E6=89=93?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index 080164a5..d0540637 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -111,7 +111,7 @@ config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?> - + From 0d8bec8fca14f39ebba16dca650b6eabbf9d09be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 26 May 2021 14:56:30 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E9=98=B2=E5=9E=83=E5=9C=BE=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=20gogole=20reCaptcha=20V3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/mobile_first/ch-inquiry-form.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php index 68bb0e30..76f031e2 100644 --- a/application/views/mobile_first/ch-inquiry-form.php +++ b/application/views/mobile_first/ch-inquiry-form.php @@ -37,4 +37,6 @@ Inquiry - \ No newline at end of file + + + \ No newline at end of file