Merge branch 'master' of http://git.choozmo.com:3000/syuanyuri/hhh_new

designers/lists/index.html

@@ -41,7 +41,7 @@
 
   <title>幸福空間 - 室內設計、裝潢、居家生活、影音平台</title>
 
-  <link rel="icon" href="https://hhh.com.tw/assets/images/favicon.ico" />
+  <link rel="icon" href="../../img/favicon.ico" />
 
   <!-- Fontawesome -->
   <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"
@@ -159,7 +159,8 @@
               <input type="text" placeholder="請輸入關鍵字" aria-label="請輸入關鍵字" aria-describedby="searchbar"
                 class="form-control border-primary keywords" autocomplete="off">
               <div class="input-group-append">
-                <button onclick="designerSearch()" type="button" data-ga="View_Search_Results" class="input-group-text">搜尋</button>
+                <button onclick="designerSearch()" type="button" data-ga="View_Search_Results"
+                  class="input-group-text">搜尋</button>
               </div>
             </div>
 

template/navbar.html

@@ -520,8 +520,7 @@
         <li class="nav-item">
           <div class="d-flex">
             <a class="nav-link d-flex align-items-center w-100" href="https://hhh.com.tw/builder/lists/">
-              <img src="../../img/menu/building.svg" alt="" height="22"
-                class="d-block d-lg-none">
+              <img src="../../img/menu/building.svg" alt="" height="22" class="d-block d-lg-none">
               <span class="ms-3 ms-lg-0 d-flex"><span class="search-text">尋找</span>新建案</span>
             </a>
           </div>
@@ -538,14 +537,13 @@
       </ul>
 
       <ul class="navbar-nav mb-2 mb-lg-0 ms-auto d-none d-lg-flex">
-        <li class="nav-item d-flex align-items-center mt-1" id="app_user">
+        <li class="nav-item d-flex align-items-center" id="app_user">
           <!-- <a class="nav-link" href="javascript:;" onclick="hhh_user_api_login()">
               <section class="d-flex align-items-center">
-                <img src="https://hhh.com.tw../img/icon/material-people.svg" alt="" class="me-2 mt-1" />
-                <span class="pt-1">登入</span>
+                <img src="../../img/icon/material-people.svg" alt="" class="me-2" />
+                <span>登入</span>
               </section>
             </a> -->
-
         </li>
         <!-- 暫時隱藏 -->
         <!-- <li class="nav-item">
@@ -565,135 +563,182 @@
         </li>
       </ul>
 
-        <!-- Footer -->
-        <footer class="d-block d-lg-none footer">
-          <div class="container" style="margin:0 auto;">
-            <div class="row">
-              <div class="col-12 col-lg-4 about-list">
-                <section>
-                  <h4>相關連結</h4>
-                  <div class="d-flex justify-content-lg-center">
-                    <ul>
-                      <li>
-                        <a href="https://event.hhh.com.tw/agent/lecture.html" target="_blank">
-                          <img src="../../img/menu/freelecture.svg" alt="免費報名幸福講堂">
-                          免費報名幸福講堂
-                        </a>
-                      </li>
-                      <li>
-                        <a href="https://event.hhh.com.tw/agent/" target="_blank">
-                          <img src="../../img/menu/agent.svg" alt="幸福經紀人">
-                          幸福經紀人 <span>0800-366-086</span>
-                        </a>
-                      </li>
-  
-                      <li>
-                        <a href="http://gstv.com.tw/" target="_blank">
-                          <img src="../../img/menu/tv.svg" alt="幸福空間居家台">
-                          幸福空間居家台
-                        </a>
-                      </li>
-                      <li>
-                        <a href="https://event.hhh.com.tw/contest/2018/" target="_blank">
-                          <img src="../../img/menu/prize.svg" alt="ADA 亞洲設計獎">
-                          ADA 亞洲設計獎
-                        </a>
-                      </li>
-  
-                      <li>
-                        <a href="https://www.leju.com.tw/" target="_blank">
-                          <img src="../../img/menu/Image-1@2x.png" alt="樂居網">
-                          樂居網
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </section>
-              </div>
-              <div class="col-12 col-lg-4 follow-list">
-                <section>
-                  <h4>追蹤我們</h4>
-                  <div class="d-flex flex-column align-items-center">
-                    <section class="media">
-                      <a href="https://www.facebook.com/hhhfb" target="_blank">
-                        <img src="../../img/media/fb.svg" alt="Facebook" class="media-item before">
-                        <img src="../../img/media/fb_h.svg" alt="Facebook" class="media-item after">
+      <!-- Footer -->
+      <footer class="d-block d-lg-none footer">
+        <div class="container" style="margin:0 auto;">
+          <div class="row">
+            <div class="col-12 col-lg-4 about-list">
+              <section>
+                <h4>相關連結</h4>
+                <div class="d-flex justify-content-lg-center">
+                  <ul>
+                    <li>
+                      <a href="https://event.hhh.com.tw/agent/lecture.html" target="_blank">
+                        <img src="../../img/menu/freelecture.svg" alt="免費報名幸福講堂">
+                        免費報名幸福講堂
                       </a>
