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

@@ -138,7 +138,7 @@ $('.maybe-like p').on('touchstart', function(e) {
 });
 
 function scrollHandler() {
-    if ($(window).scrollTop() + winH >= $(document).height() - 50) {
+    if ($(window).scrollTop() + winH >= $(document).height() - 200) {
         search();
     }
 }

@@ -380,7 +380,6 @@ class DetailModel
                         'desc' => strtr($productIntro, array(
                             '\r\n\t' => '',
                             '</p>' => '',
-                            '<br />' => "\r\n",
                             '<img src=' => "<img class=\"lazy\" src=\"data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==\" data-original=",
                         )),
                     );