Merge branch 'release/5.6' into gray

@@ -321,11 +321,11 @@ const getShopList = params => {
             }
             }
 
 
             // 店铺／品牌的小分类
             // 店铺／品牌的小分类
-            _.forEach(value.sort, sortInfo => {
+            _.forEach(_.get(value, 'sortInfo.sort', []), sortInfo => {
                 _.forEach(_.get(sortInfo, 'sub', []), subSort => {
                 _.forEach(_.get(sortInfo, 'sub', []), subSort => {
                     let sortHref;
                     let sortHref;
 
 
-                    if (value.is_global === 'Y') {
+                    if (value.is_global !== 'Y') {
                         sortHref = helpers.urlFormat('', {misort: subSort.sort_id},
                         sortHref = helpers.urlFormat('', {misort: subSort.sort_id},
                             value.shop_domain || value.brand_domain);
                             value.shop_domain || value.brand_domain);
                     } else {
                     } else {

@@ -1801,13 +1801,6 @@ $('.package-box').on('click', '#buy-detail', function() {
             return $(value).data('id');
             return $(value).data('id');
         });
         });
 
 
-        var option = {  // eslint-disable-line
-            PRD_ID: +$('.main').data('id'),
-            PACKAGE_GOODS: goodIds.join(',')
-        };
-
-        yas.givePoint('YB_GDS_PACKAGE_BUY_NOW_C', option);
-
         if (flag) {
         if (flag) {
 
 
             // 套餐加入购物车埋点
             // 套餐加入购物车埋点

@@ -1005,7 +1005,7 @@
         .icon-note {
         .icon-note {
             display: inline-block;
             display: inline-block;
             background: url("/layout/note.png") no-repeat;
             background: url("/layout/note.png") no-repeat;
-            width: 14px;
+            width: 15px;
             height: 14px;
             height: 14px;
             margin-top: -2px;
             margin-top: -2px;
             margin-right: 5px;
             margin-right: 5px;

@@ -293,8 +293,9 @@
     .swindle-info {
     .swindle-info {
         margin: 10px;
         margin: 10px;
         padding: 10px;
         padding: 10px;
-        font-size: 13px;
+        font-size: 12px;
         background-color: #faf6da;
         background-color: #faf6da;
+        color: #444;
 
 
         span {
         span {
             color: #cd0c25;
             color: #cd0c25;