andy 3 năm trước cách đây
mục cha
commit
3955fee340
41 tập tin đã thay đổi với 359 bổ sung429 xóa
  1. BIN
      .DS_Store
  2. 4 3
      config.toml
  3. BIN
      content/.DS_Store
  4. 2 0
      content/blog/_index.md
  5. BIN
      content/collection/.DS_Store
  6. 11 4
      content/collection/_index.md
  7. 1 1
      content/collection/gentle_and_beautiful_apartment_grow_up_in_love_together/index.md
  8. 1 1
      content/collection/there_is_a_cafe_in_my_house_a_japanese-style_green_house/index.md
  9. 1 1
      content/news/[little_treasure_home]_announcement_on_peace_of_mind_and_epidemic_prevention/index.md
  10. 11 4
      content/news/_index.md
  11. 0 4
      content/store/store.md
  12. BIN
      layouts/.DS_Store
  13. 6 231
      layouts/collection/list.html
  14. 1 78
      layouts/collection/single.html
  15. 26 10
      layouts/room_planner/room_planner.html
  16. BIN
      static/.DS_Store
  17. BIN
      static/img/.DS_Store
  18. BIN
      static/img/blog/.DS_Store
  19. BIN
      static/img/head1.webp
  20. BIN
      static/img/home/.DS_Store
  21. BIN
      static/img/home/0.webp
  22. BIN
      static/img/home/00 (1).webp
  23. BIN
      static/img/home/00.webp
  24. BIN
      static/img/home/01.webp
  25. BIN
      static/img/home/03.webp
  26. BIN
      static/img/home/collection1.webp
  27. BIN
      static/img/home/collection2.webp
  28. BIN
      static/img/home/collection3.webp
  29. BIN
      static/img/home/collection4.webp
  30. BIN
      static/img/home/collection5.webp
  31. BIN
      static/img/home/collection6.webp
  32. BIN
      themes/.DS_Store
  33. 22 20
      themes/hugo-universal-theme-master/layouts/partials/carousel.html
  34. 12 12
      themes/hugo-universal-theme-master/layouts/partials/features.html
  35. 6 3
      themes/hugo-universal-theme-master/layouts/partials/footer.html
  36. 17 9
      themes/hugo-universal-theme-master/layouts/partials/headers.html
  37. 111 21
      themes/hugo-universal-theme-master/static/css/style.bhouse.css
  38. 0 0
      themes/hugo-universal-theme-master/static/css/style.bhouse.css.map
  39. 99 22
      themes/hugo-universal-theme-master/static/css/style.bhouse.scss
  40. 1 1
      themes/hugo-universal-theme-master/static/js/bhouse.js
  41. 27 4
      themes/hugo-universal-theme-master/static/js/cz_filter.js

BIN
.DS_Store


+ 4 - 3
config.toml

@@ -85,10 +85,11 @@ paginate = 30
 
 [params]
     viewMorePostLink = "/blog/"
-    author = "DevCows"
-    defaultKeywords = ["devcows", "hugo", "go"]
+    author = "小寶優居"
+    keywords = "小寶優居 | 小寶幽居 | 小寶家居 | 小寶 | ptt 評價 | 小優家居 | 小寶優居裝潢 | 小寶股份有限公司 | 優居 | bhouse  | 小寶文創 | 收費 | 折扣 | 費用 | 台南小寶優居 | 小寶居家 | 台中 | 負評 | 熟成吐司 | 沙發"
     mainSections = ["blog"]
-    defaultDescription = "Site template made by Devcows using Hugo"
+    defaultDescription = "小寶優居的成家設計服務,提供透明可信任的住宅設計、家具與系統櫃、安心裝修服務,陪伴第一次成家、沒有室內設計經驗的人,以人為本、健康、安全的美好成家體驗。"
+    collection_description ="小寶優居設計作品集,用系統櫃、設計家具、輕裝修完成你家的室內設計,搭配安心裝修服務,用透明的報價方式、客製化成家預算,把你辛苦買的房子變成美好的家。"
 
     # Social media
     facebook_site = "" # the Facebook handle of your site ('https://www.facebook.com/HANDLE')

BIN
content/.DS_Store


+ 2 - 0
content/blog/_index.md

@@ -1,4 +1,5 @@
 ---
+meta_title: "成家知識專欄:買了房然後呢?了解裝修設計大小事!|小寶優居"
 title: "成家知識專欄:買了房然後呢?了解裝修設計大小事!|小寶優居"
 date: 2021-05-26T116:21:22+08:00
 draft: false
@@ -6,4 +7,5 @@ type: "blog"
 url: "/blog"
 image: ""
 description: "裝潢、室 內設計知識懶人包:客變、驗屋、平面圖、裝修預算、格局、系統櫃、家具、輕裝 修、收納、北歐風、穿堂煞,你想知道的成家知識這裡通通都有。"
+meta_description: "裝潢、室 內設計知識懶人包:客變、驗屋、平面圖、裝修預算、格局、系統櫃、家具、輕裝 修、收納、北歐風、穿堂煞,你想知道的成家知識這裡通通都有。"
 ---

BIN
content/collection/.DS_Store


+ 11 - 4
content/collection/_index.md

@@ -1,4 +1,11 @@
-+++
-title = "collection"
-id = "collection"
-+++
+---
+meta_title: "成家故事作品集:陪伴你把房子變成家的故事|小寶優居・美好成家"
+title: "成家故事作品集:陪伴你把房子變成家的故事|小寶優居・美好成家"
+date: 2021-02-06T18:14:22+08:00
+draft: false
+type: "collection"
+url: "/collection"
+image: ""
+description: "三房兩廳的大樓,媽媽喜歡簡單實用的設計以及木頭質感,爸爸希望有個大書桌,設計師透過風格測驗、生活習慣調查了解我們,這是我們在小寶優居的成家故事。"
+meta_description: "三房兩廳的大樓,媽媽喜歡簡單實用的設計以及木頭質感,爸爸希望有個大書桌,設計師透過風格測驗、生活習慣調查了解我們,這是我們在小寶優居的成家故事。"
+---

+ 1 - 1
content/collection/gentle_and_beautiful_apartment_grow_up_in_love_together/index.md

@@ -9,7 +9,7 @@ url: "/collection/gentle_and_beautiful_apartment_grow_up_in_love_together"
 image: "/img/title/c3a49cd9cb9449538f72939f278eee90.webp"
 cover_img: "/img/title/0688ce2ebdef49a891737744a1f56648.webp"
 collection_name: "溫柔系美寓 一起在愛中長大"
