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

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

@@ -12,9 +12,7 @@ let $ = require('yoho-jquery'),
     lazyload = require('yoho-jquery-lazyload'),
     lazyload = require('yoho-jquery-lazyload'),
     tip = require('plugin/tip');
     tip = require('plugin/tip');
 
 
-loading.init($(document.body), {
-    className: 'loading-mask-opactiy'
-});
+loading.init($(document.body));
 
 
 let seckillObj = {};
 let seckillObj = {};
 
 
@@ -248,7 +246,7 @@ seckillObj = {
             '/product/seckill/get-product-list?app_version=1' :
             '/product/seckill/get-product-list?app_version=1' :
             '/product/seckill/get-product-list';
             '/product/seckill/get-product-list';
 
 
-        loading.show();
+        loading.showLoading();
         self.el.$navList.toggleClass('fix-top', false);
         self.el.$navList.toggleClass('fix-top', false);
         $.ajax({
         $.ajax({
             url: url,
             url: url,
@@ -269,7 +267,7 @@ seckillObj = {
             }
             }
         })
         })
         .always(function() {
         .always(function() {
-            loading.hide();
+            loading.hideLoading();
         });
         });
     },
     },