Merge remote-tracking branch 'remotes/origin/hotfix/2770'

@@ -133,6 +133,8 @@ const _getTagsDataByProductInfo = (data) => {
                     case 'yearEnd':// 年终大促
                     case 'yearEnd':// 年终大促
                         tags.isYearEndPromotion = true;
                         tags.isYearEndPromotion = true;
                         break;
                         break;
+                    default:
+                        break;
                 }
                 }
             }
             }
         );
         );
@@ -372,19 +374,19 @@ const _getSkuDataByProductBaseInfo = (data) => {
                 goodsGroup.size.push({
                 goodsGroup.size.push({
                     name: size.sizeName,
                     name: size.sizeName,
                     sku: size.goodsSizeSkuId,
                     sku: size.goodsSizeSkuId,
-                    num: parseInt(size.goodsSizeStorageNum),
+                    num: parseInt(size.goodsSizeStorageNum, 10),
                     goodsId: size.goodsId
                     goodsId: size.goodsId
                 });
                 });
 
 
                 // 单个sku商品的总数
                 // 单个sku商品的总数
-                goodsGroup.total += parseInt(size.goodsSizeStorageNum);
+                goodsGroup.total += parseInt(size.goodsSizeStorageNum, 10);
 
 
                 if (goodsGroup.total > 0 && !chooseSkuFlag) { // 默认选中该sku商品
                 if (goodsGroup.total > 0 && !chooseSkuFlag) { // 默认选中该sku商品
                     goodsGroup.focus = true;
                     goodsGroup.focus = true;
                     chooseSkuFlag = true;// 选中sku商品
                     chooseSkuFlag = true;// 选中sku商品
                 }
                 }
 
 
-                totalStorageNum += parseInt(size.goodsSizeStorageNum);
+                totalStorageNum += parseInt(size.goodsSizeStorageNum, 10);
 
 
             });
             });
 
 
@@ -488,6 +490,9 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
             if (uid) { // 限购码失效
             if (uid) { // 限购码失效
                 result.getLimitedCodeDis = true;
                 result.getLimitedCodeDis = true;
             }
             }
+            break;
+        default:
+            break;
     }
     }
 
 
 
 
@@ -646,7 +651,7 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
             let showStatus = 1;
             let showStatus = 1;
 
 
             if (origin.showStatus) {
             if (origin.showStatus) {
-                showStatus = parseInt(origin.showStatus);
+                showStatus = parseInt(origin.showStatus, 10);
             }
             }
 
 
             let fashTopGoods = _getFashionTopGoodsStatus(uid, showStatus, isBeginSale);
             let fashTopGoods = _getFashionTopGoodsStatus(uid, showStatus, isBeginSale);
@@ -731,7 +736,7 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
             let domainBrand = yield brandService.getBrandByDomainAsync(banner.brandDomain);
             let domainBrand = yield brandService.getBrandByDomainAsync(banner.brandDomain);
 
 
             if (domainBrand.type && domainBrand.shopId) {
             if (domainBrand.type && domainBrand.shopId) {
-                switch (parseInt(domainBrand.type)) {
+                switch (parseInt(domainBrand.type, 10)) {
                     case 1:
                     case 1:
                         {
                         {
                         // 多品店不显示
                         // 多品店不显示
@@ -746,6 +751,8 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
                             banner.bgImg = basisData.shopTopBanner.banner || banner.bgImg;
                             banner.bgImg = basisData.shopTopBanner.banner || banner.bgImg;
                             break;
                             break;
                         }
                         }
+                    default:
+                        break;
 
 
                 }
                 }
             }
             }
@@ -754,7 +761,7 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
         statGoodsInfo.imageUrl = result.img;
         statGoodsInfo.imageUrl = result.img;
         statGoodsInfo.productUrl = result.weixinUrl;
         statGoodsInfo.productUrl = result.weixinUrl;
         statGoodsInfo.smallSortId = result.smallSortId;
         statGoodsInfo.smallSortId = result.smallSortId;
-        statGoodsInfo.soldOut = parseInt(soldOut);
+        statGoodsInfo.soldOut = parseInt(soldOut, 10);
 
 
         return {
         return {
             goodsInfo: result,
             goodsInfo: result,
@@ -1329,7 +1336,7 @@ const showMainAsync = data => {
 
 
         let requestData = yield Promise.all([
         let requestData = yield Promise.all([
             _getSortNavAsync(productInfo.goodsInfo.smallSortId, data.gender),
             _getSortNavAsync(productInfo.goodsInfo.smallSortId, data.gender),
-            HeaderModel.requestHeaderData()
+            HeaderModel.requestHeaderData(data.channel)
         ]);
         ]);
 
 
         // 获取商品尺寸相关
         // 获取商品尺寸相关