-description: "台中北屯 Albee & Hank家庭 | 大樓<br>三房兩廳 | 36坪<br>總預算 137.3萬"
+description: "台中北屯 Albee & Hank家庭 | 透天<br>三房兩廳 | 36坪<br>總預算 137.3萬"
 tags: [透天,35-50坪,100萬以上,三房]
 banner_img_text: "「乾淨、溫暖、舒服,這個家通通做到了。」"
 homeowner: "Albee & Hank夫妻和兩個小朋友"

+ 1 - 1
content/collection/there_is_a_cafe_in_my_house_a_japanese-style_green_house/index.md

@@ -1,5 +1,5 @@
 ---
-meta_title: "我家就有咖啡廳 日式無印文青宅"
+meta_title: "我家就有咖啡廳 日式無印文青宅|小寶優居・美好成家"
 meta_description: "台中北屯 老王夫妻|大樓<br>三房兩廳|25 坪<br>總預算 118.6 萬"
 title: "我家就有咖啡廳 日式無印文青宅"
 date: 2022-07-12T11:58:02+08:00

+ 1 - 1
content/news/[little_treasure_home]_announcement_on_peace_of_mind_and_epidemic_prevention/index.md

@@ -1,6 +1,6 @@
 ---
 meta_title: "【小寶優居】安心防疫公告"
-meta_description: ""
+meta_description: "三房兩廳的大樓,媽媽喜歡簡單實用的設計以及木頭質感,爸爸希望有個大書桌,設計師透過風格測驗、生活習慣調查了解我們,這是我們在小寶優居的成家故事。"
 title: "【小寶優居】安心防疫公告"
 date: 2022-07-07T08:37:04+08:00
 draft: false

+ 11 - 4
content/news/_index.md

@@ -1,4 +1,11 @@
-+++
-title = "news"
-id = "news"
-+++
+---
+meta_title: "最新消息公告:營業資訊、服務公告|小寶優居・美好成家"
+title: "最新消息公告:營業資訊、服務公告|小寶優居・美好成家"
+date: 2021-05-15T116:21:22+08:00
+draft: false
+type: "news"
+url: "/news"
+image: ""
+description: "讓每個人的成家更美好:用系統櫃、設計家具、輕裝修完成你家的室內設計,搭配安心裝修服務,用透明的報價方式、客製化成家預算,把你辛苦買的房子變成美好的家。"
+meta_description: "讓每個人的成家更美好:用系統櫃、設計家具、輕裝修完成你家的室內設計,搭配安心裝修服務,用透明的報價方式、客製化成家預算,把你辛苦買的房子變成美好的家。"
+---

+ 0 - 4
content/store/store.md

@@ -1,4 +0,0 @@
-+++
-title = "store"
-id = "store"
-+++

BIN
layouts/.DS_Store


+ 6 - 231
layouts/collection/list.html

@@ -35,9 +35,9 @@
             <input style="opacity: 0;" class="type ms-1" type="radio" id="m_全部類型" name="m_type" value="全部類型" checked/>
             <label for="m_全部類型" class="bhouseweb_item_type select">全部</label>
             <input style="opacity: 0;" class="type ms-1" type="radio" id="m_大樓" name="m_type" value="大樓" />
-            <label for="m_大樓" class="bhouseweb_item_type">大樓</label>
+            <label id="building" for="m_大樓" class="bhouseweb_item_type">大樓</label>
             <input style="opacity: 0;" class="type ms-1" type="radio" id="m_透天" name="m_type"  value="透天" />
-            <label for="m_透天" class="bhouseweb_item_type">透天</label>
+            <label id="house" for="m_透天" class="bhouseweb_item_type">透天</label>
           </div>
         </div>
         <div class="bhouseweb_loc_box">
@@ -158,231 +158,6 @@
             </div>
           </div>
           {{ end }}
-          <!-- <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/0c90a5a4fb84164b6e8a60147aa31122.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/3d272248107bdc7d610ee640fae3b182_1.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/50a125ea19c3bdeb9a8bd17533ce993d.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/6bb85ba684ed447a4d82e0da5d93f9e6.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/46c0c37fe8aff39685a3955c32e95a34.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/db978b041a9ea14bc66b68c81e768fa6.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/09d9615f19d41ca754897860c7958800.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/09d9615f19d41ca754897860c7958800.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/09d9615f19d41ca754897860c7958800.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/0c90a5a4fb84164b6e8a60147aa31122.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/3d272248107bdc7d610ee640fae3b182_1.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/50a125ea19c3bdeb9a8bd17533ce993d.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/6bb85ba684ed447a4d82e0da5d93f9e6.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/46c0c37fe8aff39685a3955c32e95a34.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img src="/img/collection/bdf492075d06c9353aa1523bcb9c0837.webp" alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img
-                src="/img/collection/20_taiwanese_ping_slightly_sweet_milk_tea_color_beautiful_house_on_instagram_in_changhua.webp"
-                alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div>
-        <div class="col-6 col-md-6 p-1">
-          <div class="bhouseweb_loc_sec02_card secimg mx-0 px-0 border-0">
-            <a href="/simple_korean_style_hous.html">
-              <img
-                src="/img/collection/17_taiwanese_ping_tile_porch_muji_industrial_mixed_style_house_in_taichung.webp"
-                alt="">
-              <div class="sec02-p-dec p-1 mt-1 text-center">
-                <h5 class="card-title">工飯程店師微的醺大好玩c h具i</h5>
-                <p class="card-text">新北 吳工程師|新成屋</p>
-                <p class="card-text">兩房兩廳|28坪</p>
-                <p class="card-text">總預算80萬</p>
-              </div>
-            </a>
-          </div>
-        </div> -->
         </div>
       </div>
     </div>
@@ -407,8 +182,9 @@
   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/slick-carousel@1.8.1/slick/slick.min.js"></script>
 
   <script async defer src="./js/index.js"></script> -->
+  {{ partial "scripts.html" . }}
   <script src="/js/cz_filter.js"></script>
