update Branches info

js/index-designer.js

@@ -495,14 +495,38 @@ function renderinfoCard(designer) {
     // Branches
     let otherStr = '';
     for (let i = 0; i < designer['Branches'].length; i++) {
+       
+
         otherStr += `<aside class="d-flex">
                     <div class="infoCard__detail__l">
-                        <div>${designer['Branches'][i].title}</div>
+                        <div>分公司地址：</div>
+                    </div>
+                    <div class="infoCard__detail__r">
+                        <a href="${designer['Branches'][i].link}" >${designer['Branches'][i].address}</a>
+                    </div>
+                </aside>
+                <aside class="d-flex">
+                    <div class="infoCard__detail__l">
+                        <div>分公司電話：</div>
                     </div>
                     <div class="infoCard__detail__r">
-                        <a href="${designer['Branches'][i].link}" >${designer['Branches'][i].data}</a>
+                        <a href="tel:${designer['Branches'][i].tel}" >${designer['Branches'][i].tel}</a>
                     </div>
                 </aside>`
+                if(designer['Branches'][i].fax==""){
+                    otherStr +=  `<aside class="d-flex">
+                  
+                </aside>
+                    `
+                }else{
+                    otherStr += `<aside class="d-flex"><div class="infoCard__detail__l">
+                    <div>分公司傳真：</div>
+                </div>
+                <div class="infoCard__detail__r">
+                    <a href="fax:${designer['Branches'][i].fax}" >${designer['Branches'][i].fax}</a>
+                </div>   </aside>`
+                }
+         
     }
     $('.infoCard__branches').html(otherStr);
     let currentURL = window.location.href;

js/index-list-mb.js

@@ -89,7 +89,7 @@ window.onload = function () {
     $(window).scroll(function () {
       let bottom = $("body").height() - $(window).height() - 1;
       if ($(window).scrollTop() >= bottom) {
-          loadMoretest();
+        loadMoretest();
       }
     })
     // let bottom = $("body").height() - $(window).height() - 1;
@@ -113,22 +113,22 @@ window.onload = function () {
 function scroll_bottom_load_data(page) {
 
   $.ajax({
-      method: "GET",
-      url: `https://m3.hhh.com.tw:18686/gendesigner?id=${cid}&sort=new&page=${page}`,
+    method: "GET",
+    url: `https://m3.hhh.com.tw:18686/gendesigner?id=${cid}&sort=new&page=${page}`,
   }).done(function (msg) {
-      result = [...msg];
-      let append = '';
-      let d = result[0].Content[0].Carddata;
-      // let cardcontent=[]
-      let nowTab = document.querySelector('.infoContent .tab-pane.show');
-      if (nowTab === document.querySelector('#pills-intro')) {
-          for (let j = 0; j < d.length; j++) {
-
-              let tagStr = ''
-              for (let k = 0; k < d[j]['tag'].length; k++) {
-                  tagStr += `<a href="${d[j]['tag'][k]['link']}" class="card__tag" target="_blank">${d[j]['tag'][k]['name']}</a>`
-              }
-              append += `<div class="col-6 col-md-4">
+    result = [...msg];
+    let append = '';
+    let d = result[0].Content[0].Carddata;
+    // let cardcontent=[]
+    let nowTab = document.querySelector('.infoContent .tab-pane.show');
+    if (nowTab === document.querySelector('#pills-intro')) {
+      for (let j = 0; j < d.length; j++) {
+
+        let tagStr = ''
+        for (let k = 0; k < d[j]['tag'].length; k++) {
+          tagStr += `<a href="${d[j]['tag'][k]['link']}" class="card__tag" target="_blank">${d[j]['tag'][k]['name']}</a>`
+        }
+        append += `<div class="col-6 col-md-4">
                                   <a href="${d[j]['url']}" target="_blank">
                                       <div class="card">
                                           <div style="overflow: hidden;">
@@ -145,23 +145,23 @@ function scroll_bottom_load_data(page) {
                                   </a>
                                </div>`
 
-              // var cardcontent2=cardcontent.push.d;
-          }
-          if (d.length === 0) {
-              $('#loading_img').css("display", "none")
-          }
-          // console.log(cardcontent2);
-
-          $('#pills-intro .work__row').append(append);
-      }else if (nowTab === document.querySelector('#pills-video')) {
-              let append = '';
-              let d = result[0].Content[0].Carddata;
-              for(let j = 0;j < d.length; j ++) {
-                  let tagStr = ''
-                  for(let k = 0;k < d[j]['tag'].length; k ++) {
-                      tagStr += `<a href="${d[j]['tag'][k]['link']}" class="card__tag" target="_blank">${d[j]['tag'][k]['name']}</a>`
-                  }
-                  append += `<div class="col-6 col-md-4">
+        // var cardcontent2=cardcontent.push.d;
+      }
+      if (d.length === 0) {
+        $('#loading_img').css("display", "none")
+      }
+      // console.log(cardcontent2);
+
+      $('#pills-intro .work__row').append(append);
+    } else if (nowTab === document.querySelector('#pills-video')) {
+      let append = '';
+      let d = result[0].Content[0].Carddata;
+      for (let j = 0; j < d.length; j++) {
+        let tagStr = ''
+        for (let k = 0; k < d[j]['tag'].length; k++) {
+          tagStr += `<a href="${d[j]['tag'][k]['link']}" class="card__tag" target="_blank">${d[j]['tag'][k]['name']}</a>`
+        }
+        append += `<div class="col-6 col-md-4">
                                   <a href="${d[j]['url']}" target="_blank">
                                   <div class="card">
                                       <div style="overflow: hidden;">
@@ -178,21 +178,21 @@ function scroll_bottom_load_data(page) {
                                   </div>
                                   </a>
                               </div>`
-              }
-              if (d.length === 0) {
-                  $('#loading_img').css("display", "none")
-              }
-              $('#pills-video .work__row').append(append);
-          
-        }else if (nowTab === document.querySelector('#pills-columns')) {
-          let append = '';
-          let d = result[0].Content[0].Carddata;
-          for(let j = 0;j < d.length; j ++) {
-              let tagStr = ''
-              for(let k = 0;k < d[j]['tag'].length; k ++) {
-                  tagStr += `<a href="${d[j]['tag'][k]['link']}" class="card__tag" target="_blank">${d[j]['tag'][k]['name']}</a>`
-              }
-              append += `<div class="col-6 col-md-4">
+      }
+      if (d.length === 0) {
+        $('#loading_img').css("display", "none")
+      }
+      $('#pills-video .work__row').append(append);
+
+    } else if (nowTab === document.querySelector('#pills-columns')) {
+      let append = '';
+      let d = result[0].Content[0].Carddata;
+      for (let j = 0; j < d.length; j++) {
+        let tagStr = ''
+        for (let k = 0; k < d[j]['tag'].length; k++) {
+          tagStr += `<a href="${d[j]['tag'][k]['link']}" class="card__tag" target="_blank">${d[j]['tag'][k]['name']}</a>`
+        }
+        append += `<div class="col-6 col-md-4">
                               <a href="${d[j]['url']}" target="_blank">
                               <div class="card">
                                   <div style="overflow: hidden;">
@@ -208,9 +208,9 @@ function scroll_bottom_load_data(page) {
                               </div>
                               </a>
                           </div>`
-          }
-          $('#pills-columns .work__row').append(append);
-        }
+      }
+      $('#pills-columns .work__row').append(append);
+    }
 
 
   });
@@ -220,20 +220,20 @@ function scroll_bottom_load_data(page) {
 var page = 1;
 function loadMoretest() {
 
-    setTimeout(function () {
-        // let pageNum = 2;
-        // if(page<=pageNum){
-        //     pageNum++;
-        //     page++;
-        // }else{
+  setTimeout(function () {
+    // let pageNum = 2;
+    // if(page<=pageNum){
+    //     pageNum++;
+    //     page++;
+    // }else{
 
-        // }
-        scroll_bottom_load_data(page);
-        page++;
-        return page
+    // }
+    scroll_bottom_load_data(page);
+    page++;
+    return page
 
 
-    }, 500);
+  }, 500);
 }
 
 let over = document.querySelector('.infoContent__navBlock').offsetTop;
@@ -298,13 +298,35 @@ function renderinfoCard(designer) {
   let otherStr = '';
   for (let i = 0; i < designer['Branches'].length; i++) {
     otherStr += `<aside class="d-flex">
-                  <div class="mb__infoCard__detail__l">
-                      <div>${designer['Branches'][i].title}</div>
-                  </div>
-                  <div class="mb__infoCard__detail__r">
-                      <a href="${designer['Branches'][i].link}" >${designer['Branches'][i].data}</a>
-                  </div>
-              </aside>`
+    <div class="mb__infoCard__detail__l">
+        <div>分公司地址：</div>
+    </div>
+    <div class="mb__infoCard__detail__r">
+        <a href="${designer['Branches'][i].link}" >${designer['Branches'][i].address}</a>
+    </div>
+</aside>
+<aside class="d-flex">
+    <div class="mb__infoCard__detail__l">
+        <div>分公司電話：</div>
+    </div>
+    <div class="mb__infoCard__detail__r">
+        <a href="tel:${designer['Branches'][i].tel}" >${designer['Branches'][i].tel}</a>
+    </div>
+</aside>`
+    if (designer['Branches'][i].fax == "") {
+      otherStr += `<aside class="d-flex">
+  
+</aside>
+    `
+    } else {
+      otherStr += `<aside class="d-flex"><div class="mb__infoCard__detail__l">
+    <div>分公司傳真：</div>
+</div>
+<div class="mb__infoCard__detail__r">
+    <a href="fax:${designer['Branches'][i].fax}" >${designer['Branches'][i].fax}</a>
+</div>   </aside>`
+    }
+
   }
   $('.mb__infoCard__branches').html(otherStr);
   let currentURL = window.location.href;
@@ -316,16 +338,16 @@ function renderinfoCard(designer) {
                     <img src="${designer['scMedia'][i].img}" class="dislike" alt="">
                     <img src="https://hhh.com.tw/assets/images/rv_web/like.svg" class="like" alt="">
                 </span>`;
-    } 
+    }
     else if (i === 1) {
       mediaStr += `<a target="_blank" href="https://social-plugins.line.me/lineit/share?url=${currentURL}}">
       <img src="${designer['scMedia'][i].img}" alt="">
        </a>`;
-  } else if (i === 2) {
+    } else if (i === 2) {
       mediaStr += `<a target="_blank" href="https://www.addtoany.com/ext/wechat/share/#url=url=${currentURL}}">
       <img src="${designer['scMedia'][i].img}" alt="">
        </a>`;
-  } 
+    }
     else if (i === 3) {
       mediaStr += `<span class="send" data-bs-toggle="modal" data-bs-target="#emailModal">
                       <img src="${designer['scMedia'][i].img}" alt="">
@@ -419,8 +441,8 @@ function renderTabContent(content, meta) {
         let tagStr = '';
         for (let k = 0; k < content[i].Carddata[j].tag.length; k++) {
           tagStr += `<a href="${content[i].Carddata[j].tag[k]['link']}" class="card__tag" target="_blank">${content[i].Carddata[j].tag[k]['name']}</a>`
-      }
-      
+        }
+
         // for(let j = 0;j < content[i].Carddata.length; j ++) {
         cardData += `<div class="col-6 col-md-4">
                               <a href="${content[i].Carddata[j]['url']}" target="_blank">
@@ -481,7 +503,7 @@ function renderTabContent(content, meta) {
       </svg>
   </div>
 </div>`)
-$("#pills-video").append(`              <div class="d-flex justify-content-center py-1 py-md-5">
+  $("#pills-video").append(`              <div class="d-flex justify-content-center py-1 py-md-5">
 <div  id="loading_img">
   <svg class="loading-move" xmlns="http://www.w3.org/2000/svg" width="40" height="41.965"
       viewBox="0 0 40 41.965">
@@ -506,7 +528,7 @@ $("#pills-video").append(`              <div class="d-flex justify-content-cente
   </svg>
 </div>
 </div>`)
-$("#pills-columns").append(`              <div class="d-flex justify-content-center py-1 py-md-5">
+  $("#pills-columns").append(`              <div class="d-flex justify-content-center py-1 py-md-5">
 <div  id="loading_img">
   <svg class="loading-move" xmlns="http://www.w3.org/2000/svg" width="40" height="41.965"
       viewBox="0 0 40 41.965">