From e1284a83e95fa34229252e511ee55a962f396be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Mon, 28 Jul 2025 10:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E7=AB=99=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php       |  31 +++-
 .../mobile_first/shanghai-daytrip-list.php    | 169 +-----------------
 2 files changed, 31 insertions(+), 169 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 59f5c8cd..5b63db40 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -3748,7 +3748,7 @@ class Information extends CI_Controller
       $template_page_daytriplist = $this->load->view($template_path . '-daytrip-list', $dataDayTripList, true); //模板内容
       $ic_content = str_replace('<!--@TOUR-LIST-PAGE@-->', $template_page_daytriplist, $ic_content);
 
-      //$addonJs .= '<script src="' . $apiweb . '/js/mobile-first/daytriplist.js" defer></script>';
+      $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/daytriplist.js" defer></script>';
     }
 
 
@@ -4153,6 +4153,35 @@ class Information extends CI_Controller
 
     }
 
+
+    if ($meta_ct_page_type == "tourlist") {
+      //线路类型列表
+      $lineTypeList = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/api/getLineTypeList/?webcode=beijing"));
+      $dataTourList["lineTypeList"] = $lineTypeList;
+      $tourListData = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/api/getTourList/?webcode=beijing"));
+      $dataTourList["tourListData"] = $tourListData;
+
+      //替换模板
+      $template_page_tourlist = $this->load->view('mobile_first/shanghai-tour-list', $dataTourList, true); //模板内容,统一用上海站模板
+      $ic_content = str_replace('<!--@TOUR-LIST-PAGE@-->', $template_page_tourlist, $ic_content);
+
+      $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/tourlist.js" defer></script>';
+    }
+
+    if ($meta_ct_page_type == "daytriplist") {
+      //一日游类型
+      $allTypeList = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/api/getPagTypeList/?webcode=beijing"));
+      $dataDayTripList["allTypeList"] = $allTypeList;
+      $dayTripListData = json_decode(GET_HTTP($apiurl . "/thirdparty/ctmobilefirst/api/getSearchDaytripList/?webcode=beijing"));
+      $dataDayTripList["dayTripListData"] = $dayTripListData;
+
+      //替换模板
+      $template_page_daytriplist = $this->load->view('mobile_first/shanghai-daytrip-list', $dataDayTripList, true); //模板内容,统一用上海站模板
+      $ic_content = str_replace('<!--@TOUR-LIST-PAGE@-->', $template_page_daytriplist, $ic_content);
+
+      $addonJs .= '<script src="' . $apiweb . '/js/mobile-first/daytriplist.js" defer></script>';
+    }
+
     //表单页
     if (in_array($meta_ct_page_type, array("customize", "contactus", "pagewithform", "tourdetail"))) {
       $productType = $meta_ct_page_type;
diff --git a/application/views/mobile_first/shanghai-daytrip-list.php b/application/views/mobile_first/shanghai-daytrip-list.php
index 503492e9..479e3425 100644
--- a/application/views/mobile_first/shanghai-daytrip-list.php
+++ b/application/views/mobile_first/shanghai-daytrip-list.php
@@ -79,173 +79,6 @@
 <script>
     var TourData = <?php echo json_encode($dayTripListData, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP); ?>;    
     // 如果$tourListData可能为null，可以添加默认值
-    TourData = TourData || [];
-
-
-    document.addEventListener('DOMContentLoaded', function() {
-    // 获取DOM元素
-    const tourListContainer = document.getElementById('js_tourlist');
-    const allCountSpan = document.getElementById('all-count');
-    
-    // 初始化筛选器
-    setupFilter('theme-list', 'clear-theme');
-    setupFilter('hours-list', 'clear-hours');
-    setupFilter('price-list', 'clear-price');
-
-    // 通用函数：设置筛选列表的点击和清除功能
-    function setupFilter(listId, clearBtnId) {
-        const list = document.getElementById(listId);
-        const clearBtn = document.getElementById(clearBtnId);
-        
-        if (!list || !clearBtn) return;
-        
-        // 点击列表项
-        list.addEventListener('click', function(e) {
-            const target = e.target.closest('li');
-            if (target && e.target.tagName === 'A') {
-                target.classList.toggle('active');
-                filterAndDisplayTours();
-            }
-        });
-        
-        // 清除按钮
-        clearBtn.addEventListener('click', function() {
-            const activeItems = list.querySelectorAll('.active');
-            activeItems.forEach(item => {
-                item.classList.remove('active');
-            });
-            filterAndDisplayTours();
-        });
-    }
-
-    // 筛选并显示旅游项目
-    function filterAndDisplayTours() {
-
-        // 获取选中的主题
-        const selectedThemes = [];
-        document.querySelectorAll('#theme-list li.active a').forEach(a => {
-            selectedThemes.push(a.getAttribute('data-id'));
-        });
-
-        // 获取选中的时间范围
-        const selectedHourRanges = [];
-        document.querySelectorAll('#hours-list li.active a').forEach(a => {
-            selectedHourRanges.push(a.getAttribute('data-day'));
-        });
-
-        // 获取选中的价格范围
-        const selectedPriceRanges = [];
-        document.querySelectorAll('#price-list li.active a').forEach(a => {
-            selectedPriceRanges.push(a.getAttribute('data-price'));
-        });
-
-        // 筛选旅游数据
-        const filteredTours = TourData.filter(tour => {
-
-            // 检查主题
-            const themeMatch = selectedThemes.length === 0 || 
-                (tour.extendType && selectedThemes.some(theme => 
-                    tour.extendType.split(',').includes(theme)));
-
-            // 检查时间
-            const hourMatch = selectedHourRanges.length === 0 || 
-                selectedHourRanges.some(range => {
-                    const [min, max] = range.split('-').map(Number);
-                    const needTime = parseFloat(tour.needTime) || 0;
-                    return needTime >= min && needTime <= max;
-                });
-
-            // 检查价格
-            const priceMatch = selectedPriceRanges.length === 0 || 
-                selectedPriceRanges.some(range => {
-                    const [min, max] = range.split('-').map(Number);
-                    // 处理空价格或无效价格情况
-                    if (tour.price === undefined || tour.price === null || tour.price === "") return false;
-                    
-                    // 转换价格为数字
-                    const price = typeof tour.price === 'string' 
-                        ? parseFloat(tour.price.replace(/[^0-9.]/g, ''))
-                        : Number(tour.price);
-                    
-                    // 检查价格是否在范围内
-                    return !isNaN(price) && price >= min && price <= max;
-                });
-
-            return themeMatch && hourMatch && priceMatch;
-        });
-
-        // 更新总计数
-        allCountSpan.textContent = filteredTours.length;
-
-        // 显示筛选结果
-        displayTours(filteredTours);
-    }
-
-    // 显示旅游项目
-    function displayTours(tours) {
-        // 清空现有内容
-        tourListContainer.innerHTML = '';
-
-        // 如果没有结果，显示提示
-        if (tours.length === 0) {
-            tourListContainer.innerHTML = '<div class="no-results">No tours found matching your criteria.</div>';
-            return;
-        }
-
-        // 遍历并添加每个旅游项目
-        tours.forEach(tour => {
-            // 格式化时间显示
-            const needTime = parseFloat(tour.needTime) || 0;
-            let timeDisplay = '';
-            if (needTime < 1) {
-                // 小于1小时显示分钟
-                const minutes = Math.round(needTime * 60);
-                timeDisplay = `${minutes}-Minutes`;
-            } else if (needTime === 1) {
-                timeDisplay = '1-Hour';
-            } else {
-                timeDisplay = `${needTime % 1 === 0 ? needTime : needTime.toFixed(1)}-Hours`;
-            }
-
-            // 格式化价格显示
-            let priceDisplay = 'Price on request';
-            if (tour.price !== undefined && tour.price !== null && tour.price !== "" && tour.price !== 0) {
-                const priceNum = typeof tour.price === 'string' 
-                    ? parseFloat(tour.price.replace(/[^0-9.]/g, ''))
-                    : Number(tour.price);
-                
-                if (!isNaN(priceNum) && priceNum > 0) {
-                    // 只显示整数部分
-                    priceDisplay = 'US$' + Math.floor(priceNum).toLocaleString('en-US');
-                }
-            }
-            
-            const tourHtml = `
-                <div class="flex-col border-box">
-                    <a href="${tour.url || '#'}" rel="nofollow">
-                        <span class="flag-box"></span>
-                        <img alt="${tour.title || 'Tour image'}" class="img-responsive" src="${tour.pic || ''}">
-                    </a>
-                    <div class="caption">
-                        <h3><a href="${tour.url || '#'}">${tour.title || 'Untitled Tour'}</a></h3>
-                        <ul class="card-ul">
-                            <li class="card-hours">${timeDisplay}</li>
-                        </ul>
-                        <div class="caption-btn">
-                            <p>From <span class="baseprice font24">${priceDisplay}</span></p>
-                            <p><a aria-label="button" class="btn-base" href="${tour.url || '#'}" rel="nofollow">View More</a></p>
-                        </div>
-                    </div>
-                </div>
-            `;
-            
-            tourListContainer.insertAdjacentHTML('beforeend', tourHtml);
-        });
-    }
-
-    // 初始加载时显示所有旅游项目
-    filterAndDisplayTours();
-});
-
+    TourData = TourData || [];    
 
 </script>
\ No newline at end of file