From eecac847a44edf573ce9c2e9f03eb9933e967537 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Thu, 14 Apr 2022 14:40:08 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E7=A7=BB=E9=99=A4AMP=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/bootstrap3/information_edit.php | 1515 ++++++----------- 1 file changed, 543 insertions(+), 972 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 6c42358b..4cfc44a2 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1,4 +1,5 @@ - +
@@ -555,17 +576,11 @@ @@ -575,8 +590,7 @@
-
+
@@ -585,10 +599,8 @@
-
- +
+ @@ -609,7 +621,8 @@ } else { $PcAmpChecked = ''; } ?> - + } + | | - amp_status === '1') { ?> - + amp_status === '2') { ?> - + amp_status === '0') { ?> - +
+ if ($embody == 1) { + echo 'border-color:green;'; + } + ?>" name="ic_title" value="ic_title; ?>">
链接标题
- +
链接地址 - + - + ic_sitecode == 'ch') { ?> - + ic_sitecode == 'gm') { ?> - + ic_sitecode == 'ah') { ?> - +
- +
- ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel' ) { ?> + ic_sitecode == 'ct' || $information->ic_sitecode == 'chinatravel') { ?>
- +
@@ -728,27 +715,22 @@
- + - +
- +
- +
- +
@@ -757,50 +739,30 @@
- +
- +
- +
- +
-
+
+
+ + +
-
- - -
+
+ + +
-
- - +
+ + +
-
ic_sitecode == 'chinatravel') { - ?> -
-
- - -
-
- - +
+
+ + -
-
- - -
- -
- - -
- -
-
-
- - 1.点击生成游船总数据文件  2.点击生成当前页面游船数据文件 - -
-
- - - - - - - - - - - - - - - - - +
+ + +
+ +
+
+
+ + 1.点击生成游船总数据文件  2.点击生成当前页面游船数据文件 + +
+
+ + + + + + + + + + + + + + + + +

@@ -1034,32 +947,21 @@ - +
@@ -1068,158 +970,103 @@
- +
- +
- +
ic_sitecode == 'cht' || $information->ic_sitecode == "ct") { - ?> + ?>
"> + if ($information->ic_ht_area_type != 'c' && $information->ic_sitecode != "ct") { + echo 'hidden'; + } ?>"> - +
- -
+ if ($information->ic_ht_area_type == 'c') { + echo 'col-sm-4'; + } else { + echo 'col-sm-9'; + } ?>">
@@ -1227,28 +1074,24 @@
$vin) { - if (in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id + if ( + in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id ) { $children_cnt++; } } echo ""; if ($children_cnt > 0) { - ?> + ?>
+
- - + - +
- +
- +
- -
@@ -1373,87 +1178,54 @@
- +
- +
-
- +
@@ -1466,18 +1238,11 @@
- +
+
ic_ht_area_type == 'err') { ?>
- +
@@ -1619,66 +1352,38 @@
- +
- +
- +
- +
@@ -1686,14 +1391,9 @@
+
- +
+ + + +
- +
- +
- +
- +
-
+
+ - + - ic_photo, '//') === false) { - $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; - } else { - $list_picture = $information->ic_photo; - } + ic_photo, '//') === false) { + $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; + } else { + $list_picture = $information->ic_photo; + } ?> - +
- +
-
+
- - 绑定 - + + 绑定 +
@@ -2236,18 +1824,15 @@ }
-
+
-
@@ -2255,10 +1840,8 @@
-
@@ -2271,9 +1854,8 @@ $value) { $value == $information->ic_type ? $select_str = 'selected' : $select_str = ''; ?> - - value=""> + @@ -2282,19 +1864,16 @@ $value) { $value == $information->ic_template ? $select_str = 'selected' : $select_str = ''; ?> - - value=""> + @@ -2316,17 +1895,15 @@ $select_str = 'selected'; } } ?> - - value="OPI_Code; ?>">OPI_Name; ?> + a_id == $information->ic_author) ? $select_str = 'selected' : $select_str = ''; ?> - - value="a_id; ?>">a_name; ?> + @@ -2339,36 +1916,32 @@
- config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct','chinatravel'))) { ?> + config->item('site_code'), array('ch', 'cht', 'gm', 'ah', 'gh', 'ct', 'chinatravel'))) { ?> -
- + \ No newline at end of file From 375ef052b4b526d6d62802b8c17ebf6427393754 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 15 Apr 2022 14:31:31 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E4=B8=AA=20wh?= =?UTF-8?q?y=20us=20=E7=9B=B8=E5=85=B3=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 | 12 ++++++++++++ application/views/mobile_first/ah-why-us-mobile.php | 3 +++ .../views/mobile_first/ah-why-us-tour-detail-pc.php | 3 +++ .../views/mobile_first/ah-why-us-tour-list-pc.php | 4 ++++ 4 files changed, 22 insertions(+) create mode 100644 application/views/mobile_first/ah-why-us-mobile.php create mode 100644 application/views/mobile_first/ah-why-us-tour-detail-pc.php create mode 100644 application/views/mobile_first/ah-why-us-tour-list-pc.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 2c91a9a4..24a3d912 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1223,6 +1223,18 @@ class Information extends CI_Controller true); $information->ic_content = str_replace('', $inquiry_form_template, $information->ic_content); } + // why-us 相关的标签 + $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true); + $template = str_replace('', $why_us_mobile, $template); + + $why_us_tour_detail_pc = $this->load->view($template_path . '-why-us-tour-detail-pc', false, true); + $template = str_replace('', $why_us_tour_detail_pc, $template); + + $why_us_tour_list_pc = $this->load->view($template_path . '-why-us-tour-list-pc', false, true); + $template = str_replace('', $why_us_tour_list_pc, $template); + + $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true); + $information->ic_content = str_replace('', $breadcrumb_content, $information->ic_content); //主样式表，内联模式 if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 diff --git a/application/views/mobile_first/ah-why-us-mobile.php b/application/views/mobile_first/ah-why-us-mobile.php new file mode 100644 index 00000000..bf05df35 --- /dev/null +++ b/application/views/mobile_first/ah-why-us-mobile.php @@ -0,0 +1,3 @@ +
+travel with confidence despite covid +
\ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-detail-pc.php b/application/views/mobile_first/ah-why-us-tour-detail-pc.php new file mode 100644 index 00000000..20c32bd7 --- /dev/null +++ b/application/views/mobile_first/ah-why-us-tour-detail-pc.php @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-list-pc.php b/application/views/mobile_first/ah-why-us-tour-list-pc.php new file mode 100644 index 00000000..a59edb14 --- /dev/null +++ b/application/views/mobile_first/ah-why-us-tour-list-pc.php @@ -0,0 +1,4 @@ + +
+ +
\ No newline at end of file From cd87a986d0dd10a29766fe64e48b73b8b3ff3cfe Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 15 Apr 2022 16:43:43 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Why=20US=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 24a3d912..38442bfa 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1225,13 +1225,13 @@ class Information extends CI_Controller } // why-us 相关的标签 $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true); - $template = str_replace('', $why_us_mobile, $template); + $information->ic_content = str_replace('', $why_us_mobile, $template); $why_us_tour_detail_pc = $this->load->view($template_path . '-why-us-tour-detail-pc', false, true); - $template = str_replace('', $why_us_tour_detail_pc, $template); + $information->ic_content = str_replace('', $why_us_tour_detail_pc, $template); $why_us_tour_list_pc = $this->load->view($template_path . '-why-us-tour-list-pc', false, true); - $template = str_replace('', $why_us_tour_list_pc, $template); + $information->ic_content = str_replace('', $why_us_tour_list_pc, $template); $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true); $information->ic_content = str_replace('', $breadcrumb_content, $information->ic_content); From c9d0ef507619a06d06d68444592d6a3d84246234 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 15 Apr 2022 16:46:16 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Why=20Us=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 38442bfa..71a7d87a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1225,13 +1225,13 @@ class Information extends CI_Controller } // why-us 相关的标签 $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true); - $information->ic_content = str_replace('', $why_us_mobile, $template); + $information->ic_content = str_replace('', $why_us_mobile, $information->ic_content); $why_us_tour_detail_pc = $this->load->view($template_path . '-why-us-tour-detail-pc', false, true); - $information->ic_content = str_replace('', $why_us_tour_detail_pc, $template); + $information->ic_content = str_replace('', $why_us_tour_detail_pc, $information->ic_content); $why_us_tour_list_pc = $this->load->view($template_path . '-why-us-tour-list-pc', false, true); - $information->ic_content = str_replace('', $why_us_tour_list_pc, $template); + $information->ic_content = str_replace('', $why_us_tour_list_pc, $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); From e7d2d47bd2d10bddf1bb45b38fd411e95b9028d8 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 18 Apr 2022 09:15:12 +0800 Subject: [PATCH 05/12] fd --- application/views/bootstrap3/information_edit.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 4cfc44a2..aeaf30c4 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1263,6 +1263,7 @@ 'best' => '实用信息', 'culture' => '文化', 'top10' => 'TOP10', + 'lifestyle' => '生活方式', ); ?> From 4faf6f953869f340aeec2c303a99edfa51759a49 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 18 Apr 2022 09:17:09 +0800 Subject: [PATCH 06/12] meta --- application/views/bootstrap3/information_edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index aeaf30c4..786ad31f 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1293,6 +1293,7 @@ +
From 12659386bd754339130f71431a84c56b7f6e3359 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Mon, 18 Apr 2022 09:17:32 +0800 Subject: [PATCH 07/12] fix up +1 --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 786ad31f..762197d6 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1293,7 +1293,7 @@ - +
From 5a44dd6472e6cadb8f5846a8f44f30e0d5980638 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 18 Apr 2022 14:22:02 +0800 Subject: [PATCH 08/12] 11 --- application/views/mobile_first/ah-why-us-mobile.php | 4 ++-- .../views/mobile_first/ah-why-us-tour-detail-pc.php | 4 ++-- .../views/mobile_first/ah-why-us-tour-list-pc.php | 9 +++++---- application/views/mobile_first/gh.php | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/application/views/mobile_first/ah-why-us-mobile.php b/application/views/mobile_first/ah-why-us-mobile.php index bf05df35..fb081751 100644 --- a/application/views/mobile_first/ah-why-us-mobile.php +++ b/application/views/mobile_first/ah-why-us-mobile.php @@ -1,3 +1,3 @@ -
-travel with confidence despite covid +
+travel with confidence despite covid
\ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-detail-pc.php b/application/views/mobile_first/ah-why-us-tour-detail-pc.php index 20c32bd7..9abb740b 100644 --- a/application/views/mobile_first/ah-why-us-tour-detail-pc.php +++ b/application/views/mobile_first/ah-why-us-tour-detail-pc.php @@ -1,3 +1,3 @@ -
- + \ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-list-pc.php b/application/views/mobile_first/ah-why-us-tour-list-pc.php index a59edb14..099f0f18 100644 --- a/application/views/mobile_first/ah-why-us-tour-list-pc.php +++ b/application/views/mobile_first/ah-why-us-tour-list-pc.php @@ -1,4 +1,5 @@ - -
- -
\ No newline at end of file + \ No newline at end of file diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index d74449ce..b9d926c5 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -171,7 +171,7 @@ aria-label="festival">
global highlights' wechat code
Scan and add us on WhatsApp: +86 15807734776 - Email: contact@globalhighlights.com + contact@globalhighlights.com