-                      <a href="https://page.line.me/ovs4341s?openQrModal=true" target="_blank">
-                        <img src="../../img/media/ln.svg" alt="Line" class="media-item before">
-                        <img src="../../img/media/ln_h.svg" alt="Line" class="media-item after">
+                    </li>
+                    <li>
+                      <a href="https://event.hhh.com.tw/agent/" target="_blank">
+                        <img src="../../img/menu/agent.svg" alt="幸福經紀人">
+                        幸福經紀人 <span>0800-366-086</span>
                       </a>
-                      <a href="https://www.youtube.com/user/gorgeousspace" target="_blank">
-                        <img src="../../img/media/yt.svg" alt="YouTube" class="media-item before">
-                        <img src="../../img/media/yt_h.svg" alt="YouTube" class="media-item after">
+                    </li>
+
+                    <li>
+                      <a href="http://gstv.com.tw/" target="_blank">
+                        <img src="../../img/menu/tv.svg" alt="幸福空間居家台">
+                        幸福空間居家台
                       </a>
-                      <a href="https://www.instagram.com/gorgeous_space/" target="_blank">
-                        <img src="../../img/media/ig.svg" alt="Instagram" class="media-item before">
-                        <img src="../../img/media/ig_h.svg" alt="Instagram" class="media-item after">
+                    </li>
+                    <li>
+                      <a href="https://event.hhh.com.tw/contest/2018/" target="_blank">
+                        <img src="../../img/menu/prize.svg" alt="ADA 亞洲設計獎">
+                        ADA 亞洲設計獎
                       </a>
-  
-                      <a href="https://www.tiktok.com/@gorgeousspace" target="_blank">
-                        <img src="../../img/media/tt.svg" alt="Tiktok" class="media-item before">
-                        <img src="../../img/media/tt_h.svg" alt="Tiktok" class="media-item after rounded-circle">
+                    </li>
+
+                    <li>
+                      <a href="https://www.leju.com.tw/" target="_blank">
+                        <img src="../../img/menu/Image-1@2x.png" alt="樂居網">
+                        樂居網
+                      </a>
+                    </li>
+                  </ul>
+                </div>
+              </section>
+            </div>
+            <div class="col-12 col-lg-4 follow-list">
+              <section>
+                <h4>追蹤我們</h4>
+                <div class="d-flex flex-column align-items-center">
+                  <section class="media">
+                    <a href="https://www.facebook.com/hhhfb" target="_blank">
+                      <img src="../../img/media/fb.svg" alt="Facebook" class="media-item before">
+                      <img src="../../img/media/fb_h.svg" alt="Facebook" class="media-item after">
+                    </a>
+                    <a href="https://page.line.me/ovs4341s?openQrModal=true" target="_blank">
+                      <img src="../../img/media/ln.svg" alt="Line" class="media-item before">
+                      <img src="../../img/media/ln_h.svg" alt="Line" class="media-item after">
+                    </a>
+                    <a href="https://www.youtube.com/user/gorgeousspace" target="_blank">
+                      <img src="../../img/media/yt.svg" alt="YouTube" class="media-item before">
+                      <img src="../../img/media/yt_h.svg" alt="YouTube" class="media-item after">
+                    </a>
+                    <a href="https://www.instagram.com/gorgeous_space/" target="_blank">
+                      <img src="../../img/media/ig.svg" alt="Instagram" class="media-item before">
+                      <img src="../../img/media/ig_h.svg" alt="Instagram" class="media-item after">
+                    </a>
+
+                    <a href="https://www.tiktok.com/@gorgeousspace" target="_blank">
+                      <img src="../../img/media/tt.svg" alt="Tiktok" class="media-item before">
+                      <img src="../../img/media/tt_h.svg" alt="Tiktok" class="media-item after rounded-circle">
+                    </a>
+                  </section>
+
+                </div>
+              </section>
+            </div>
+            <div class="col-12 col-lg-4 more-list">
+              <section>
+                <h4 class="d-none d-lg-block">了解更多</h4>
+                <div class="d-flex flex-column mt-2 mt-lg-0">
+                  <section class="subscriber-item">
+                    <input type="email" placeholder="訂閱電子報，請輸入您的 Email">
+                    <button class="d-flex justify-content-center align-items-center">
+                      <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
+                      <p class="mb-0">訂閱</p>
+                    </button>
+                  </section>
+                  <div class="d-lg-flex justify-content-center">
+                    <section class="mt-4 link">
+                      <a href="https://hhh.com.tw/about/contact/" target="_blank">
+                        聯絡我們
+                      </a>
+                      <a href="https://hhh.com.tw/about/privacy_policy" target="_blank">
+                        隱私保護
+                      </a>
+                      <a href="https://hhh.com.tw/about/" target="_blank">
+                        關於我們
+                      </a>
+                      <a href="https://hhh.com.tw/about/timeline/" target="_blank">
+                        公司歷程
+                      </a>
+                      <a href="https://www.104.com.tw/company/d6hr8sg" target="_blank">
+                        企業徵才
+                      </a>
+                      <a href="https://hhh.com.tw/about/sitemap/" target="_blank">
+                        網站地圖
                       </a>
                     </section>
