From 0db015827b02174a5ffb72c455ccd72623e6c2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Fri, 14 Mar 2025 14:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=B5=B7=E7=AB=99fix=20,=E6=A1=82?=
 =?UTF-8?q?=E6=9E=97=E7=AB=99fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       | 20 +++++++++++--------
 .../views/mobile_first/guilin-train-index.php |  6 +++---
 .../mobile_first/shanghai-daydetail-form.php  |  4 ++--
 .../mobile_first/shanghai-form-tourqi.php     |  6 +++---
 media/popselectpicture.php                    |  3 +++
 wysiwyg/ckfinder/安装说明.txt             |  6 +++++-
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 040730de..8da40f31 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -4334,8 +4334,8 @@ class Information extends CI_Controller
     $data = array();
 
     #region 公用数据
-   // $apiurl = "http://202.103.68.104:88/info.php"; //本地测试
-    $apiurl = "https://ct.mycht.cn/info.php"; //网前
+    $apiurl = "http://202.103.68.104:88/info.php"; //本地测试
+   // $apiurl = "https://ct.mycht.cn/info.php"; //网前
 
     //先准备数据，采用直接赋值视图然后返回视图字符串的模式，不使用一次次替换视图模板内容的模式。
     $data["TITLE"] = $information->ic_seo_title;
@@ -4471,8 +4471,8 @@ class Information extends CI_Controller
     }
 
     //主样式表，内联模式
-    //$apiweb="http://202.103.68.104:88";     //本地测试
-    $apiweb = "https://data.guilinchina.net";
+    $apiweb="http://202.103.68.104:88";     //本地测试
+    //$apiweb = "https://data.guilinchina.net";
     $cssUrl = $apiweb . "/css/css3/base.css?v=" . time();
     $main_css_string = compress_css(GET_HTTP($cssUrl));
     $data["MAINCSS"] = '<style type="text/css">' . $main_css_string . '</style>';
@@ -4601,10 +4601,6 @@ class Information extends CI_Controller
       $dataform["TourCode"] = $productCode;
       $dataform["CLI_SN"] = $tourdata->clisn;
       $dataform["TourName"] = $information->ic_title;
-      $dataform["ic_photo"] = $information->ic_photo;
-      $template_form_tourqi = $this->load->view($template_path . '-form-tourqi', $dataform, true);
-      //使用simple_html_dom_lib库来进行表单添加
-      $ic_content = $this->html_optimize_lib->add_htmlcode($ic_content, "#maincontent", $template_form_tourqi);
 
     }
 
@@ -4690,6 +4686,14 @@ class Information extends CI_Controller
         }
       }
 
