Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

@@ -12,9 +12,11 @@
                             <a href="{{url}}" target="_blank">
                             <a href="{{url}}" target="_blank">
                                 {{productName}}
                                 {{productName}}
                                 <p class="price">
                                 <p class="price">
-                                    <span class="sale-price">{{salesPrice}}</span>
-                                    <span class="market-price">{{marketPrice}}</span>
+                                    <span class="sale-price">¥{{round salesPrice 2}}</span>
+                                    {{#if marketPrice}}
+                                        <span class="market-price">¥{{round marketPrice 2}}</span>
                                         <label class="discount">{{discount}}折</label>
                                         <label class="discount">{{discount}}折</label>
+                                    {{/if}}
                                 </p>
                                 </p>
                             </a>
                             </a>
                         </div>
                         </div>

@@ -17,8 +17,10 @@
                     <div class="detail-text">
                     <div class="detail-text">
                         <a class="name" href="{{url}}" target="_blank">{{productName}}</a>
                         <a class="name" href="{{url}}" target="_blank">{{productName}}</a>
                         <p>
                         <p>
-                            <span class="price">¥{{salesPrice}}</span>
-                            <label class="discount">{{discount}}折</label>
+                            <span class="price">¥{{round salesPrice 2}}</span>
+                            {{# discount}}
+                                <label class="discount">{{.}}折</label>
+                            {{/ discount}}
                         </p>
                         </p>
                     </div>
                     </div>
                 </div>
                 </div>

@@ -56,10 +56,10 @@
         {{/if}}
         {{/if}}
         <p class="price">
         <p class="price">
             {{# marketPrice}}
             {{# marketPrice}}
-                <span class="market-price">¥{{.}}</span>
+                <span class="market-price">¥{{round . 2}}</span>
             {{/ marketPrice}}
             {{/ marketPrice}}
             <span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
             <span class="sale-price{{#unless marketPrice}}prime-cost{{/unless}}">
-                ¥{{salesPrice}}
+                ¥{{round salesPrice 2}}
             </span>
             </span>
 
 
             {{# discount}}
             {{# discount}}

@@ -93,6 +93,18 @@ exports.upperCase = (str) => {
 };
 };
 
 
 /**
 /**
+ * 四舍五入
+ * @param  {[type]} num 数字
+ * @param  {[type]} precision 精度
+ * @return {[type]}
+ */
+exports.round = (num, precision) => {
+    precision = _.isNumber(precision) ? precision : 2;
+    num = _.isInteger(num) ? (+num).toFixed(precision) : _.round(num, precision);
+    return num;
+};
+
+/**
  * 时间格式化
  * 时间格式化
  * @param format 格式化token @see{http://momentjs.cn/docs/#/displaying/format/}
  * @param format 格式化token @see{http://momentjs.cn/docs/#/displaying/format/}
  * @param date 日期或者数字
  * @param date 日期或者数字

@@ -92,23 +92,6 @@ exports.processProductList = (list, options) => {
             thumb: product.defaultImages
             thumb: product.defaultImages
         });
         });
 
 
-        if (options.showPoint) {
-            product.marketPrice += '.00';
-            product.salesPrice += '.00';
-
-            if (product.vip1Price) {
-                product.vip1Price = parseInt(product.vip1Price, 10) + '.00';
-            }
-
-            if (product.vip2Price) {
-                product.vip2Price = parseInt(product.vip2Price, 10) + '.00';
-            }
-
-            if (product.vip3Price) {
-                product.vip3Price = parseInt(product.vip3Price, 10) + '.00';
-            }
-        }
-
         product.isSoonSoldOut = product.isSoonSoldOut === 'Y';
         product.isSoonSoldOut = product.isSoonSoldOut === 'Y';
         product.url = helpers.urlFormat(`/product/pro_${product.productId}_${product.goodsList[0].goodsId}/${product.cnAlphabet}.html`); // eslint-disable-line
         product.url = helpers.urlFormat(`/product/pro_${product.productId}_${product.goodsList[0].goodsId}/${product.cnAlphabet}.html`); // eslint-disable-line