Merge branch 'feature/cart' into 'release/5.4.1'

Feature/cart



See merge request !275

@@ -30,6 +30,7 @@ const index = (req, res) => {
         width750: true,
         width750: true,
         pageHeader: headerModel.setNav({
         pageHeader: headerModel.setNav({
             navTitle: '购物车',
             navTitle: '购物车',
+            backUrl: 'javascript:;',
             navBack: true,
             navBack: true,
             suggestSub: {
             suggestSub: {
                 text: ' '
                 text: ' '

@@ -21,8 +21,12 @@ let indexObj = {
     init() {
     init() {
         let self = this;
         let self = this;
 
 
+        self.setCartReferrer();
         $('.nav-btn').on('click', () => {
         $('.nav-btn').on('click', () => {
-            self.navClick();
+            self.navBtnClick();
+        });
+        $('.nav-back').on('click', () => {
+            self.navBackClick();
         });
         });
         let promise = self.refreshPage();
         let promise = self.refreshPage();
 
 
@@ -32,7 +36,16 @@ let indexObj = {
             });
             });
         }
         }
     },
     },
-    navClick() {
+    setCartReferrer() {
+        let referrer = document.referrer || window.queryString.referrer || '';
+        let localUrl = window.location.href.replace(/\/?\?.*$/, '').replace(/https?:\/\//, '');
+        let referrerPath = referrer.replace(/\/?\?.*$/, '').replace(/https?:\/\//, '');
+
+        if (referrer && localUrl !== referrerPath && referrer.indexOf('orderEnsure') === -1 && referrer.indexOf('/gift') === -1 && referrer.indexOf('/advanceBuy') === -1 && referrer.indexOf('/product/index/index?promotion_id=') === -1) {
+            cookie.set('_cartReferrer', referrer);
+        }
+    },
+    navBtnClick() {
         let self = this;
         let self = this;
 
 
         $('.main-wrap').toggleClass('edit');
         $('.main-wrap').toggleClass('edit');
@@ -43,6 +56,16 @@ let indexObj = {
             self.editMode = false;
             self.editMode = false;
         }
         }
     },
     },
+    navBackClick() {
+        let referrer = cookie.get('_cartReferrer');
+
+        if (referrer && referrer !== window.location.href) {
+            cookie.remove('_cartReferrer');
+            window.location.href = referrer;
+        } else {
+            window.location.href = '/?go=1';
+        }
+    },
     getCartData() {
     getCartData() {
         return $.ajax({
         return $.ajax({
             url: '/cart/index/new/data',
             url: '/cart/index/new/data',

@@ -41,6 +41,7 @@ let cartObj = {
         let self = this;
         let self = this;
         let type = $(e.currentTarget).data('type');
         let type = $(e.currentTarget).data('type');
 
 
+        cookie.remove('_cartType');
         cookie.set('_cartType', type);
         cookie.set('_cartType', type);
         self.handle.refreshPage('');
         self.handle.refreshPage('');
     },
     },