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

@@ -85,6 +85,7 @@ class NewSaleProcess
             foreach ($products['product_list'] as $key => $single) {
             foreach ($products['product_list'] as $key => $single) {
                 $one = Helpers::formatProduct($single, true, false, false, 75, 114);
                 $one = Helpers::formatProduct($single, true, false, false, 75, 114);
 	            $one['rank'] = $limit * ($page -1) + $key + 1;
 	            $one['rank'] = $limit * ($page -1) + $key + 1;
+	            !empty($single['sales_phrase']) && $one['sales_phrase'] = $single['sales_phrase'];
 
 
 	            $result['goods'][] = $one;
 	            $result['goods'][] = $one;
             }
             }

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

@@ -25,7 +25,13 @@
                             {{# active}}
                             {{# active}}
                                 <p>{{.}}</p>
                                 <p>{{.}}</p>
                             {{/ active}}
                             {{/ active}}
-                            <p>{{salePrice}}<b>{{price}}</b></p>
+	                        {{#sales_phrase}}
+	                        <p>{{.}}</p>
+	                        {{/sales_phrase}}
+                            <p>
+	                            {{#salePrice}}¥{{.}}{{/salePrice}}{{#price}}
+	                            <b>¥{{.}}</b>{{/price}}
+                            </p>
                         </div>
                         </div>
                      </a>
                      </a>
                  </li>
                  </li>

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

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

@@ -51,7 +51,19 @@ class UserModel
      */
      */
     public static function getInfoNumData($uid, $udid)
     public static function getInfoNumData($uid, $udid)
     {
     {
-        $result = array();
+        $result = array(
+	        'wait_pay_num' => 0,
+	        'wait_cargo_num' => 0,
+	        'send_cargo_num' => 0,
+	        'brand_favorite_total' => 0,
+	        'product_favorite_total' => 0,
+	        'inbox_total' => 0,
+	        'comment_total' => 0,
+	        'refund_exchange_num' => 0,
+	        'yoho_coin_num' => 0,
+	        'coupon_num' => 0,
+	        'product_browse' => 0
+        );
 
 
         // 调用接口获取个人中心页面优惠券，收藏的商品等的数目数据
         // 调用接口获取个人中心页面优惠券，收藏的商品等的数目数据
         $infoNumData = UserData::infoNum($uid, $udid);
         $infoNumData = UserData::infoNum($uid, $udid);
@@ -302,7 +314,7 @@ class UserModel
                 foreach ($data as &$val) {
                 foreach ($data as &$val) {
 	                $val['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
 	                $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['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
-                    $val['sales_price'] = !empty($val['sales_price']) ? $val['sales_price'] . '.00' : 0;
+                    $val['sales_price'] = (!empty($val['sales_price']) && !is_float($val['sales_price'])) ? $val['sales_price'] . '.00' : $val['sales_price'];
                     $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
                     $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
                 }
                 }
                 !empty($data) && $result['browseRecord'] = $data;
                 !empty($data) && $result['browseRecord'] = $data;