Merge branch 'feature/oneset' into release/5.3.1

@@ -31,10 +31,13 @@ const detail = (params) => {
     }
 
     return getBundleBySkn(params.skn).then(result => {
+        let discountPrice = (_.get(result, 'data.bundleInfo.salesPrice', 0) -
+        _.get(result, 'data.bundleInfo.discountPrice', 0));
+        let priceShow = _.split(discountPrice + '', '.')[0];
+
         return {
             bundleInfo: Object.assign(_.get(result, 'data.bundleInfo', {}), {
-                discount: parseInt(_.get(result, 'data.bundleInfo.salesPrice', 0), 10) -
-                    parseInt(_.get(result, 'data.bundleInfo.discountPrice', 0), 10)
+                discount: priceShow
             }),
             productList: productProcess.processProductList(_.get(result, 'data.productList', []))
         };

@@ -225,7 +225,7 @@ const tool = {
         return {
             title: '优惠套装',
             href: helpers.urlFormat('/product/bundle/detail', {skn: skn}),
-            description: '立省￥' + priceShow,
+            description: '立省¥' + priceShow,
             productList: productProcess.processProductList(bundleData && bundleData.productList)
         };
     },

@@ -8,7 +8,7 @@
                     data-skn="{{product_skn}}">请选择商品属性 <i
                         class="iconfont">&#xe616;
                 </i></span></p>
-                <p><span class="price">￥{{market_price}}</span></p>
+                <p><span class="price">{{format_sales_price}}</span></p>
             </div>
         </div>
     {{/ productList}}
@@ -18,7 +18,7 @@
     <div class="bundle-bar clearfix">
         <div class="bundle-bar-md">
             <div class="bundle-price">
-                <span class="bundle-discount">立省￥{{discount}}</span>
+                <span class="bundle-discount">立省¥{{discount}}</span>
                 <span>套餐价：￥{{discountPrice}}</span>
             </div>
             <div class="sale-price">销售价：￥{{salesPrice}}</div>

@@ -15,7 +15,7 @@
                 <div class="swiper-slide plus plus-{{@index}}"><span class="iconfont">&#xe624;</span></div>
                 <div class="swiper-slide product-box">
                     <a href="{{@root.bundleData.href}}"><img src="{{image default_images 155 206}}" alt="{{product_name}}"></a>
-                    <div class="bundle-price">￥{{sales_price}}</div>
+                    <div class="bundle-price">{{format_sales_price}}</div>
                 </div>
             {{/ productList}}
         </div>