diff --git a/application/libraries/Tags_analysis.php b/application/libraries/Tags_analysis.php
index 387886a2..3641b60e 100644
--- a/application/libraries/Tags_analysis.php
+++ b/application/libraries/Tags_analysis.php
@@ -42,6 +42,13 @@ class Tags_analysis {
$pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/booking_form_inquiry', $data, true);
$data['detail']->ic_content = str_replace('@BOOKINGFORM@', $pd_booking_from, $data['detail']->ic_content);
}
+
+ //填充预订表单模板
+ if (strpos($data['detail']->ic_content, '@NEWBOOKINGFORM@') !== false) { //默认使用booking_form_inquiry模板
+ //$pd_booking_from = $this->CI->load->view('tags/' . Site_Code . '/booking_form', $data, true);
+ $pd_booking_from = $this->CI->load->view(CONST_SITE_CODE .'/forms/new_booking_form', $data, true);
+ $data['detail']->ic_content = str_replace('@BOOKINGFORM@', $pd_booking_from, $data['detail']->ic_content);
+ }
//填充预订表单模板
if (strpos($data['detail']->ic_content, '@BOOKINGFORM-PAYNOW@') !== false) {
diff --git a/application/views/ah/forms/new_booking_form.php b/application/views/ah/forms/new_booking_form.php
new file mode 100644
index 00000000..6f0cbdb1
--- /dev/null
+++ b/application/views/ah/forms/new_booking_form.php
@@ -0,0 +1,36 @@
+
+
\ No newline at end of file
diff --git a/css/detail-new.css b/css/detail-new.css
index 0208447f..58d63fbe 100644
--- a/css/detail-new.css
+++ b/css/detail-new.css
@@ -71,7 +71,8 @@ transform:rotate(-8deg);
.fixedNav { display: block;}
.fixedNav li { margin-bottom:5px; border:1px solid #d1d1d1; background:#f1f1f1; border-radius:4px; padding:10px 25px; font-size:20px; color:#777; margin-left:30px;}
.fixedNav li.active { background: url(/pic/bg-nav-active.png) no-repeat left; border: none; color:#fff; position:relative; margin-left:0; padding-left:55px;}
-.fixedNav li:hover { background:#a31022; color:#fff;}
+.fixedNav li:hover{ background:#a31022;}
+.fixedNav li:hover a {color:#fff;}
@media(max-width:750px) {
.priceBlock { margin-left:0 !important;}
.guideInfo, .carInfo { width:100% !important; float: none !important; border-right: none !important; border-bottom:1px solid #d1d1d1; padding-left:0 !important; padding-bottom:20px; margin-bottom:20px;}
diff --git a/js/basic.js b/js/basic.js
index 829b8023..f6331341 100644
--- a/js/basic.js
+++ b/js/basic.js
@@ -130,7 +130,33 @@ $(function () {
name: 'nationality_states',
source: substringMatcher(nationality_map)
});
-
+
+ //展开所有天数行程
+ $('.openall').click(function(){
+ $('.collapse').addClass('in');
+ $('.detail_collapse').removeClass('openAction');
+ $('.detail_collapse').addClass('closeAction');
+ });
+
+ //关闭所有天数行程
+ $('.closeall').click(function(){
+ $('.collapse').removeClass('in');
+ $('.detail_collapse').removeClass('closeAction');
+ $('.detail_collapse').addClass('openAction');
+ });
+
+ //单天页面打开关闭
+ $('.detail_collapse').click(function(){
+ var flag = $(this).hasClass('collapsed');
+ console.log(flag);
+ if(!flag){
+ $(this).removeClass('closeAction');
+ $(this).addClass('openAction');
+ }else{
+ $(this).removeClass('openAction');
+ $(this).addClass('closeAction');
+ }
+ });
})