-    {{ partial "scripts.html" . }}
+
     <script>
       window.onload = function () {
   document.getElementById('bhouseweb_search').value = '';
@@ -420,7 +196,7 @@
   (function getContentsData() {
     // 線上版網址 http://192.53.174.202:9001/api/
     // 本地端網址 http://localhost:9001/api/
-    fetch('http://192.53.174.202:9001/api/contents?url=/collection').then(res => res.json()).then(list => {
+    fetch('http://localhost:9001/api/contents?url=/collection').then(res => res.json()).then(list => {
       contentsData = list;
       console.log('contentsData', contentsData);
       // filterCategory();
@@ -437,7 +213,7 @@
       timer = setTimeout(fn.bind(this, ...args), ms || 0)
     }
   }
-console.log($('bhouseweb_search'));
+
   // 搜尋
   $('#bhouseweb_search').keyup(delay(function (e) {
     console.log(1)
@@ -460,7 +236,6 @@ console.log($('bhouseweb_search'));
                 alt="${item.title}" \
                 src="${item.image}" \
                 layout="responsive"> \
-              <img> \
             <div class="slide_item_text"> \
                 <p>${item.title}</p>\
             </div>  \

+ 1 - 78
layouts/collection/single.html

@@ -127,48 +127,6 @@
                     </div>
                 </div>
                 {{ end }}
-                <!-- <div>
-              <img class="img-fluid" src="/img/collection/3d272248107bdc7d610ee640fae3b182_1.webp" alt="">
-              <div class="slide_item_text">
-                <p> 圖說NotoJPMedium14級字行距28pt </p>
-                <p>圖說NotoJPMedium14級字行距28pt</p>
-              </div>
-            </div>
-            <div>
-              <img class="img-fluid"
-                src="/img/collection/17_taiwanese_ping_tile_porch_muji_industrial_mixed_style_house_in_taichung.webp"
-                alt="">
-                <div class="slide_item_text">
-                    <p> 圖說NotoJPMedium14級字行距28pt </p>
-                    <p>圖說NotoJPMedium14級字行距28pt</p>
-                  </div>
-            </div>
-            <div>
-              直式圖片 className 需加上 "vertical-img" 避免跑版
-              <img class="img-fluid vertical-img" style="width: 100%; object-fit: contain;" src="/img/b6.webp" alt="">
-            </div> -->
-                <!-- <div>
-              <img class="img-fluid"
-                src="/img/collection/20_taiwanese_ping_vintage_cafe_shop_house_for_hipster_in_taichung.webp" alt="">
-                <div class="slide_item_text">
-                    <p> 圖說NotoJPMedium14級字行距28pt </p>
-                    <p>圖說NotoJPMedium14級字行距28pt</p>
-                  </div>
-            </div>
-            <div>
-              <img class="img-fluid" src="/img/collection/0c90a5a4fb84164b6e8a60147aa31122.webp" alt="">
-              <div class="slide_item_text">
-                <p> 圖說NotoJPMedium14級字行距28pt </p>
-                <p>圖說NotoJPMedium14級字行距28pt</p>
-              </div>
-            </div>
-            <div>
-              <img class="img-fluid" src="/img/collection/3d272248107bdc7d610ee640fae3b182_1.webp" alt="">
-              <div class="slide_item_text">
-                <p> 圖說NotoJPMedium14級字行距28pt </p>
-                <p>圖說NotoJPMedium14級字行距28pt</p>
-              </div>
-            </div> -->
             </div>
             <div class="slider slider-nav" style="margin-top: -10px;">
                 {{ range .Params.collection_slider }}
@@ -176,30 +134,6 @@
                     <img class="img-fluid slide_img" src="./{{ .slide_img }}" alt="">
                 </div>
                 {{ end }}
-                <!-- <div class="sec02_slide_item">
-                    <img class="img-fluid slide_img" src="/img/collection/3d272248107bdc7d610ee640fae3b182_1.webp"
-                        alt="">
-                </div>
-                <div class="sec02_slide_item">
-                    <img class="img-fluid slide_img"
-                        src="/img/collection/17_taiwanese_ping_tile_porch_muji_industrial_mixed_style_house_in_taichung.webp"
-                        alt="">
-                </div>
-                <div class="sec02_slide_item">
-                    <img class="img-fluid slide_img" src="/img/b6.webp" alt="">
-                </div>
-                <div class="sec02_slide_item">
-                    <img class="img-fluid slide_img"
-                        src="/img/collection/20_taiwanese_ping_vintage_cafe_shop_house_for_hipster_in_taichung.webp"
-                        alt="">
-                </div>
-                <div class="sec02_slide_item">
-                    <img class="img-fluid slide_img" src="/img/collection/0c90a5a4fb84164b6e8a60147aa31122.webp" alt="">
-                </div>
-                <div class="sec02_slide_item">
-                    <img class="img-fluid slide_img" src="/img/collection/3d272248107bdc7d610ee640fae3b182_1.webp"
-                        alt="">
-                </div> -->
             </div>
         </div>
     </div>
@@ -211,19 +145,8 @@
     <div class="style_house_sec04">
         <h1 class="style_house_title">屋主的話</h1>
         <img src="{{ .Params.Comment }}" alt="" class="img-fluid">
-        <!-- <p class="fw-bold">{{ .Params.Comment | safeHTML }}</p> -->
     </div>
     <hr class="style_house_line">
-    <!-- <div class="style_house_sec05">
-        <h1 class="style_house_title">其他分類案例</h1>
-        <div class="style_house_sec05_box">
-            <a href="">書房</a>
-            <a href="">工業風</a>
-            <a href="">特殊漆</a>
-            <a href="">不做天花板</a>
-        </div>
-    </div> -->
-    <!-- <hr class="style_house_line d-md-none d-block"> -->
     <a href="/index.html">
         <p class="article__readMore text-center"> <span style="font-size: 18px;"
                 class="fw-normal me-2">&lt;</span>回到成家故事案例</p>
@@ -233,7 +156,7 @@
 <div class="style_house_content home-content">
     <div class="style_house_sec06 container-fluid px-0">
         <div class="row px-0 mx-0">
-            <div class="col-6 col-sm-6 bg-portfolio ps-0">
+            <div class="col-6 col-sm-6 bg-serve ps-0">
                 <a href="/collection/">
                     <div class="bg-img"></div>
                 </a>

+ 26 - 10
layouts/room_planner/room_planner.html

@@ -407,12 +407,13 @@
                             <p class="f-2A2A2A-16-400">成家設計師會以《平面配置圖》與《3D渲染彩圖》,向你提案未來家的設計,內容包含:</p>
                             <div class="room-planner-service-5-service-inf d-flex">
                               <ul class="me-1">
-                                <li class="f-2A2A2A-16-400">色彩計畫</li>
                                 <li class="f-2A2A2A-16-400">生活動線計畫</li>
-                                <li class="f-2A2A2A-16-400">收納計畫</li>
+                                <li class="f-2A2A2A-16-400">色彩計畫</li>
+                                <li class="f-2A2A2A-16-400">用料材質</li>
                               </ul>
                               <ul>
-                                <li class="f-2A2A2A-16-400">用料材質</li>
+                     
+                                <li class="f-2A2A2A-16-400">收納計畫</li>
                                 <li class="f-2A2A2A-16-400">裝修項目</li>
                                 <li class="f-2A2A2A-16-400">搭配的家具與系統櫃</li>
                               </ul>
@@ -979,12 +980,12 @@
                         <p class="f-2A2A2A-16-400">成家設計師會以《平面配置圖》與《3D渲染彩圖》,向你提案未來家的設計,內容包含:</p>
                         <div class="room-planner-service-5-service-inf d-flex">
                           <ul class="me-4">
-                            <li class="f-2A2A2A-16-400">色彩計畫</li>
                             <li class="f-2A2A2A-16-400">生活動線計畫</li>
-                            <li class="f-2A2A2A-16-400">收納計畫</li>
+                            <li class="f-2A2A2A-16-400">色彩計畫</li>
+                            <li class="f-2A2A2A-16-400">用料材質</li>
                           </ul>
                           <ul>
-                            <li class="f-2A2A2A-16-400">用料材質</li>
+                            <li class="f-2A2A2A-16-400">收納計畫</li>
                             <li class="f-2A2A2A-16-400">裝修項目</li>
                             <li class="f-2A2A2A-16-400">搭配的家具與系統櫃</li>
                           </ul>
@@ -1033,8 +1034,7 @@
                       </div>
                       <div>
                         <span class="f-649E2E-24">安心裝修報價</span>
-                        <p class="f-2A2A2A-16-400">依照你與成家設計師共同定案的設計內容,小寶優居安排安心裝修師傅到府場勘。
-                          一週後,你、成家設計師、安心裝修師傅三方,一起到門市討論裝修內容。
+                        <p class="f-2A2A2A-16-400">依照你與成家設計師共同定案的設計內容,小寶優居安排安心裝修師傅到府場勘,再由你、成家設計師、安心裝修師傅三方,一起到門市討論裝修內容。
                           確認裝修細節後,提供完整的報價單,並簽訂<span class="f-649E2E-18">《安心裝修服務合約》</span>。</p>
                       </div>
                     </div>
@@ -1204,7 +1204,7 @@
               </div>
             </div>
             <div class="room_planner-sales-service-left-text">
-              <p class="f-2A2A2A-20 d-none d-lg-block">用<span class="room-planner-service-no-28">5%</span> 的裝修服務費,換
+              <p class="f-2A2A2A-20 d-none d-lg-block text-center">用<span class="room-planner-service-no-28">5%</span> 的裝修服務費,換
                 <span class="room-planner-service-no-28">5%</span>的安心裝修
               </p>
               <p class="f-2A2A2A-20 d-block d-lg-none text-center">用<span class="room-planner-service-no-28">5%</span>
@@ -1245,7 +1245,23 @@
         width="53">
 
     </section>
-
+    <hr class="style_house_line ">
+<div class="style_house_content home-content">
+    <div class="style_house_sec06 container-fluid px-0">
+        <div class="row px-0 mx-0">
+            <div class="col-6 col-sm-6 bg-portfolio ps-0">
+                <a href="/collection/">
+                    <div class="bg-img"></div>
+                </a>
+            </div>
+            <div class="col-6 col-sm-6 bg-qa pe-0">
+                <a href="/frequently_asked_questions/">
+                    <div class="bg-img"></div>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
 
 
 

BIN
static/.DS_Store


BIN
static/img/.DS_Store


BIN
static/img/blog/.DS_Store


BIN
static/img/head1.webp


BIN
static/img/home/.DS_Store


BIN
static/img/home/0.webp


BIN
static/img/home/00 (1).webp


BIN
static/img/home/00.webp


BIN
static/img/home/01.webp


BIN
static/img/home/03.webp


BIN
static/img/home/collection1.webp


BIN
static/img/home/collection2.webp


BIN
static/img/home/collection3.webp


BIN
static/img/home/collection4.webp


BIN
static/img/home/collection5.webp


BIN
static/img/home/collection6.webp


BIN
themes/.DS_Store


+ 22 - 20
themes/hugo-universal-theme-master/layouts/partials/carousel.html

@@ -40,32 +40,34 @@
   </div>
   <div class="slider responsive">
     <div class="slider-item">
-      <img src="./img/collection/61abd99c7343c58f7a7f0e9a60a4b8ed.webp" alt="" class="img-fluid">
-      <div>
-        <p>「這樣的家告訴我,什麼叫做完美生活。」</p>
-        <p>新竹陳先生|三房兩廳|32.5坪</p>
-      </div>
+      <img src="./img/head1.webp" alt="" class="img-fluid">
     </div>
     <div class="slider-item">
-      <img src="./img/collection/c3f3d87bfc353327906075aff458f72c.webp" alt="" class="img-fluid">
-      <div>
-        <p>「這樣的家告訴我,什麼叫做完美生活。」</p>
-        <p>新竹陳先生|三房兩廳|32.5坪</p>
-      </div>
+      <a style="text-decoration: none;" href="/collection/industrial_bar_house">
+        <img src="./img/home/collection1.webp" alt="" class="img-fluid">
+        <div>
+          <p>「把酒吧搬回家以後,天天都有night club可以去了!」</p>
+          <p>新北溫氏夫妻|三房兩廳|26.5坪</p>
+        </div>
+      </a>
     </div>
     <div class="slider-item">
-      <img src="./img/collection/aa32f7bcc767333c8f0d587bb0abc372.webp" alt="" class="img-fluid">
-      <div>
-        <p>「這樣的家告訴我,什麼叫做完美生活。」</p>
-        <p>新竹陳先生|三房兩廳|32.5坪</p>
-      </div>
+      <a  style="text-decoration: none;"  href="/collection/boutique_hotel_slightly_drunk_chill_house">
+        <img src="./img//home/collection2.webp" alt="" class="img-fluid">
+        <div>
+          <p>「回家,就是度假!還有比我家,更適合度假的地方嗎?」</p>
+          <p>新北黃先生|三房兩廳|30坪</p>
+        </div>
+      </a>
     </div>
     <div class="slider-item">
-      <img src="./img/collection/20_taiwanese_ping_vintage_cafe_shop_house_for_hipster_in_taichung.webp" alt="" class="img-fluid">
-      <div>
-        <p>「這樣的家告訴我,什麼叫做完美生活。」</p>
-        <p>新竹陳先生|三房兩廳|32.5坪</p>
-      </div>
+      <a style="text-decoration: none;" href="/collection/cat_aqiu_s_lazy_nest">
+        <img src="./img//home/collection3.webp" alt="" class="img-fluid">
+        <div>
+          <p>「以前我們是大家庭,所以我一直嚮往擁有屬於自己的空間。」</p>
+          <p>台中阿丘阿嬤|三房兩廳|24坪</p>
+        </div>
+      </a>
     </div>
   </div>
 </div>

+ 12 - 12
themes/hugo-universal-theme-master/layouts/partials/features.html

@@ -24,29 +24,29 @@
 
     <div class="row g-3 home-content" style="padding: 0 8px;">
       <div class="col-12 p-0 bottom-box">
-        <a href="">
-          <img src="/img/collection/e2d47efb4ccbc07e386d54a6da3a62e6.webp" style="max-width: 100%;">
+        <a style="text-decoration: none;" href="/collection/deep_sea_wandering">
+          <img src="/img/home/collection4.webp" style="max-width: 100%;">
           <div>
-            <p>山與水|心曠神怡</p>
-            <p>新北王醫師|三房兩廳|35坪</p>
+            <p>「原來家真的可以又新潮又溫暖,真的太喜歡這個家了。」</p>
+            <p>桃園大海夫婦|三房兩廳|20坪</p>
           </div>
         </a>
       </div>
       <div class="col-12 p-0 bottom-box">
-        <a href="">
-          <img src="/img/collection/e2d47efb4ccbc07e386d54a6da3a62e6.webp" style="max-width: 100%;">
+        <a style="text-decoration: none;" href="/collection/simple_korean_style_house">
+          <img src="/img/home/collection5.webp" style="max-width: 100%;">
           <div>
-            <p>標題|副標NotoJPBold20級字置右</p>
-            <p>屋主名|房型|坪數NotoJPBold16級字置右</p>
+            <p>「當完工開門的那瞬間,我就知道,這就是我要的家,我們一家四口的夢想家。」</p>
+            <p>苗栗兔兔家|三房兩廳|44.2坪</p>
           </div>
         </a>
       </div>
       <div class="col-12 p-0 bottom-box">
-        <a href="">
-          <img src="/img/collection/e2d47efb4ccbc07e386d54a6da3a62e6.webp" style="max-width: 100%;">
+        <a style="text-decoration: none;" href="/collection/17_taiwanese_ping_tile_porch_muji_industrial_mixed_style_house_in_taichung">
+          <img src="/img/home/collection6.webp" style="max-width: 100%;">
           <div>
-            <p>標題|副標NotoJPBold20級字置右</p>
-            <p>屋主名|房型|坪數NotoJPBold16級字置右</p>
+            <p>「彼此大相逕庭的風格喜好,竟然完美的在這個家融合在一起了。」</p>
+            <p>台中蔡小姐|三房兩廳|30坪</p>
           </div>
         </a>
       </div>

+ 6 - 3
themes/hugo-universal-theme-master/layouts/partials/footer.html

@@ -17,7 +17,7 @@
               <a href="mailto:agnes.chen@bhouse.com.tw,jade.wang@bhouse.com.tw">媒體聯繫</a>
             </li>
             <li>
-              <a href="">人才招募</a>
+              <a target="_blank" href="https://www.104.com.tw/company/1a2x6bk01k">人才招募</a>
             </li>
           </ul>
 
@@ -80,10 +80,10 @@
           </h5>
           <ul>
             <li>
-              <a href="/collection/">透天設計</a>
+              <a href="/collection/" onclick="setCollectionValue('透天')">透天設計</a>
             </li>
             <li>
-              <a href="/collection/">大樓設計</a>
+              <a href="/collection/" onclick="setCollectionValue('大樓')">大樓設計</a>
             </li>
           </ul>
 
@@ -182,6 +182,9 @@
   function setValue(item) {
     localStorage.setItem('store', item)
   }
+  function setCollectionValue(type) {
+    localStorage.setItem('type', type)
+  }
 </script>
 
 <!-- *** COPYRIGHT END *** -->

+ 17 - 9
themes/hugo-universal-theme-master/layouts/partials/headers.html

@@ -2,16 +2,24 @@
 <meta name="robots" content="all,follow">
 <meta name="googlebot" content="index,follow,snippet,archive">
 <meta name="viewport" content="width=device-width, initial-scale=1">
+
+{{if or (eq .Type "collection") (eq .Type "blog") (eq .Type "news")  }}
+<title>{{ .Params.meta_title }}</title>
+{{ else }}
 {{ $title_plain := .Title | markdownify | plainify }}
 <title>{{ $title_plain }}</title>
-<meta name="author" content="{{ .Param "author" }}" />
-{{ $keywords := .Site.Params.defaultKeywords | default (slice "" | first 0) }}
-{{ if isset .Params "keywords" }}{{ range .Params.keywords }}{{ $keywords = $keywords | append . }}{{ end }}{{ end }}
-{{ if gt (len $keywords) 0 }}
-<meta name="keywords" content="{{ delimit (uniq $keywords) ", " }}">
 {{ end }}
+<meta name="author" content="{{ .Param "author" }}" />
+<meta name="keywords" content="{{ .Site.Params.keywords }}" />
+
+{{if or (eq .Type "collection") (eq .Type "blog") (eq .Type "news")  }}
+<meta name="description" content="{{ .Params.meta_description }}">
+{{ else }}
 {{ $description_plain := default .Site.Params.defaultDescription .Description | markdownify | plainify }}
 <meta name="description" content="{{ $description_plain }}">
+{{ end }}
+
+
 
 {{ hugo.Generator }}
 
@@ -71,10 +79,10 @@
 {{ $image_ext := path.Ext $image }}
 <meta property="og:locale" content="{{ replace .Site.LanguageCode "-" "_" }}">
 <meta property="og:site_name" content="{{ .Site.Title }}">
-<meta property="og:title" content="{{ $title_plain }}">
+<meta property="og:title" content="{{  .Params.title }}">
 <meta property="og:type" content="{{ cond $is_blog "article" "website" }}">
 <meta property="og:url" content="{{ .Permalink }}" />
-<meta property="og:description" content="{{ $description_plain }}">
+<meta property="og:description" content="{{ .Site.Params.description }}">
 <meta property="og:image" content="{{ $image | absURL }}">
 <meta property="og:image:type" content="image/{{ if eq $image_ext ".svg" }}svg+xml{{ else }}{{ trim $image_ext "." }}{{ end }}">
 {{ with .Params.banner_alt }}<meta property="og:image:alt" content="{{ . | markdownify | plainify }}">{{ end }}
@@ -99,9 +107,9 @@
 <!-- Twitter Card meta tags -->
 <meta name="twitter:card" content="summary{{ if (and $is_blog (and $has_image $is_valid_image)) }}_large_image{{ end }}">
 {{ with .Param "twitter_site" }}<meta name="twitter:site" content="@{{ . }}">{{ end }}
-<meta name="twitter:title" content="{{ $title_plain | truncate 70 }}">
+<meta name="twitter:title" content="{{ .Params.title| truncate 70 }}">
 {{ if $is_valid_image }}
 <meta name="twitter:image" content="{{ $image | absURL }}">
 {{ end }}
-<meta name="twitter:description" content="{{ $description_plain | truncate 200 }}">
+<meta name="twitter:description" content="{{ .Site.Params.description| truncate 200 }}">
 {{ with .Param "twitter_author" }}<meta name="twitter:creator" content="@{{ . }}">{{ end }}

+ 111 - 21
themes/hugo-universal-theme-master/static/css/style.bhouse.css

@@ -573,10 +573,16 @@ img {
   bottom: 0;
   right: 0;
   left: 0;
-  background: rgba(128, 143, 76, 0.6);
+  background: rgba(128, 143, 76, 0.8);
   padding: 20px 50px;
 }
 
+@media screen and (max-width: 767px) {
+  .home-content .bottom-box div {
+    padding: 20px 10px;
+  }
+}
+
 .home-content .bottom-box p {
   margin: auto;
   text-align: right;
@@ -589,11 +595,23 @@ img {
   font-size: 20px;
 }
 
+@media screen and (max-width: 767px) {
+  .home-content .bottom-box p:first-child {
+    font-size: 14px;
+  }
+}
+
 .home-content .bottom-box p:last-child {
   font-size: 16px;
   padding-top: 10px;
 }
 
+@media screen and (max-width: 767px) {
+  .home-content .bottom-box p:last-child {
+    font-size: 12px;
+  }
+}
+
 @media (max-width: 1200px) {
   .home-content {
     width: 70%;
@@ -957,6 +975,7 @@ img {
 
 .bhouseweb_item_type {
   cursor: pointer;
+  font-family: NSJP-400 !important;
 }
 
 .readMore {
@@ -1066,6 +1085,7 @@ img {
 .bhouseweb_loc_box p {
   min-width: 55px;
   padding-left: 25px;
+  font-family: NSJP-500 !important;
 }
 
 @media screen and (max-width: 767px) {
@@ -1156,7 +1176,7 @@ input[type="search"]::-webkit-search-cancel-button {
 }
 
 .bhouseweb_loc_sec02 {
-  height: 170vh;
+  height: 1230px;
   overflow: hidden;
 }
 
@@ -1413,6 +1433,46 @@ input[type="search"]::-webkit-search-cancel-button {
   }
 }
 
+.style_house_sec02_slide .slick-prev {
+  top: 40%;
+  background: #fff;
+  left: 25px;
+  z-index: 1;
+  padding-top: 2.5px;
+  background: #fff;
+  width: 32px;
+  height: 32px;
+  right: 25px;
+  z-index: 1;
+  border-radius: 100%;
+}
+
+.style_house_sec02_slide .slick-prev:before {
+  font-family: 'slick';
+  font-size: 32px;
+  line-height: 1;
+  color: rgba(0, 0, 0, 0.54);
+}
+
+.style_house_sec02_slide .slick-next:before {
+  content: '→';
+  font-family: 'slick';
+  font-size: 32px;
+  line-height: 1;
+  color: rgba(0, 0, 0, 0.54);
+}
+
+.style_house_sec02_slide .slick-next {
+  top: 40%;
+  padding-top: 2.5px;
+  background: #fff;
+  width: 32px;
+  height: 32px;
+  right: 25px;
+  z-index: 1;
+  border-radius: 100%;
+}
+
 .style_house_sec02 .style_house_sec02_slide {
   margin-top: 30px;
 }
@@ -2160,6 +2220,13 @@ input[type="search"]::-webkit-search-cancel-button {
   height: 188px;
 }
 
+@media screen and (min-width: 1441px) {
+  .room_planner-sales-service-box .room-planner-service-content {
+    width: 90%;
+    margin: 50px auto;
+  }
+}
+
 .room_planner-sales-service-box .room-planner-service-content img {
   width: 21px;
   height: 21px;
@@ -2363,7 +2430,7 @@ input[type="search"]::-webkit-search-cancel-button {
   .room-planner-process-main .main-content-bg-line {
     right: -60px;
     top: -75px;
-    width: 24vw;
+    width: 22vw;
   }
 }
 
@@ -2406,7 +2473,7 @@ input[type="search"]::-webkit-search-cancel-button {
 @media screen and (max-width: 2057px) {
   .room-planner-process-main .step2 {
     width: 90%;
-    margin-top: -130px;
+    margin-top: -150px;
   }
 }
 
@@ -2419,7 +2486,9 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 1441px) {
   .room-planner-process-main .step2 {
+    width: 100%;
     margin-top: -30px;
+    margin-left: 10px;
   }
 }
 
@@ -2434,7 +2503,7 @@ input[type="search"]::-webkit-search-cancel-button {
 @media screen and (max-width: 2057px) {
   .room-planner-process-main .step1-0 {
     width: 40%;
-    margin-top: -30px;
+    margin-top: -50px;
     margin-left: 100px;
   }
 }
@@ -2466,8 +2535,8 @@ input[type="search"]::-webkit-search-cancel-button {
 @media screen and (max-width: 2057px) {
   .room-planner-process-main .step1-1 {
     width: 80%;
-    margin-top: -80px;
-    margin-left: 80px;
+    margin-top: -110px;
+    margin-left: 70px;
   }
 }
 
@@ -2497,9 +2566,9 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 2057px) {
   .room-planner-process-main .step3 {
-    width: 80%;
+    width: 75%;
     margin-top: -60px;
-    margin-left: 60px;
+    margin-left: 100px;
   }
 }
 
@@ -2529,9 +2598,9 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 2057px) {
   .room-planner-process-main .step4 {
-    width: 50%;
-    margin-top: -100px;
-    margin-right: 80px;
+    width: 45%;
+    margin-top: -70px;
+    margin-right: 70px;
   }
 }
 
@@ -2547,7 +2616,7 @@ input[type="search"]::-webkit-search-cancel-button {
   .room-planner-process-main .step4 {
     width: 60%;
     margin-right: 50px;
-    margin-top: -30px;
+    margin-top: -10px;
   }
 }
 
@@ -2561,9 +2630,9 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 2057px) {
   .room-planner-process-main .step5 {
-    width: 90%;
-    margin-top: -100px;
-    margin-left: 50px;
+    width: 85%;
+    margin-top: -80px;
+    margin-left: 70px;
   }
 }
 
@@ -2577,7 +2646,9 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 1441px) {
   .room-planner-process-main .step5 {
-    margin-top: 50px;
+    width: 100%;
+    margin-top: -20px;
+    margin-left: 0px;
   }
 }
 
@@ -2606,6 +2677,7 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 1441px) {
   .room-planner-process-main .step5-2 {
+    width: 40%;
     margin-right: 80px;
     margin-top: -80px;
   }
@@ -2647,7 +2719,7 @@ input[type="search"]::-webkit-search-cancel-button {
     width: 130px;
     position: absolute;
     right: 30px;
-    top: 50px;
+    top: 30px;
   }
 }
 
@@ -2798,7 +2870,7 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 1441px) {
   .room-planner-process-main .room-planner-process-main-star-green {
-    bottom: -30px;
+    bottom: -15px;
     right: 170px;
   }
 }
@@ -2889,8 +2961,8 @@ input[type="search"]::-webkit-search-cancel-button {
 
 @media screen and (max-width: 1441px) {
   .room-planner-process-main .room-planner-process-main-star-yellow {
-    right: -15px;
-    top: 50px;
+    right: -5px;
+    top: 30px;
   }
 }
 
@@ -2908,6 +2980,24 @@ input[type="search"]::-webkit-search-cancel-button {
   }
 }
 
+@media screen and (max-width: 2057px) {
+  .room-planner-process-main-content-step-4-6img {
+    margin-top: 320px;
+  }
+}
+
+@media screen and (max-width: 1921px) {
+  .room-planner-process-main-content-step-4-6img {
+    margin-top: 380px;
+  }
+}
+
+@media screen and (max-width: 1441px) {
+  .room-planner-process-main-content-step-4-6img {
+    margin-top: 380px;
+  }
+}
+
 .stepbox {
   background: #4b7718;
   border-radius: 100px;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
themes/hugo-universal-theme-master/static/css/style.bhouse.css.map


+ 99 - 22
themes/hugo-universal-theme-master/static/css/style.bhouse.scss

@@ -8,6 +8,7 @@
   --dark-gray: #969696;
   --light-gray: #d6d6d8;
   --font-md: 15px;
+ 
 }
 
 * {
@@ -553,8 +554,11 @@ img {
   bottom: 0;
   right: 0;
   left: 0;
-  background: rgba(128, 143, 76, 0.6);
+  background: rgba(128, 143, 76, 0.8);
   padding: 20px 50px;
+  @media screen and (max-width: 767px) {
+    padding: 20px 10px;
+  }
 }
 
 .home-content .bottom-box p {
@@ -563,15 +567,22 @@ img {
   color: #fff;
   font-family: NSJP-700;
   letter-spacing: 2px;
+ 
 }
 
 .home-content .bottom-box p:first-child {
   font-size: 20px;
+  @media screen and (max-width: 767px) {
+   font-size: 14px;
+  }
 }
 
 .home-content .bottom-box p:last-child {
   font-size: 16px;
   padding-top: 10px;
+  @media screen and (max-width: 767px) {
+    font-size: 12px;
+   }
 }
 
 @media (max-width: 1200px) {
@@ -939,6 +950,7 @@ img {
 
 .bhouseweb_item_type {
   cursor: pointer;
+  font-family: NSJP-400 !important;
 }
 
 .readMore {
@@ -973,6 +985,7 @@ img {
   margin-top: 180px;
   color: #656565;
   font-size: 0.9rem;
+ 
 }
 
 @media screen and (max-width: 767px) {
@@ -1038,6 +1051,7 @@ img {
   p {
     min-width: 55px;
     padding-left: 25px;
+    font-family: NSJP-500 !important;
     @media screen and (max-width: 767px) {
       min-width: 45px;
       padding-left: 10px;
@@ -1135,7 +1149,7 @@ input[type="search"]::-webkit-search-cancel-button {
 }
 
 .bhouseweb_loc_sec02 {
-  height: 170vh;
+  height: 1230px;
   overflow: hidden;
 }
 
@@ -1405,6 +1419,51 @@ input[type="search"]::-webkit-search-cancel-button {
     margin-top: 10px;
   }
 }
+.style_house_sec02_slide{
+  .slick-prev {
+    top:40%;
+    background: #fff;
+    left: 25px;
+    z-index: 1;
+    padding-top: 2.5px;
+    background: #fff;
+    width: 32px;
+    height: 32px;
+    right: 25px;
+    z-index: 1;
+  border-radius: 100%;
+}
+.slick-prev:before {
+
+  font-family: 'slick';
+  font-size: 32px;
+  line-height: 1;
+  // opacity: .75;
+  color: rgba(0,0,0,.54);
+
+  }
+.slick-next:before {
+  content: '→';
+  font-family: 'slick';
+  font-size: 32px;
+  line-height: 1;
+  // opacity: .75;
+  color: rgba(0,0,0,.54);
+
+  }
+.slick-next {
+  // position: absolute;
+  top:40%;
+  padding-top: 2.5px;
+  background: #fff;
+  width: 32px;
+  height: 32px;
+  right: 25px;
+
+  z-index: 1;
+border-radius: 100%;
+}
+}
 
 .style_house_sec02 .style_house_sec02_slide {
   margin-top: 30px;
@@ -1994,6 +2053,10 @@ input[type="search"]::-webkit-search-cancel-button {
   .room-planner-service-content {
     margin-top: 50px;
     height: 188px;
+    @media screen and (min-width: 1441px) {
+      width: 90%;
+      margin: 50px auto;
+    }
     img {
       width: 21px;
       height: 21px;
@@ -2154,7 +2217,7 @@ input[type="search"]::-webkit-search-cancel-button {
     @media screen and (max-width: 2057px) {
       right: -60px;
       top: -75px;
-      width:24vw;
+      width:22vw;
     }
     @media screen and (max-width: 1921px) {
       right: -60px;
@@ -2188,7 +2251,7 @@ input[type="search"]::-webkit-search-cancel-button {
     }
     @media screen and (max-width: 2057px) {
       width: 90%;
-      margin-top: -130px;
+      margin-top: -150px;
     }
     @media screen and (max-width: 1921px) {
       width: 90%;
@@ -2196,7 +2259,9 @@ input[type="search"]::-webkit-search-cancel-button {
     
     }
     @media screen and (max-width: 1441px) {
+      width: 100%;
       margin-top: -30px;
+      margin-left: 10px;
     }
   }
   .step1-0 {
@@ -2208,7 +2273,7 @@ input[type="search"]::-webkit-search-cancel-button {
     }
     @media screen and (max-width: 2057px) {
       width: 40%;
-      margin-top: -30px;
+      margin-top: -50px;
       margin-left: 100px;
     }
     // 1920
@@ -2231,8 +2296,8 @@ input[type="search"]::-webkit-search-cancel-button {
     }
     @media screen and (max-width: 2057px) {
       width: 80%;
-      margin-top: -80px;
-      margin-left: 80px;
+      margin-top: -110px;
+      margin-left: 70px;
     }
     @media screen and (max-width: 1921px) {
       width: 80%;
@@ -2253,9 +2318,9 @@ input[type="search"]::-webkit-search-cancel-button {
       margin-left: 120px;
     }
     @media screen and (max-width: 2057px) {
-      width: 80%;
+      width: 75%;
       margin-top: -60px;
-      margin-left: 60px;
+      margin-left: 100px;
     }
     @media screen and (max-width: 1921px) {
       width: 80%;
@@ -2277,9 +2342,9 @@ input[type="search"]::-webkit-search-cancel-button {
       margin-right: 50px;
     }
     @media screen and (max-width: 2057px) {
-      width: 50%;
-      margin-top: -100px;
-      margin-right: 80px;
+      width: 45%;
+      margin-top: -70px;
+      margin-right: 70px;
     }
     @media screen and (max-width: 1921px) {
       width: 50%;
@@ -2289,7 +2354,7 @@ input[type="search"]::-webkit-search-cancel-button {
     @media screen and (max-width: 1441px) {
       width: 60%;
       margin-right: 50px;
-      margin-top: -30px;
+      margin-top: -10px;
     }
   }
   .step5 {
@@ -2299,9 +2364,9 @@ input[type="search"]::-webkit-search-cancel-button {
       margin-left: 120px;
     }
     @media screen and (max-width: 2057px) {
-      width: 90%;
-      margin-top: -100px;
-      margin-left: 50px;
+      width: 85%;
+      margin-top: -80px;
+      margin-left: 70px;
     }
   
     @media screen and (max-width: 1921px) {
@@ -2314,7 +2379,9 @@ input[type="search"]::-webkit-search-cancel-button {
     //   margin-top: -100px;
     // }
     @media screen and (max-width: 1441px) {
-      margin-top: 50px;
+      width: 100%;
+      margin-top: -20px;
+      margin-left: 0px;
     }
    
   }
@@ -2337,6 +2404,7 @@ input[type="search"]::-webkit-search-cancel-button {
       margin-top: -80px;
     }
     @media screen and (max-width: 1441px) {
+      width: 40%;
       margin-right: 80px;
       margin-top: -80px;
     }
@@ -2366,7 +2434,7 @@ input[type="search"]::-webkit-search-cancel-button {
       width: 130px;
       position: absolute;
       right: 30px;
-      top: 50px;
+      top: 30px;
     }
   }
   .room-planner-process-main-box {
@@ -2487,7 +2555,7 @@ input[type="search"]::-webkit-search-cancel-button {
   
     }
     @media screen and (max-width: 1441px) {
-      bottom: -30px;
+      bottom: -15px;
       right: 170px;
      
     }
@@ -2549,8 +2617,8 @@ input[type="search"]::-webkit-search-cancel-button {
      
     }
     @media screen and (max-width: 1441px) {
-      right: -15px;
-      top: 50px;
+      right: -5px;
+      top: 30px;
      
     }
   
@@ -2563,7 +2631,15 @@ input[type="search"]::-webkit-search-cancel-button {
 .room-planner-process-main-content-step-4-6img {
   @media screen and (min-width: 2500px) {
     margin-top: 200px;
-   
+  }
+  @media screen and (max-width: 2057px) {
+    margin-top: 320px;
+  }
+  @media screen and (max-width: 1921px) {
+    margin-top: 380px;
+  }
+  @media screen and (max-width: 1441px) {
+    margin-top: 380px;
   }
   margin-top: 380px;
 }
@@ -4115,6 +4191,7 @@ input[type="search"]::-webkit-search-cancel-button {
   font-family: NSJP-400;
 }
 
+
 .furniture-design h5 {
   font-weight: bold;
   color: var(--main-color);

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

@@ -170,7 +170,7 @@ window.onload = function () {
 $('.style_house_sec02 .slider-for').slick({
   slidesToShow: 1,
   slidesToScroll: 1,
-  arrows: false,
+  arrows: true,
   fade: true,
   asNavFor: '.slider-nav'
 });

+ 27 - 4
themes/hugo-universal-theme-master/static/js/cz_filter.js

@@ -1,4 +1,5 @@
 console.log(1)
+
 // 選擇屋型處理
 function change_type() {
   type = this.value;
@@ -40,7 +41,7 @@ function update_info(type, ping, budget, room) {
   // 讀取作品集資料(json)
   // 線上版網址 http://192.53.174.202:9001/api/
   // 本地端網址 http://localhost:9001/api/
-  fetch('http://192.53.174.202:9001/api/contents?url=/collection')
+  fetch('http://localhost:9001/api/contents?url=/collection')
     .then(response => response.json())
     .then(items => {
       console.log(items)
@@ -105,7 +106,6 @@ function update_info(type, ping, budget, room) {
                       alt="' + items[i]['title'] + '" \
                       src="' + items[i]['image'] + '" \
                       layout="responsive"> \
-                    <img> \
                   <div class="slide_item_text"> \
                       <p>' + items[i]['title'] + '</p>\
                   </div>  \
@@ -131,7 +131,7 @@ function update_info(type, ping, budget, room) {
         console.log('無資料'); // test
 
         content += ' \
-          <div class="card bg-primary text-white text-center"> \
+          <div style="background-color: #808f4c;" class="card text-white text-center"> \
             <div class="card-body p-5"> \
               <div class="mb-3"> \
                 <b>找不到符合條件的作品</b> \
@@ -149,7 +149,7 @@ function update_info(type, ping, budget, room) {
               ' + rooms + ' \
               </div> \
               <div> \
-                <a href="/collection" class="btn btn-primary">重新查詢</a> \
+                <a href="/collection" class="btn text-white">重新查詢</a> \
               </div> \
             </div> \
           </div>';
@@ -197,3 +197,26 @@ for (var i = 0; i < items.length; i++) {
   console.log('選擇格局..........');
   items[i].addEventListener("change", change_rooms);
 }
+
+function getCollectionType() {
+  let collectionTypeVal = localStorage.getItem('type');
+ 
+  if(collectionTypeVal==='透天'){
+    $("#house").addClass("select");
+    $("#house").siblings().removeClass('select');
+    type =collectionTypeVal;
+    console.log('透天')
+    update_info(type, ping, budget, rooms);
+    
+  }else if(collectionTypeVal==='大樓'){
+    $("#building").addClass("select");
+    $("#building").siblings().removeClass('select');
+    console.log('大樓')
+    type =collectionTypeVal;
+    update_info(type, ping, budget, rooms);
+  }
+}
+
+getCollectionType();
+
+

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác