Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -45,7 +45,7 @@ function search() {
 }
 }
 
 
 function scrollHandler() {
 function scrollHandler() {
-    if ($(window).scrollTop() + winH >= $(document).height() - 50) {
+    if (!end || $(window).scrollTop() + winH >= $(document).height() - 50) {
         search();
         search();
     }
     }
 }
 }

@@ -122,26 +122,16 @@
     </div>
     </div>
 </div>
 </div>
 
 
-<!-- {{#washTips}}
-<div class="icons-wrapper washTips  page-block">
-    <ul class="icons-list clearfix">
-        {{#list}}
-        <li class="icons-item"><a href="{{url}}" class="imagebar"><img src="{{img}}" alt=""></a><a href="{{url}}" class="linkbar">{{title}}</a></li>
-        {{/list}}
-    </ul>
-</div>
-{{/washTips}} -->
-
 <div class="gap-block"></div>
 <div class="gap-block"></div>
 
 
 {{#productDetail}}
 {{#productDetail}}
 <div class="product-detail page-block">
 <div class="product-detail page-block">
     <h1 class="title">
     <h1 class="title">
-        {{title}}
-        <span class="en-title">{{enTitle}}</span>
+        {{{title}}}
+        <span class="en-title">{{{enTitle}}}</span>
     </h1>
     </h1>
     <div class="detail">
     <div class="detail">
-        <p>{{desc}}</p>
+        <p>{{{desc}}}</p>
         {{#list}}
         {{#list}}
         <img class="lazy" data-original="{{img}}" alt="">
         <img class="lazy" data-original="{{img}}" alt="">
         {{/list}}
         {{/list}}