Merge remote-tracking branch 'origin/release/5.4.1' into gray

@@ -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);

@@ -226,7 +226,7 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
         params.qhy_union = qhyUnion;
     }
 
-    return api.get('', params, {
+    return api.post('', params, {
         headers: {
             'X-Forwarded-For': ip || '',
             'User-Agent': userAgent

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

@@ -60,6 +60,7 @@
             height: 35px;
             box-sizing: content-box;
             flex: 1;
+            position: relative;
         }
 
         .nav-item.active {
@@ -527,6 +528,7 @@
             color: #444;
             font-size: 29px;
             border-radius: 4px;
+            padding: 0px;
         }
     }
 }

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

@@ -28,6 +28,7 @@ const formatPromotionTitle = (promo) => {
     let match = regPromoTitle.exec(promo.promotion_title);
     let promotionTitle = match !== null && match.length > 1 ? match[1] : promo.promotion_title;
 
+    promotionTitle.replace('￥', '¥');
     return `${title}【${promotionTitle}】`;
 };
 const formatPromotionOpt = (promo) => {