Merge branch 'master' into feature/docker

@@ -56,7 +56,7 @@ function droitHtml(contents) {
                     {title: '特权介绍', data: ['金卡及以上会员享受限定次数的免费送达服务。']},
                     {title: '使用说明', data: [
                         '金卡会员每月可享3次普通快递免邮，白金会员每月可享5次顺丰快递免邮（顺丰无法触达地区将改发其他快递）。',
-                        '免邮次数每月一日更新，会员等级升级时，免邮次数当天更新。', '金卡会员可消耗一次免邮次数将已达到免邮门槛的普通快递订单升级至顺丰快递。']},
+                        '免邮次数每月一日更新，会员等级升级时，免邮次数当天更新。']},
                 ],
                 interlocution: []
             };

 {
   "name": "yohobuywap-node",
-  "version": "6.5.34",
+  "version": "6.5.35",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -21,6 +21,7 @@ let $useCoupon = $('#useCoupon');
 let $notUseCoupon = $('#notUseCoupon');
 
 let winH = $(window).height();
+let linkUrl = document.referrer;
 
 require('common');
 require('cart/cartbuynow/select-coupon');
@@ -40,7 +41,11 @@ function fixedLayOut() {
 }
 
 function goToBack() {
+    if (linkUrl) {
+        window.location.href = linkUrl;
+    } else {
         history.go(-1);
+    }
 }
 
 /**

@@ -20,6 +20,7 @@ let $useCoupon = $('#useCoupon');
 let $notUseCoupon = $('#notUseCoupon');
 
 let winH = $(window).height();
+let linkUrl = document.referrer;
 
 require('common');
 require('cart/cartbuynow/select-coupon');
@@ -39,7 +40,11 @@ function fixedLayOut() {
 }
 
 function goToBack() {
+    if (linkUrl) {
+        window.location.href = linkUrl;
+    } else {
         history.go(-1);
+    }
 }
 
 /**
@@ -88,6 +93,7 @@ $useCoupon.on('click', function() {
     }
 
     orderInfo('couponCode', couponCodeArray.join(','));
+
     if (couponCodeArray.length > 0) {
         goToBack();
     } else {