diff --git a/application/controllers/information.php b/application/controllers/information.php index a9231e06..b6a6dc99 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -987,14 +987,42 @@ class Information extends CI_Controller { $information = $this->Information_model->Detail($this->input->get('is_id')); $recommand_information = $this->recommand_information($information); - $tipsRightList = []; - for ($i=0; $i < 36; $i++) { - $key = 'List Tips Right '.$i; - if (array_key_exists($key, $recommand_information)) { - $tipsRightList[] = $recommand_information[$key]; + // var_dump($recommand_information); + $tips_right_a = []; + $tips_right_b = []; + $tips_right_c = []; + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right A_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_a[] = $recommand_information[$key]; } } - var_dump($tipsRightList); + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right B_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_b[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right C_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_c[] = $recommand_information[$key]; + } + } + + echo 'List Tips Right A: '.COUNT($tips_right_a); + echo '; List Tips Right B: '.COUNT($tips_right_b); + echo '; List Tips Right C: '.COUNT($tips_right_c); + + $tips_right_list_content = $this->load->view( + 'mobile_first/ah-tips-right-list', + array( + 'tips_right_a' => $tips_right_a, + 'tips_right_b' => $tips_right_b, + 'tips_right_c' => $tips_right_c), + true + ); + echo $tips_right_list_content; } public function test_feedback() @@ -1492,6 +1520,40 @@ class Information extends CI_Controller if (!empty($template_recommand['Tips Right'])) { $template = str_replace('', "
" . $template_recommand['Tips Right']->it_content . "
", $template); } + // 右侧列表广告 + $tips_right_a = []; + $tips_right_b = []; + $tips_right_c = []; + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right A_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_a[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right B_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_b[] = $recommand_information[$key]; + } + } + for ($i=1; $i <= 12; $i++) { + $key = 'List Tips Right C_'.$i; + if (array_key_exists($key, $recommand_information) && $recommand_information[$key]) { + $tips_right_c[] = $recommand_information[$key]; + } + } + + $tips_right_list_content = $this->load->view( + 'mobile_first/ah-tips-right-list', + array( + 'tips_right_a' => $tips_right_a, + 'tips_right_b' => $tips_right_b, + 'tips_right_c' => $tips_right_c), + true + ); + + $template = str_replace('', $tips_right_list_content, $template); + //文中的信息推荐 if (strpos($information->ic_content, '') !== false) { $information->ic_content = str_replace('', $this->load->view($template_path . '-recommends-article', array('recommands' => $template_recommand), true), $information->ic_content); diff --git a/application/third_party/order/views/ah/confirm_order.php b/application/third_party/order/views/ah/confirm_order.php index 5656f3e6..6d6b1f02 100644 --- a/application/third_party/order/views/ah/confirm_order.php +++ b/application/third_party/order/views/ah/confirm_order.php @@ -158,7 +158,7 @@ margin-bottom: 10px; background: url(https://data.chinahighlights.com/pic/top10/tour-calendar.png) no-repeat 15px; } -input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15px;} +input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15px; border: 1px solid #d1d1d1; border-radius: 4px;} .selectionBlock { display: inline-block; @@ -756,7 +756,7 @@ select.gender_pick {border: 1px solid #d1d1d1; Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

-
+
@@ -766,15 +766,18 @@ select.gender_pick {border: 1px solid #d1d1d1;
+

Arrival date

+
+
+
+
- +
-
+
+

Departure date

+
+
+
+
- +
diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 94633c9d..4f107759 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -158,7 +158,8 @@ margin-bottom: 10px; background: url(https://data.chinahighlights.com/pic/top10/tour-calendar.png) no-repeat 15px; } -input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15px;} +input.arrivalDate {height: 50px; width: 347px; font-size: 19px; padding: 5px 15px; border: 1px solid #d1d1d1; + border-radius: 4px;} .selectionBlock { display: inline-block; @@ -757,7 +758,7 @@ select.gender_pick {border: 1px solid #d1d1d1; Please ensure the details you provide are correct. You can skip this if your don't need airport transfer service.

-
+
@@ -766,15 +767,14 @@ select.gender_pick {border: 1px solid #d1d1d1;
-
+
+

Arrival time

- +
-
+
-
+
+

Departure time

- +
diff --git a/application/third_party/recommend/views/bind.php b/application/third_party/recommend/views/bind.php index e572dfa4..44abdcde 100644 --- a/application/third_party/recommend/views/bind.php +++ b/application/third_party/recommend/views/bind.php @@ -348,22 +348,58 @@
-
右侧列表广告
+
右侧列表广告 A
    - +
  1. - List Tips Right ir_rule; ?> + List Tips Right A_ ir_rule; ?>
    2. -
- - + +
+
+ + +
+
右侧列表广告 B
+
+
    + +
  1. + + List Tips Right B_ ir_rule; ?> + +
    2. + +
+
+
+ + +
+
右侧列表广告 C
+
+
    + +
  1. + + List Tips Right C_ ir_rule; ?> + +
    2. + +
diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 23aebf64..f7c809ca 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1718,6 +1718,29 @@ $meta_subnavi_arr = array(
+ config->item('site_code') == 'gm') {?> +
+ + +
+ + ic_ht_area_type == 'g') {?>
diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php index d9e4fc11..f56b929b 100644 --- a/application/views/mobile_first/ah-feedback-newest.php +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -5,10 +5,7 @@
Tour Review
-

- Tour Review -

+
diff --git a/application/views/mobile_first/ah-next.php b/application/views/mobile_first/ah-next.php index 99047737..362f2990 100644 --- a/application/views/mobile_first/ah-next.php +++ b/application/views/mobile_first/ah-next.php @@ -10,11 +10,11 @@ @@ -22,11 +22,11 @@ @@ -34,11 +34,11 @@ @@ -46,11 +46,11 @@ @@ -60,11 +60,11 @@ @@ -75,11 +75,11 @@ @@ -89,11 +89,11 @@ @@ -103,11 +103,11 @@ @@ -130,12 +130,12 @@ @@ -144,13 +144,13 @@
@@ -243,13 +243,13 @@ diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php index fddd3712..49ff2ca2 100644 --- a/application/views/mobile_first/ah-pc.php +++ b/application/views/mobile_first/ah-pc.php @@ -71,6 +71,7 @@ @@ -190,10 +191,12 @@ @@ -219,6 +222,7 @@ +
Create my trip
@@ -398,6 +402,32 @@ +
+
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/ah-tips-right-list.php new file mode 100644 index 00000000..211b7943 --- /dev/null +++ b/application/views/mobile_first/ah-tips-right-list.php @@ -0,0 +1,26 @@ +
+
Popular tours
+
+ +
+
Make the most of your time
+
+ +
+
Choose the best time to visit
+
+ +
+
\ No newline at end of file diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php index e8a64bf1..22273d54 100644 --- a/application/views/mobile_first/ah.php +++ b/application/views/mobile_first/ah.php @@ -91,10 +91,19 @@ aria-owns="submenu-5">2-Week Itinerary - + + + - + + + @@ -171,7 +191,8 @@ Schedules
  • Train Travel
  • Flight
    • -
  • Train App +
  • Train App Download
    • @@ -179,13 +200,23 @@
  • Asia Tours
    @@ -207,27 +238,30 @@ Activities
    • - +
  • - Create my trip -
    • - + Contact us + +
    - +
    - + - - + +
    -
    Top 10 China tours 2023/2024 for first visits and returns: embark on a lifetime experience. Learn +
    Top 10 China tours 2023/2024 for first visits and returns: embark on a lifetime + experience. Learn more
    @@ -240,7 +274,8 @@ -
    Contact us
    +
    Create my trip
    @@ -258,7 +293,8 @@ We are here to help you...
    start planning your tailor-made tour with 1-1 help from our travel advisors. - Create Your Trip + Create Your Trip     @@ -312,86 +348,114 @@
    -
    -
    +
    +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    -
    - -
    -
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    @@ -471,6 +535,7 @@
    @@ -274,7 +276,7 @@ -
    Contact Us +
    Create My Trip
    @@ -336,10 +338,9 @@
    -
    +
    -
    +
    +
    + +
    + +
    + +
    +
    -
    +
    China Highlights Logo
    China Highlights tailor-makes China tours to help travelers discover China diff --git a/application/views/mobile_first/gh-next.php b/application/views/mobile_first/gh-next.php index 925ece24..f6aff2f1 100644 --- a/application/views/mobile_first/gh-next.php +++ b/application/views/mobile_first/gh-next.php @@ -1,7 +1,7 @@ -

    Recommended Tours

    +

    Recommended Tours

    @@ -148,7 +148,7 @@ -

    Recommended Articles

    +

    Recommended Articles

    diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php index 20bc771f..96236f98 100644 --- a/application/views/mobile_first/gh-pc.php +++ b/application/views/mobile_first/gh-pc.php @@ -728,7 +728,7 @@
    diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php index d72c8a89..b4086114 100644 --- a/application/views/mobile_first/gh.php +++ b/application/views/mobile_first/gh.php @@ -85,7 +85,7 @@ height="0" width="0" style="display:none;visibility:hidden">