Authored by htoooth

fix css

@@ -473,11 +473,11 @@ @@ -473,11 +473,11 @@
473 473
474 <div class="shoppingCar-nav"> 474 <div class="shoppingCar-nav">
475 <ul> 475 <ul>
476 - <li><a href="#goodsMessage" class="fixed option">&nbsp;&nbsp;商品信息</a></li>  
477 - <li><a href="#sizeTitle" class="option">&nbsp;&nbsp;尺码信息</a></li>  
478 - <li><a href="#goodsTitle" class="option">&nbsp;&nbsp;商品详情</a></li>  
479 - <li><a href="#judgeTitle" class="option comment">&nbsp;&nbsp;商品评价</a></li>  
480 - <li><a href="#goodsAskTitle" class="option consult">&nbsp;&nbsp;商品咨询</a></li> 476 + <li><a data-el="#goodsMessage" href="javascript:;" class="fixed option">&nbsp;&nbsp;商品信息</a></li>
  477 + <li><a data-el="#sizeTitle" href="javascript:;" class="option">&nbsp;&nbsp;尺码信息</a></li>
  478 + <li><a data-el="#goodsTitle" href="javascript:;" class="option">&nbsp;&nbsp;商品详情</a></li>
  479 + <li><a data-el="#judgeTitle" href="javascript:;" class="option comment">&nbsp;&nbsp;商品评价</a></li>
  480 + <li><a data-el="#goodsAskTitle" href="javascript:;" class="option consult">&nbsp;&nbsp;商品咨询</a></li>
