商品详情接口修改

@@ -255,12 +255,12 @@ const setBrandBanner = (base, brand, shop) => {
     let resData = {},
         banner = {};
 
-    if (base.brand) {
-        let info = base.brand;
+    if (base.brandInfo) {
+        let info = base.brandInfo;
 
         // 基础品牌数据
         banner = {
-            brandId: info.id,
+            brandId: info.brandId,
             bgColor: '#000',
             brandLogo: {
                 link: `/product/shop/${info.brandDomain}`, // 品牌跳转链接
@@ -405,7 +405,7 @@ const setProductData = base => {
                     }
 
                     // 如果status为0，即skc下架时,则库存设为0
-                    if (subValue.status === 0) {
+                    if (base.status === 0 || subValue.status === 0) {
                         size.num = 0;
                     }
 

@@ -56,6 +56,7 @@ const _getMultiResourceByBaseInfo = (base) => {
     }
 
     return Promise.all(promiseData).then(result => {
+
         return {
             sizeInfo: result[0],
             comfort: result[1].data,
@@ -92,11 +93,15 @@ const getProductItemData = (params, url, uid) => {
 
         result = camelCase(result.data);
 
-        // 如果status为0，即商品下架时则返回空对象
-        if (!result.goodsList[0].status) {
-            return resData;
+        if (!result) {
+            return;
         }
 
+        // 如果status为0，即商品下架时则返回空对象
+        //if (!result.status) {
+        //    return resData;
+        //}
+
         if (!result.productName &&
             !result.productSkn &&
             !result.salesPrice &&
@@ -117,7 +122,6 @@ const getProductItemData = (params, url, uid) => {
         }
 
         return _getMultiResourceByBaseInfo(result).then(mulRes => {
-
             Object.assign(data,
                 itemFun.setBrandBanner(result, mulRes.brandBanner, mulRes.shopInfo), // banner
                 itemFun.setPathNav(mulRes.sort, result.productName, params.channel), // 面包屑导航