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

@@ -162,10 +162,11 @@
     .measurement-method {
         .detail {
             width: 100%;
+            margin-top:0;
+            margin-bottom: 0;
             img {
                 width: 100%;
-                margin-top: pxToRem(18px);
-                margin-right: pxToRem(28px);
+                height:auto;
             }
         }
     }

@@ -172,7 +172,7 @@
 {{!-- 商品详情咨询 --}}
 {{#if goodsConsultsPage}}
 <script>
-    seajs.use('js/product/detail/loadmore');
+    seajs.use('js/product/detail/comments-consults');
 </script>
 {{/if}}
         {{!-- 商品详情我要咨询 --}}

@@ -6,7 +6,7 @@
         <span class="en-title">{{enTitle}}</span>
     </h1>
     {{#detail}}
-    <div class="detail table clearfix">
+    <div class="detail table">
             {{#list}}
             <div class="column">{{param}}</div>
             {{/list}}

@@ -302,8 +302,8 @@ class UserModel
                 foreach ($data as &$val) {
 	                $val['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
                     $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
-                    $val['sales_price'] = !empty($val['sales_price']) ? $val['sales_price'] . '.00' : 0;
-                    $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
+                    $val['sales_price'] = (!empty($val['sales_price']) && !is_float($val['sales_price'])) ? $val['sales_price'] . '.00' : 0;
+                    $val['market_price'] = (($val['market_price'] - $val['sales_price'] > 0) && !is_float($val['market_price'])) ? $val['market_price'] . '.00' : false;
                 }
                 !empty($data) && $result['browseRecord'] = $data;
             }