+
+      if ($meta_ct_page_type == "tourdetail") { //线路表单，左右结构，用标签来做
+        $dataform['device'] = $device;
+        $template_form_tourqi = $this->load->view($template_path . '-form-tourqi-new', $dataform, true);
+        $ic_content = str_replace('<!--@TOUR-FORM@-->', $template_form_tourqi, $ic_content);
+        $data["CUSTOMCONENT"] = $ic_content;
+      }
+
       //两种设备分别调用两种模板 ，静态化
       switch ($device) {
         case 'mobile':
diff --git a/application/views/mobile_first/guilin-train-index.php b/application/views/mobile_first/guilin-train-index.php
index ebae3f63..3452bde4 100644
--- a/application/views/mobile_first/guilin-train-index.php
+++ b/application/views/mobile_first/guilin-train-index.php
@@ -86,7 +86,7 @@
 
   </div>
 </div>
-  <link href="https://data.guilinchina.net/css/css3/flatpickr.css" rel="stylesheet" type="text/css" />
-  <link href="https://data.guilinchina.net/js/mobile-first/train/train-search.css" rel="stylesheet" type="text/css" />
+  <link href="/css/css3/flatpickr.css" rel="stylesheet" type="text/css" />
+  <link href="/js/mobile-first/train/train-search.css" rel="stylesheet" type="text/css" />
   <script defer type="text/javascript" src="https://data.chinahighlights.com/js/train/StationInfo.js"></script>
-  <script src="https://data.guilinchina.net/js/mobile-first/train/train.js" ></script>
\ No newline at end of file
+  <script src="/js/mobile-first/train/train.js" ></script>
\ No newline at end of file
diff --git a/application/views/mobile_first/shanghai-daydetail-form.php b/application/views/mobile_first/shanghai-daydetail-form.php
index 6c1b0d88..17bf1b38 100644
--- a/application/views/mobile_first/shanghai-daydetail-form.php
+++ b/application/views/mobile_first/shanghai-daydetail-form.php
@@ -4,10 +4,10 @@
 			<div class="bookingprice">
 				<div class="bookPricetit">
 					<p>from US $ <span class="tourPricebig"> <span class="js_getDayTripPrice" data="<?php echo $productCode ?>"></span> </span>p/p</p>
-					<p class="priceAddons"> <a href="javascript:;" class="js_PriceDetails">Price details</a></p>
+					<p class="priceAddons" style="display:none;"> <a href="javascript:;" class="js_PriceDetails">Price details</a></p>
 				</div>
 				<div class="bookf">
-					<p><span>1</span>Select Trave Date</p>
+					<p><span>1</span>Select Travel Date</p>
 					<div class="mleft43">
 						<input name="Starting_Date" type="text" class="form-control calendar3 hasDatepicker block" id="Starting_Date" value="" placeholder="Starting date" readonly>
 					</div>
diff --git a/application/views/mobile_first/shanghai-form-tourqi.php b/application/views/mobile_first/shanghai-form-tourqi.php
index 559aa10a..c5fe684b 100644
--- a/application/views/mobile_first/shanghai-form-tourqi.php
+++ b/application/views/mobile_first/shanghai-form-tourqi.php
@@ -4,10 +4,10 @@
 	          <div class="bookingprice">
 	            <div class="bookPricetit">
 	              <p>from US $ <span class="tourPricebig"> <?php echo $tourprice ?> </span>p/p</p>
-	              <p class="priceAddons"> <a href="javascript:;" class="js_PriceDetails">Price details</a></p>
+	              <p class="priceAddons" style="display:none;"> <a href="javascript:;" class="js_PriceDetails">Price details</a></p>
                 </div>
 	            <div class="bookf">
-	              <p><span>1</span>Select Trave Date</p>
+	              <p><span>1</span>Select Travel Date</p>
 	              <div class="mleft43">
 	                <input name="Starting_Date" id="Starting_Date" class="form-control datepicker" value="" placeholder="Starting date" readonly size="16" type="text">
                   </div>
@@ -17,7 +17,7 @@
 	              <p><span>2</span>Number of Travelers</p>
 	              <div class="mleft43">
 	                <select name="adultsnumber" id="adultsnumber" class="form-control m-bottom15">
-	                  <option value="1" selected="selected">Adults(Age12+)</option>
+	                  <option value="1" selected="selected">Adult(Age12+)</option>
 	                  <option value="1">1</option>
 	                  <option value="2">2</option>
 	                  <option value="3">3</option>
diff --git a/media/popselectpicture.php b/media/popselectpicture.php
index 4ab07b3c..65790e80 100644
--- a/media/popselectpicture.php
+++ b/media/popselectpicture.php
@@ -91,6 +91,9 @@
 			case 'trainspread':
 				$media_site_code = 'trainspread';
 				break;
+			case 'guilin':
+				$media_site_code = 'guilin';
+				break;
 			default:
 				$media_site_code = 'ch';
 		}
diff --git a/wysiwyg/ckfinder/安装说明.txt b/wysiwyg/ckfinder/安装说明.txt
index 2c8dbca4..893a2776 100644
--- a/wysiwyg/ckfinder/安装说明.txt
+++ b/wysiwyg/ckfinder/安装说明.txt
@@ -24,4 +24,8 @@ mklink /D "D:\wwwroot-ct\uploader-file\beijing\image" "D:\wwwroot-ct\mybeijingch
 mklink /D "D:\wwwroot-ct\uploader-file\beijing\pic" "D:\wwwroot-ct\mybeijingchina.com\pic"
 
 //trainspread
-mklink /D "D:\wwwroot-ct\uploader-file\trainspread\image" "D:\wwwroot-ct\origin-www.trainspread.com\images"
\ No newline at end of file
+mklink /D "D:\wwwroot-ct\uploader-file\trainspread\image" "D:\wwwroot-ct\origin-www.trainspread.com\images"
+
+//guilin
+mklink /D "D:\wwwroot-ct\uploader-file\guilin\image" "D:\wwwroot-ct\guilinchina.net\image"
+mklink /D "D:\wwwroot-ct\uploader-file\guilin\pic" "D:\wwwroot-ct\guilinchina.net\pic"
\ No newline at end of file