-  
-                  </div>
-                </section>
-              </div>
-              <div class="col-12 col-lg-4 more-list">
-                <section>
-                  <h4 class="d-none d-lg-block">了解更多</h4>
-                  <div class="d-flex flex-column mt-2 mt-lg-0">
-                    <section class="subscriber-item">
-                      <input type="email" placeholder="訂閱電子報，請輸入您的 Email">
-                      <button class="d-flex justify-content-center align-items-center">
-                        <span class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></span>
-                        <p class="mb-0">訂閱</p>
-                      </button>
-                    </section>
-                    <div class="d-lg-flex justify-content-center">
-                      <section class="mt-4 link">
-                        <a href="https://hhh.com.tw/about/contact/" target="_blank">
-                          聯絡我們
-                        </a>
-                        <a href="https://hhh.com.tw/about/privacy_policy" target="_blank">
-                          隱私保護
-                        </a>
-                        <a href="https://hhh.com.tw/about/" target="_blank">
-                          關於我們
-                        </a>
-                        <a href="https://hhh.com.tw/about/timeline/" target="_blank">
-                          公司歷程
-                        </a>
-                        <a href="https://www.104.com.tw/company/d6hr8sg" target="_blank">
-                          企業徵才
-                        </a>
-                        <a href="https://hhh.com.tw/about/sitemap/" target="_blank">
-                          網站地圖
-                        </a>
-                      </section>
-                    </div>
                   </div>
-                </section>
-              </div>
-              <h2 class="d-none d-md-block">
-                幸福空間 版權所有 © Gorgeous Space Co.Ltd. All Rights Reserved
-              </h2>
-              <h2 class="d-block d-md-none">
-                幸福空間 版權所有 <br> © Gorgeous Space Co.Ltd. All Rights Reserved
-              </h2>
+                </div>
+              </section>
             </div>
+            <h2 class="d-none d-md-block">
+              幸福空間 版權所有 © Gorgeous Space Co.Ltd. All Rights Reserved
+            </h2>
+            <h2 class="d-block d-md-none">
+              幸福空間 版權所有 <br> © Gorgeous Space Co.Ltd. All Rights Reserved
+            </h2>
           </div>
-        </footer>
+        </div>
+      </footer>
     </div>
   </div>
 </nav>
 
 <script>
+  // 登入
+  function hhh_user_api_login() {
+    window.location.href = `https://hhh.com.tw/users`;
+  }
+
+  let user_data = [];
+
+  function hhh_user_api() {
+    console.log('登入');
+    $.ajax({
+      method: "post",
+      url: "https://hhh.com.tw/adapter/index?http_method=GET&api_url=/base/v1/member/index",
+      // async: false,
+      dataType: "json",
+    }).done(function (msg) {
+      user_data = msg;
+      let app_user = "";
+      console.log('hhh_user_msg', msg);
+      if (msg.status == "Success") {
+        app_user += `
+        <div class="dropdown">
+          <button class="btn dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false" onclick="hhh_user_api_login()">
+            <div class="d-flex align-items-center">
+              <img src="${msg.data[" user_avatar"]}" alt="" style="height: 32px; width: 32px;border-radius: 100px;">
+              <p class="ms-2">${msg.data["name"]}</p>
+            </div>
+          </button>
+          <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
+            <li><a class="dropdown-item" href="https://hhh.com.tw/users">會員專區</a></li>
+          </ul>
+        </div>`;
+      } else {
+        app_user += `
+        <a class="nav-link" href="javascript:;" onclick="hhh_user_api_login()">
+          <section class="d-flex align-items-center">
+            <img src="../../img/icon/material-people.svg" alt="" class="me-2" />
+            <span>登入</span>
+          </section>
+        </a>`;
+      }
+      $("#app_user").html(app_user);
+    }).fail(function (err) {
+      console.log('err', err);
+    });
+  }
+
+  hhh_user_api();
+
   // 首頁搜尋
   $(".search-modal .keyword-list li").on("click", (e) => {
-
     dataLayer.push({
       'event': 'Click_Promo_Keyword',
       'promo_keyword': `${e.target.innerText}`,