From 709163056842720dfa48d1d93228e688bcfe7527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 3 Jul 2025 09:59:19 +0800
Subject: [PATCH] fix

---
 application/views/mobile_first/hly-pc.php     |   2 +-
 .../mobile_first/shanghai-daytrip-list.php    | 143 +++++++++++-------
 2 files changed, 92 insertions(+), 53 deletions(-)

diff --git a/application/views/mobile_first/hly-pc.php b/application/views/mobile_first/hly-pc.php
index 285e0918..a40aa07c 100644
--- a/application/views/mobile_first/hly-pc.php
+++ b/application/views/mobile_first/hly-pc.php
@@ -67,7 +67,7 @@
                         </li>
                         <li><a href="/about-us">关于我们</a></li>
                         <li><a href="/contact-us" rel="nofollow" class="top-con"><i class="fa fa-comments-o"></i> 联系我们</a></li>
-                        <li><a href="forms/customize" class="top-customize"><i class="fa fa-tags"></i> 私人订制</a></li>
+                        <li><a href="/forms/customize" class="top-customize"><i class="fa fa-tags"></i> 私人订制</a></li>
                         <li class="dropdown">
                             <a href="javascript:;"><i class="fa fa-globe"></i> 中文（简体）</a>
                             <div class="popup-layer">
diff --git a/application/views/mobile_first/shanghai-daytrip-list.php b/application/views/mobile_first/shanghai-daytrip-list.php
index 591e3dd6..50f89945 100644
--- a/application/views/mobile_first/shanghai-daytrip-list.php
+++ b/application/views/mobile_first/shanghai-daytrip-list.php
@@ -67,11 +67,7 @@
         <div class="caption">
             <h3><a href="#">Suzhou and Tongli Water Town Tour from Shanghai</a></h3>
             <ul class="card-ul">
-                <li class="card-day">15-Day</li>
-                <li>Xi’an</li>
-                <li>Guilin</li>
-                <li>Yangshuo</li>
-                <li>Shanghai</li>
+                <li class="card-hours">4-Hours</li>             
             </ul>
             <div class="caption-btn">
                 <p>From <span class="baseprice font24">US$3949</span></p>
@@ -82,36 +78,34 @@
 </div>
 
 <script>
-
-
-
-   
-document.addEventListener('DOMContentLoaded', function() {
-    
     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');
     
-    // 为分类和天数添加点击事件
-    setupFilterList('category-list', 'clear-category', 'category-count');
-    setupFilterList('days-list', 'clear-days', 'days-count');
+    // 初始化筛选器
+    setupFilter('category-list', 'clear-category');
+    setupFilter('theme-list', 'clear-theme');
+    setupFilter('hours-list', 'clear-hours');
+    setupFilter('price-list', 'clear-price');
 
     // 通用函数：设置筛选列表的点击和清除功能
-    function setupFilterList(listId, clearBtnId, countSpanId) {
+    function setupFilter(listId, clearBtnId) {
         const list = document.getElementById(listId);
         const clearBtn = document.getElementById(clearBtnId);
-        const countSpan = document.getElementById(countSpanId);
+        
+        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');
-                updateSelectedCount();
                 filterAndDisplayTours();
             }
         });
@@ -122,15 +116,8 @@ document.addEventListener('DOMContentLoaded', function() {
             activeItems.forEach(item => {
                 item.classList.remove('active');
             });
-            updateSelectedCount();
             filterAndDisplayTours();
         });
-        
-        // 更新选中数量
-        function updateSelectedCount() {
-            const count = list.querySelectorAll('.active').length;
-            countSpan.textContent = count;
-        }
     }
 
     // 筛选并显示旅游项目
@@ -141,36 +128,63 @@ document.addEventListener('DOMContentLoaded', function() {
             selectedCategories.push(a.getAttribute('data-id'));
         });
 
-        // 获取选中的天数范围
-        const selectedDayRanges = [];
-        document.querySelectorAll('#days-list li.active a').forEach(a => {
-            selectedDayRanges.push(a.getAttribute('data-day'));
+        // 获取选中的主题
+        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 categoryMatch = selectedCategories.length === 0 || 
-                (typeof tour.linetype === 'string' 
-                    ? selectedCategories.some(cat => tour.linetype.split(',').includes(cat))
-                    : selectedCategories.includes(tour.linetype.toString()));
-
-            // 检查天数
-            const dayMatch = selectedDayRanges.length === 0 || 
-                selectedDayRanges.some(range => {
-                    if (range.includes('-')) {
-                        const [min, max] = range.split('-').map(Number);
-                        return tour.Days >= min && tour.Days <= max;
-                    }
-                    return tour.Days === Number(range);
+                selectedCategories.includes(tour.type);
+
+            // 检查主题
+            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 categoryMatch && dayMatch;
+            return categoryMatch && themeMatch && hourMatch && priceMatch;
         });
 
-        // 更新计数
-        document.getElementById('category-count').textContent = selectedCategories.length;
-        document.getElementById('days-count').textContent = selectedDayRanges.length;
+        // 更新总计数
         allCountSpan.textContent = filteredTours.length;
 
         // 显示筛选结果
@@ -190,23 +204,46 @@ document.addEventListener('DOMContentLoaded', function() {
 
         // 遍历并添加每个旅游项目
         tours.forEach(tour => {
-            const cities = tour.PassCity.split(',').map(city => city.trim());
+            // 格式化时间显示
+            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">
+                    <a href="${tour.url || '#'}" rel="nofollow">
                         <span class="flag-box"></span>
-                        <img alt="${tour.title}" class="img-responsive" src="${tour.pic}">
+                        <img alt="${tour.title || 'Tour image'}" class="img-responsive" src="${tour.pic || ''}">
                     </a>
                     <div class="caption">
-                        <h3><a href="${tour.url}">${tour.title}</a></h3>
+                        <h3><a href="${tour.url || '#'}">${tour.title || 'Untitled Tour'}</a></h3>
                         <ul class="card-ul">
-                            <li class="card-day">${tour.Days}-Day</li>
-                            ${cities.map(city => `<li>${city}</li>`).join('')}
+                            <li class="card-hours">${timeDisplay}</li>
                         </ul>
                         <div class="caption-btn">
-                            <p>From <span class="baseprice font24">${tour.price ? 'US$' + tour.price : 'Price on request'}</span></p>
-                            <p><a aria-label="button" class="btn-base" href="${tour.url}" rel="nofollow">View More</a></p>
+                            <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>
@@ -219,4 +256,6 @@ document.addEventListener('DOMContentLoaded', function() {
     // 初始加载时显示所有旅游项目
     filterAndDisplayTours();
 });
+
+
 </script>
\ No newline at end of file