Merge branch 'release/6.0' of git.yoho.cn:fe/yohobuywap-node into release/6.0

@@ -25,7 +25,12 @@
         </p>
         </p>
 
 
         {{#if isLimitSkn}}
         {{#if isLimitSkn}}
-        <p class="limit">不支持7天无理由退换货</p>
+            {{#isEqualOr notSevenExchange 'LRE'}}
+            <p class="limit">不支持7天无理由退换货</p>
+            {{/isEqualOr}}
+            {{#isEqualOr notSevenExchange 'L15DE'}}
+            <p class="limit"><i class="iconfont no-support-reason">&#xe699;</i>不支持15天无理由换货</p>
+            {{/isEqualOr}}
         {{/if}}
         {{/if}}
         <p class="row price-wrap">
         <p class="row price-wrap">
             {{!-- {{#if isVipPrice}}
             {{!-- {{#if isVipPrice}}

@@ -12,7 +12,8 @@ const qs = require('yoho-qs');
 let tip = require('plugin/tip'),
 let tip = require('plugin/tip'),
     loading = require('plugin/loading'),
     loading = require('plugin/loading'),
     order = require('./order-info'),
     order = require('./order-info'),
-    richTip = require('plugin/rich-tip');
+    richTip = require('plugin/rich-tip'),
+    dialog = require('plugin/dialog');
 
 
 let $invoice = $('.invoice'),
 let $invoice = $('.invoice'),
     $couponUse = $('.coupon-use.used'),
     $couponUse = $('.coupon-use.used'),
@@ -516,3 +517,13 @@ $(window).scroll(function() {
         $('.address-bottom').hide();
         $('.address-bottom').hide();
     }
     }
 });
 });
+
+// 商品是否支持退换货原因弹框
+$('.no-support-reason').click(function() {
+    dialog.showDialog({
+        dialogText: '该商品支持7天无理由退换，不支持7天以上15天内的无理由换货，如有疑问，请联系客服',
+        hasFooter: {
+            centerBtnText: '我知道了'
+        }
+    });
+});

@@ -11,7 +11,8 @@ let $ = require('yoho-jquery'),
 let tip = require('plugin/tip'),
 let tip = require('plugin/tip'),
     loading = require('plugin/loading'),
     loading = require('plugin/loading'),
     order = require('./order-info'),
     order = require('./order-info'),
-    richTip = require('plugin/rich-tip');
+    richTip = require('plugin/rich-tip'),
+    dialog = require('plugin/dialog');
 
 
 let $invoice = $('.invoice'),
 let $invoice = $('.invoice'),
     $couponUse = $('.coupon-use.used'),
     $couponUse = $('.coupon-use.used'),
@@ -529,3 +530,13 @@ $(window).scroll(function() {
         $('.address-bottom').hide();
         $('.address-bottom').hide();
     }
     }
 });
 });
+
+// 商品是否支持退换货原因弹框
+$('.no-support-reason').click(function() {
+    dialog.showDialog({
+        dialogText: '该商品支持7天无理由退换，不支持7天以上15天内的无理由换货，如有疑问，请联系客服',
+        hasFooter: {
+            centerBtnText: '我知道了'
+        }
+    });
+});

@@ -456,6 +456,15 @@
             display: block !important;
             display: block !important;
         }
         }
 
 
+        .limit {
+            color: #b6b6b6;
+            font-size: 80%;
+        }
+
+        .no-support-reason {
+            margin-right: 8px;
+        }
+
         .price-wrap {
         .price-wrap {
             position: absolute;
             position: absolute;
             top: 20px;
             top: 20px;

@@ -12,6 +12,11 @@
                 background: resolve("product/not-support-exchange.png") no-repeat;
                 background: resolve("product/not-support-exchange.png") no-repeat;
                 background-size: 100%;
                 background-size: 100%;
             }
             }
+
+            &.surpass-not-support {
+                background: resolve("product/surpass-not-support.png") no-repeat;
+                background-size: 100%;
+            }
         }
         }
 
 
         .detail {
         .detail {

@@ -195,6 +195,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
             obj.count = good.buy_number;
             obj.count = good.buy_number;
             obj.price = good.sales_price;
             obj.price = good.sales_price;
             obj.isLimitSkn = good.is_limit_skn === 'Y';
             obj.isLimitSkn = good.is_limit_skn === 'Y';
+            obj.notSevenExchange = _.get(good, 'tags[0]', '');
 
 
             if (good.goods_type === 'gift') {
             if (good.goods_type === 'gift') {
                 obj.gift = true;
                 obj.gift = true;