Merge branch 'master' of http://git.choozmo.com:3000/choozmo/New-Bhouse-Web

content/room_planner/room_planner.md

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

layouts/blog/list.html

@@ -103,7 +103,7 @@
       (function getContentsData() {
         // 線上版網址 http://192.53.174.202:9001/api/
         // 本地端網址 http://localhost:9001/api/
-        fetch('http://192.53.174.202:9001/api/contents?url=/blog').then(res => res.json()).then(list => {
+        fetch('https://bhouse2.ptt.cx:9002/api/contents?url=/blog').then(res => res.json()).then(list => {
           contentsData = list;
           // contentsData.shift();
           filterCategory();

layouts/blog/single.html

@@ -43,12 +43,12 @@
 
 
       <ul class="read-more-list">
-        <li>你可能會喜歡的，延伸閱讀點擊標題，看更多設計專欄！</li>
+        <!-- <li>你可能會喜歡的，延伸閱讀點擊標題，看更多設計專欄！</li>
         <li><a href="">【居家風格】 60萬以下 ↓ 超有氛圍的成家夢想</a></li>
         <li><a href="">【認識裝潢裝修】 模組系統櫃板材等級挑選5攻略</a></li>
         <li><a href="">【認識裝潢裝修】 11-20坪 小坪數裝潢裝修，規劃師教你小宅打造大空間</a></li>
         <li><a href="">【認識裝潢裝修】 什麼是輕裝修？輕裝修的定義是什麼？輕裝修包含什麼呢？</a></li>
-        <li><a href="">【規劃師服務】 什麼是規劃師？連室內設計師都推薦的「規劃師服務」</a></li>
+        <li><a href="">【規劃師服務】 什麼是規劃師？連室內設計師都推薦的「規劃師服務」</a></li> -->
       </ul>
     </div>
   </div>

layouts/collection/list.html

@@ -193,7 +193,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('https://bhouse2.ptt.cx:9002/api/contents?url=/collection').then(res => res.json()).then(list => {
           contentsData = list;
           console.log('contentsData', contentsData);
           // filterCategory();

layouts/room_planner/room_planner.html

@@ -1256,7 +1256,7 @@
             <div class="w-80-auto">
               <div class="room-planner-service"><mark><span class="room-planner-service-no">5</span>項保固與售後服務</mark>
               </div>
-              <div class="room-planner-service-5-service-inf mt-50">
+              <div id="room-planner-service-5-service-inf2" class="room-planner-service-5-service-inf mt-50">
                 <ul>
                   <li>沙發、床架實木骨架保固 10 年，永久保修</li>
                   <li>系統櫃、五金保固 5 年，永久保修</li>

resources/bhouse.js

@@ -228,7 +228,7 @@ let fb_link = `https://www.facebook.com/sharer.php?u=${location.href}`;
 let collection_icon_fb = document.getElementById('collection_icon_fb');
 $("#collection_icon_fb").attr("href",fb_link);
 
-let line_link = `http://line.naver.jp/R/msg/text/?${location.href}`;
+let line_link = `https://social-plugins.line.me/lineit/share?url=${location.href}`;
 let collection_icon_line = document.getElementById('collection_icon_line');
 
 $("#collection_icon_line").attr("href",line_link);

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

@@ -479,7 +479,7 @@ img {
 
 .footer .mobile-list {
   nav {
-    padding: 40px 60px;
+    padding: 40px 40px;
     border-bottom: 1px solid var(--dark-gray);
     .breadcrumb-item a {
       display: flex;
@@ -2131,10 +2131,13 @@ input[type="search"]::-webkit-search-cancel-button {
     display: none;
   }
 }
-.room-planner-service-5-service-inf {
+#room-planner-service-5-service-inf2{
   @media screen and (min-width: 1024px) {
     height: 180px;
   }
+}
+.room-planner-service-5-service-inf {
+
   ul {
     list-style: none;
   }

themes/hugo-universal-theme-master/static/js/cz_filter.js

@@ -41,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('https://bhouse2.ptt.cx:9002/api/contents?url=/collection')
     .then(response => response.json())
     .then(items => {
       console.log(items)