浏览代码

css fixed

andy 2 年之前
父节点
当前提交
feca86901d

二进制
.DS_Store


二进制
content/.DS_Store


二进制
layouts/.DS_Store


+ 5 - 2
layouts/collection/list.html

@@ -120,7 +120,7 @@
           <div class="bhouseweb_search_img">
             <i class="fas fa-search"></i>
           </div>
-          <input id="bhouseweb_search" class="me-md-2" type="search" placeholder="搜 尋「北 歐 風」「工 業 風」「三 代 同 堂」「寵 物」"
+          <input id="bhouseweb_search" class="me-md-2" type="search" placeholder="搜 尋「 北 歐 」「 現 代 」「 無印 」"
             aria-label="Search" />
           <!-- <button class="btn btn-outline-success" type="submit">Search</button> -->
         </form>
@@ -219,7 +219,8 @@
           //   if (item.categories.includes(category)) {
           // 搜尋所有分類文章
           if (item.title.includes(inputVal) || item.description.includes(inputVal)) {
-            matchContent += ` 
+            if (item.url != '/collection') {
+              matchContent += ` 
         <div class="col-12 col-sm-6 p-1"> \
           <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0"> \
             <a href="${item.url}"> \
@@ -238,6 +239,8 @@
           </a> \
           </div> \
         </div>`;
+            }
+
 
           } else {
             falseItem.push(item);

+ 29 - 15
layouts/room_planner/room_planner.html

@@ -251,11 +251,15 @@
                   <h2><span class="steup-mb-title">Step 1:</span><span class="step-sub-title"
                       style="background-color:#fff ;">需求諮詢</span> </h2>
                 </button>
-                <div class="text-center">
-                  <img class="img-fluid" src="/img/room_planner/step1-0.png" alt="" width="151">
-                </div>
-                <div class="room-planner-process-main-content-step-img">
-                  <img class="img-fluid" src="/img/room_planner/step1-1.png" alt="">
+                <div  data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseOne" aria-expanded="false"
+                aria-controls="panelsStayOpen-collapseOne">
+                  <div class="text-center">
+                    <img class="img-fluid" src="/img/room_planner/step1-0.png" alt="" width="151">
+                  </div>
+                  <div class="room-planner-process-main-content-step-img">
+                    <img class="img-fluid" src="/img/room_planner/step1-1.png" alt="">
+                  </div>
                 </div>
               </h2>
               <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
@@ -388,7 +392,9 @@
                   <h2><span class="steup-mb-title">Step 2:</span><span class="step-sub-title"
                       style="background-color:#fff ;">成家設計</span> </h2>
                 </button>
-                <div>
+                <div data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseTwo" aria-expanded="false"
+                aria-controls="panelsStayOpen-collapseTwo">
                   <img class="img-fluid" src="/img/room_planner/step2.png" alt="">
                 </div>
               </h2>
@@ -456,7 +462,9 @@
                   <h2><span class="steup-mb-title">Step 3:</span><span class="step-sub-title"
                       style="background-color:#fff ;">設計報價</span> </h2>
                 </button>
-                <div>
+                <div data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseThree" aria-expanded="false"
+                aria-controls="panelsStayOpen-collapseThree">
                   <img class="img-fluid" src="/img/room_planner/step3.png" alt="">
                 </div>
 
@@ -500,7 +508,7 @@
                           <div>
                             <span class="f-649E2E-24">安心裝修報價</span>
                             <p class="f-2A2A2A-16-400">依照你與成家設計師共同定案的設計內容,小寶優居安排安心裝修師傅到府場勘。
-                              一週後,你、成家設計師、安心裝修師傅三方,一起到門市討論裝修內容。
+                              一週後,你、成家設計師、安心裝修師傅三方,一起到門市討論裝修內容。<br>
                               確認裝修細節後,提供完整的報價單,並簽訂<span class="f-649E2E-18">《安心裝修服務合約》</span>。</p>
                           </div>
                         </div>
@@ -544,7 +552,9 @@
                   <h2><span class="steup-mb-title">Step 4:</span><span class="step-sub-title"
                       style="background-color:#fff ;">確認付款</span> </h2>
                 </button>
-                <div class="text-center">
+                <div class="text-center"data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseFour" aria-expanded="false"
+                aria-controls="panelsStayOpen-collapseFour">
                   <img class="img-fluid" src="/img/room_planner/step4.png" alt="" width="226">
                 </div>
               </h2>
@@ -593,7 +603,7 @@
                 </div>
               </div>
             </div>
-            <div class="accordion-item" id="scrollTarget3-m">
+            <div class="accordion-item" id="scrollTarget5-m">
               <h2 class="accordion-header" id="panelsStayOpen-headingFive">
                 <button class="accordion-button collapsed fw-bold" type="button" data-bs-toggle="collapse"
                   data-bs-target="#panelsStayOpen-collapseFive" aria-expanded="false"
@@ -601,7 +611,9 @@
                   <h2><span class="steup-mb-title">Step 5:</span><span class="step-sub-title"
                       style="background-color:#fff ;">施工保固</span> </h2>
                 </button>
-                <div style="margin-top:10px ;" class="room-planner-process-main-content-step-img">
+                <div style="margin-top:10px ;" class="room-planner-process-main-content-step-img" data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseFive" aria-expanded="false"
+                aria-controls="panelsStayOpen-collapseFive">
                   <img class="img-fluid" src="/img/room_planner/step5.png" alt="">
                 </div>
                 <div class="room-planner-process-main-content-step-img text-center">
@@ -1056,7 +1068,7 @@
                       </div>
                       <div>
                         <span class="f-649E2E-24">安心裝修報價</span>
-                        <p class="f-2A2A2A-16-400">依照你與成家設計師共同定案的設計內容,小寶優居安排安心裝修師傅到府場勘,再由你、成家設計師、安心裝修師傅三方,一起到門市討論裝修內容。
+                        <p class="f-2A2A2A-16-400">依照你與成家設計師共同定案的設計內容,小寶優居安排安心裝修師傅到府場勘,再由你、成家設計師、安心裝修師傅三方,一起到門市討論裝修內容。<br>
                           確認裝修細節後,提供完整的報價單,並簽訂<span class="f-649E2E-18">《安心裝修服務合約》</span>。</p>
                       </div>
                     </div>
@@ -1201,7 +1213,7 @@
                 <div class="col-md-6">
                   <div class="d-flex ">
                     <img class="me-3 mt-1" src="/img/room_planner/check.png" alt="">
-                    <p class="f-78B142-20">嚴選裝修師傅</p>
+                    <p class="f-78B142-20">嚴選裝修師傅</p>
                   </div>
                   <div class="d-flex">
                     <img class="me-3 mt-1" src="/img/room_planner/check.png" alt="">
@@ -1260,8 +1272,10 @@
             </div>
           </div>
         </div>
-        <div class="text-center mt-50"><button type="button" class="btn room_planner-sales-service-CTA"><span
-              class="f-fff-18 me-3">立即預約</span></button></div>
+        <div class="text-center mt-50"><a href="https://ocard.co/q?s=mV8ggl&qtk=LmybMx&_ga=2.252447817.1761930027.1658133789-1993023897.1656902976">
+          <button type="button" class="btn room_planner-sales-service-CTA"><span
+            class="f-fff-18 me-3">立即預約</span></button>
+        </a></div>
       </div>
       <img style="position:absolute;bottom:50px; right:100px" class="tree2-img" src="/img/room_planner/big.png" alt=""
         width="53">

+ 66 - 3
layouts/store/store.html

@@ -62,7 +62,7 @@
   <div class="brand_content">
     <div class="tab-content" id="pills-tabContent">
       <div class="tab-pane fade active show" id="pills-north" role="tabpanel" aria-labelledby="pills-north-tab">
-        <div class="row px-0 mx-0 mb-5">
+        <div id="NewTaipei" class="row px-0 mx-0 mb-5">
           <div class="col-md-8">
             <img class="img-fluid" src="/img/store/north.jpg" alt="">
 
@@ -145,7 +145,7 @@
         </div> -->
       </div>
       <div class="tab-pane fade" id="pills-central" role="tabpanel" aria-labelledby="pills-central-tab">
-        <div class="row px-0 mx-0 mb-5">
+        <div id="Taichung" class="row px-0 mx-0 mb-5">
           <div class="col-md-8">
             <img class="img-fluid" src="/img/store/central.jpg" alt="">
 
@@ -185,7 +185,7 @@
         </div>
       </div>
       <div class="tab-pane fade" id="pills-south" role="tabpanel" aria-labelledby="pills-south-tab">
-        <div class="row px-0 mx-0 mb-5">
+        <div id="Tainan" class="row px-0 mx-0 mb-5">
           <div class="col-md-8">
             <img class="img-fluid" src="/img/store/south.jpg" alt="">
 
@@ -259,16 +259,76 @@
         $(".active").removeClass("active");
         $("#pills-north").addClass("active show");
         $("#pills-north-tab").addClass("active");
+        $("*").each(function (index, element) {
+          var target = $("#NewTaipei");
+          console.log(target)
+          var offset = 50;
+          // var duration = $(this).attr("data-gt-duration");
+
+          if (target) {
+            //console.log("目標:" + target);
+            //console.log("時間:" + duration);
+            //console.log("位移:" + offset);
+
+            // 上方位置 = 目標區塊.位移().上方位置
+            var top = $(target).offset().top;
+
+            $("html").stop().animate({
+              scrollTop: top - offset
+            });
+          }
+
+        });
       } else if (storeVal === "Taichung") {
         $(".show").removeClass("show");
         $(".active").removeClass("active");
         $("#pills-central").addClass("active show");
         $("#pills-central-tab").addClass("active");
+        $("*").each(function (index, element) {
+          var target = $("#Taichung");
+          console.log(target)
+          var offset = 50;
+          // var duration = $(this).attr("data-gt-duration");
+
+          if (target) {
+            //console.log("目標:" + target);
+            //console.log("時間:" + duration);
+            //console.log("位移:" + offset);
+
+            // 上方位置 = 目標區塊.位移().上方位置
+            var top = $(target).offset().top;
+
+            $("html").stop().animate({
+              scrollTop: top - offset
+            });
+          }
+
+        });
       } else if (storeVal === "Tainan") {
         $(".show").removeClass("show");
         $(".active").removeClass("active");
         $("#pills-south").addClass("active show");
         $("#pills-south-tab").addClass("active");
+        $("*").each(function (index, element) {
+          var target = $("#Tainan");
+          console.log(target)
+          var offset = 50;
+          // var duration = $(this).attr("data-gt-duration");
+
+          if (target) {
+            //console.log("目標:" + target);
+            //console.log("時間:" + duration);
+            //console.log("位移:" + offset);
+
+            // 上方位置 = 目標區塊.位移().上方位置
+            var top = $(target).offset().top;
+
+            $("html").stop().animate({
+              scrollTop: top - offset
+            });
+          }
+
+        });
       }
 
       // 離開頁面前清除 localStorage
@@ -277,6 +337,9 @@
       }
       );
     })
+
+
+
   </script>
 </body>
 

二进制
resources/.DS_Store


二进制
resources/_gen/.DS_Store


文件差异内容过多而无法显示
+ 184 - 20
themes/hugo-universal-theme-master/static/css/style.bhouse.css


文件差异内容过多而无法显示
+ 0 - 0
themes/hugo-universal-theme-master/static/css/style.bhouse.css.map


+ 1 - 0
themes/hugo-universal-theme-master/static/css/style.bhouse.scss

@@ -2003,6 +2003,7 @@ input[type="search"]::-webkit-search-cancel-button {
       height: 90px;
       margin: 0 auto;
       text-align: center;
+      cursor: pointer;
       img {
         height: auto;
         object-fit: cover;

+ 1 - 0
themes/hugo-universal-theme-master/static/js/cz_filter.js

@@ -98,6 +98,7 @@ function update_info(type, ping, budget, room) {
           console.log('符合篩選條件數: ' + matched_num); // test
 
           if (matched_num == 4) {
+            console.log( items[i]['title']);
             content += ' \
               <div class="col-12 col-sm-6 p-1"> \
                 <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0"> \

部分文件因为文件数量过多而无法显示