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() {
 function scrollHandler() {
-    if ($(window).scrollTop() + winH >= $(document).height() - 50) {
+    if ($(window).scrollTop() + winH >= $(document).height() - 200) {
         search();
         search();
     }
     }
 }
 }

@@ -425,6 +425,13 @@ if ($brandHeader.length > 0) {
             success: function(data) {
             success: function(data) {
                 if (data.code === 200) {
                 if (data.code === 200) {
                     $this.toggleClass('coled');
                     $this.toggleClass('coled');
+
+                    //提示
+                    if (opt === 'ok') {
+                        tip.show('添加收藏成功');
+                    } else {
+                        tip.show('取消收藏成功');
+                    }
                 } else if (data.code === 400) {
                 } else if (data.code === 400) {
                     location.href = data.data;//未登录跳转登录页
                     location.href = data.data;//未登录跳转登录页
                 } else {
                 } else {

@@ -204,6 +204,7 @@
         position: absolute;
         position: absolute;
         top: 20rem / $pxConvertRem;
         top: 20rem / $pxConvertRem;
         right: 30rem / $pxConvertRem;
         right: 30rem / $pxConvertRem;
+        text-align: right;
     }
     }
 
 
     .price {
     .price {
@@ -216,4 +217,8 @@
         text-align: right;
         text-align: right;
         line-height: 45rem / $pxConvertRem;
         line-height: 45rem / $pxConvertRem;
     }
     }
+
+    .appear-date {
+        color: #f00;
+    }
 }
 }

-<div class="order-good" data-id={{id}}>
+<div class="order-good" data-id="{{id}}">
     <div class="thumb-wrap">
     <div class="thumb-wrap">
-        <img class="thumb lazy" data-original={{thumb}}>
+        <img class="thumb lazy" data-original="{{thumb}}">
         <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
         <p class="tag{{#if gift}} gift-tag{{/if}}{{#if advanceBuy}} advance-buy-tag{{/if}}"></p>
     </div>
     </div>
     <div class="deps">
     <div class="deps">
@@ -25,6 +25,9 @@
             <span class="count">
             <span class="count">
                 ×{{count}}
                 ×{{count}}
             </span>
             </span>
+            {{#if appearDate}}
+                <span class="appear-date">上市期：{{appearDate}}</span>
+            {{/if}}
         </p>
         </p>
     </div>
     </div>
 </div>
 </div>

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