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

@@ -223,7 +223,7 @@ exports.orderSub = (req, res, next) => {
                 unionKey = testQyhUnion.client_id ? encryData : '';
             }
         } else {
-            unionKey = '{"client_id":' + req.cookies.mkt_code + '}';
+            unionKey = '{"client_id":' + req.cookies.mkt_code + (req.cookies.union_data ? ',"union_data":' + req.cookies.union_data : '') + '}';
         }
 
         /* 检查联盟参数是否有效 */

@@ -38,6 +38,7 @@ const index = (req, res, next) => {
             pageHeader: headerModel.setNav({
                 navTitle: ''
             }),
+            localCss: true,
             categoryTab: isCate,
             channel: result.channel ? result.channel : '',
             brandList: result.brandList,
@@ -63,6 +64,7 @@ const brandList = (req, res, next) => {
     brandModel.brandListData(code, gender).then(result => {
         res.render('brand/brand-list', {
             layout: false,
+            localCss: true,
             brandList: result.brandList
         });
     }).catch(next);

@@ -20,7 +20,7 @@
             </div>
         </div>
         {{/if}}
-        <button class="btn-edit">编辑</button>
+        <button class="btn-edit"></button>
     </div>
    
     {{#if ordinaryCart}}

+require('guang/brand-cate/brand-list.page.css');
+
 var $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper2');
 

@@ -45,6 +45,7 @@
     }
 
     .cart-nav {
+        position: relative;
         color: #c6c6c6;
         border-bottom: 1PX solid #e0e0e0;
         background: #fff;
@@ -76,6 +77,10 @@
         }
 
         .btn-edit {
+            &:before {
+                content: "编辑";
+            }
+
             display: none;
             width: 100px;
             height: 60px;
@@ -86,6 +91,7 @@
             top: 24px;
             right: 30px;
             font-size: 30px;
+            padding: 0;
         }
 
         span {
@@ -332,10 +338,12 @@
 }
 
 .main-wrap.edit {
-    .nav-btn {
-        &:before {
-            content: "完成";
-        }
+    .nav-btn:before {
+        content: "完成";
+    }
+
+    .btn-edit:before {
+        content: "完成";
     }
 
     .all-gift-box {

+@import "index";
+@import "../../layout/swiper";