Or send an inquiry below

From c3644d857ec3d1ac2c49ec12d181b0374e21e8c6 Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 18 Apr 2022 14:22:37 +0800 Subject: [PATCH 09/12] 11 --- application/views/mobile_first/ah-why-us-mobile.php | 2 +- application/views/mobile_first/ah-why-us-tour-detail-pc.php | 2 +- application/views/mobile_first/ah-why-us-tour-list-pc.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/mobile_first/ah-why-us-mobile.php b/application/views/mobile_first/ah-why-us-mobile.php index fb081751..812d897b 100644 --- a/application/views/mobile_first/ah-why-us-mobile.php +++ b/application/views/mobile_first/ah-why-us-mobile.php @@ -1,3 +1,3 @@
-travel with confidence despite covid +travel with confidence despite covid-19
\ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-detail-pc.php b/application/views/mobile_first/ah-why-us-tour-detail-pc.php index 9abb740b..74636ccf 100644 --- a/application/views/mobile_first/ah-why-us-tour-detail-pc.php +++ b/application/views/mobile_first/ah-why-us-tour-detail-pc.php @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/application/views/mobile_first/ah-why-us-tour-list-pc.php b/application/views/mobile_first/ah-why-us-tour-list-pc.php index 099f0f18..de29484f 100644 --- a/application/views/mobile_first/ah-why-us-tour-list-pc.php +++ b/application/views/mobile_first/ah-why-us-tour-list-pc.php @@ -1,5 +1,5 @@ \ No newline at end of file From 052be1141e91aaba0dc6698f38dd1560da1a550a Mon Sep 17 00:00:00 2001 From: candice Date: Mon, 18 Apr 2022 14:49:15 +0800 Subject: [PATCH 10/12] 11 --- application/views/mobile_first/gh-pc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 07dec1fc..fcac58dc 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -269,7 +269,10 @@ height="0" width="0" style="display:none;visibility:hidden">
- +
+ We are here to help you...
start planning your tailor-made global trip with 1-1 help from our travel advisors. +
Create Your Trip
+