481 </ul> 481 </ul>
482 </div> 482 </div>
483 </div> 483 </div>
@@ -186,6 +186,7 @@ function dataLazyLoad(doc) { @@ -186,6 +186,7 @@ function dataLazyLoad(doc) {
186 Util.addEvent(window, "scroll", $.throttle(500, true, _this.fn)); 186 Util.addEvent(window, "scroll", $.throttle(500, true, _this.fn));
187 Util.addEvent(window, "resize", $.throttle(500, true, _this.fn)); 187 Util.addEvent(window, "resize", $.throttle(500, true, _this.fn));
188 Util.addEvent(doc.body, "touchMove", $.throttle(500, true, _this.fn)); 188 Util.addEvent(doc.body, "touchMove", $.throttle(500, true, _this.fn));
  189 + return this;
189 } 190 }
190 }; 191 };
191 } 192 }
@@ -1101,6 +1101,7 @@ function loadComment() { @@ -1101,6 +1101,7 @@ function loadComment() {
1101 commentPage[type] = commentPage[type] || 1; 1101 commentPage[type] = commentPage[type] || 1;
1102 1102
1103 loadingComments = true; 1103 loadingComments = true;
  1104 +
1104 return $.ajax({ 1105 return $.ajax({
1105 type: 'GET', 1106 type: 'GET',
1106 url: '/product/detail/comment', 1107 url: '/product/detail/comment',
@@ -1115,7 +1116,7 @@ function loadComment() { @@ -1115,7 +1116,7 @@ function loadComment() {
1115 1116
1116 // 购买评价 1117 // 购买评价
1117 function loadAllComments(type, nowPage) { 1118 function loadAllComments(type, nowPage) {
1118 - loadComments(type, nowPage).then(function(data) { 1119 + return loadComments(type, nowPage).then(function(data) {
1119 var res, filter, $ul, totalnum = 0, baseUrl; 1120 var res, filter, $ul, totalnum = 0, baseUrl;
1120 1121
1121 if (data.code === 200) { 1122 if (data.code === 200) {
@@ -1203,7 +1204,7 @@ function loadComment() { @@ -1203,7 +1204,7 @@ function loadComment() {
1203 } 1204 }
1204 }); 1205 });
1205 1206
1206 - loadAllComments(currentType); 1207 + return loadAllComments(currentType);
1207 } 1208 }
1208 1209
1209 // 购买评价的相关事件 1210 // 购买评价的相关事件
@@ -1265,7 +1266,7 @@ function loadConsult() { @@ -1265,7 +1266,7 @@ function loadConsult() {
1265 1266
1266 loadingConsults = true; 1267 loadingConsults = true;
1267 1268
1268 - $.ajax({ 1269 + return $.ajax({
1269 type: 'GET', 1270 type: 'GET',
1270 url: '/product/detail/consult', 1271 url: '/product/detail/consult',
1271 data: { 1272 data: {
@@ -1426,7 +1427,7 @@ function loadConsult() { @@ -1426,7 +1427,7 @@ function loadConsult() {
1426 }); 1427 });
1427 }); 1428 });
1428 1429
1429 - loadConsults(1); 1430 + return loadConsults(1);
1430 } 1431 }
1431 1432
1432 window.fetchConsult = window.once(loadConsult); 1433 window.fetchConsult = window.once(loadConsult);
@@ -1465,7 +1466,7 @@ function initPageYas() { @@ -1465,7 +1466,7 @@ function initPageYas() {
1465 1466
1466 // 店铺推荐 1467 // 店铺推荐
1467 function loadRecommend() { 1468 function loadRecommend() {
1468 - $.ajax({ 1469 + return $.ajax({
1469 type: 'GET', 1470 type: 'GET',
1470 url: '/product/detail/recommend', 1471 url: '/product/detail/recommend',
1471 data: { 1472 data: {
@@ -1769,6 +1770,19 @@ function loadReturn() { @@ -1769,6 +1770,19 @@ function loadReturn() {
1769 1770
1770 window.fetchReturn = window.once(loadReturn); 1771 window.fetchReturn = window.once(loadReturn);
1771 1772
  1773 +function _scrollTo($ele) {
  1774 + var top = 0;
  1775 +
  1776 + if ($ele) {
  1777 + top = $ele.offset().top - 20;
  1778 + }
  1779 +
  1780 + $('html,body').animate({
  1781 + scrollTop: top
  1782 + }, 500);
  1783 +}
  1784 +
  1785 +
1772 // 首屏加载后,对比数据是否变化,如果变化,重新渲染,重新绑定事件 1786 // 首屏加载后,对比数据是否变化,如果变化,重新渲染,重新绑定事件
1773 bindEvent.fire(); 1787 bindEvent.fire();
1774 1788
@@ -1796,6 +1810,10 @@ bindEvent.fire(); @@ -1796,6 +1810,10 @@ bindEvent.fire();
1796 favorite.statusFav(shopId, brandId).then(function() { 1810 favorite.statusFav(shopId, brandId).then(function() {
1797 $('#brand-favour').addClass('coled'); 1811 $('#brand-favour').addClass('coled');
1798 }); 1812 });
  1813 +
  1814 + // 数据懒加载
  1815 + var dataLoad = dataLazyLoad.init({cls: '.datalazyload', threshold: 0}); //eslint-disable-line
  1816 + dataLoad.fn && dataLoad.fn();
1799 }()); 1817 }());
1800 1818
1801 $(window).scroll(function() { 1819 $(window).scroll(function() {
@@ -1857,6 +1875,8 @@ $('.shoppingCar').on('click', '.option', function(e) { @@ -1857,6 +1875,8 @@ $('.shoppingCar').on('click', '.option', function(e) {
1857 window.fetchRecommend(); 1875 window.fetchRecommend();
1858 } 1876 }
1859 1877
  1878 + _scrollTo($($this.data('el')));
  1879 +
1860 e.stopPropagation(); 1880 e.stopPropagation();
1861 }); 1881 });
1862 1882
@@ -1873,9 +1893,8 @@ $('.shoppingCar-btn').on('click', function() { @@ -1873,9 +1893,8 @@ $('.shoppingCar-btn').on('click', function() {
1873 } 1893 }
1874 1894
1875 var $addToCart = $('#add-to-cart'); 1895 var $addToCart = $('#add-to-cart');
1876 - var sc = $(document);  
1877 1896
1878 - sc.scrollTop(200); 1897 + _scrollTo();
1879 1898
1880 if (maxStock === -1) { 1899 if (maxStock === -1) {
1881 $('#sizes').children('.size-warn').removeClass('hide'); 1900 $('#sizes').children('.size-warn').removeClass('hide');
@@ -1911,5 +1930,4 @@ $(function() { @@ -1911,5 +1930,4 @@ $(function() {
1911 yasAtBottom.yasBottom(); 1930 yasAtBottom.yasBottom();
1912 1931
1913 1932
1914 - // 数据懒加载  
1915 -dataLazyLoad.init({cls: '.datalazyload', threshold: 0}); 1933 +
@@ -816,9 +816,10 @@ @@ -816,9 +816,10 @@
816 816
817 .share-row { 817 .share-row {
818 margin-top: 20px; 818 margin-top: 20px;
  819 + height: 16px;
819 820
820 .title { 821 .title {
821 - 822 + line-height: 16px !important;
822 } 823 }
823 } 824 }
824 825