Merge branch 'release/5.0.0'

@@ -44,12 +44,6 @@ const channelMap = dataMap.channel;
 
 const sortMap = dataMap.sort;
 
-const webSearchAsync = data => {
-    return api.get('', Object.assign({
-        method: 'web.search.newshelve'
-    }, data), {cache: true});
-};
-
 /**
  * 获取带小图的banner
  * @param {[Object]} data 原始数据
@@ -330,7 +324,7 @@ const _getGirlsSingleHot = (args, type) => {
         return;
     }
 
-    return webSearchAsync({
+    return searchApi.getProductList({
         client_type: 'web',
         query: skns,
         order: 'shelve_time:desc',
@@ -810,7 +804,9 @@ const getNewArrival = channel => {
     _.forEach(sortList, (item) => {
         let data = Object.assign(item, params, {limit: item.viewNum});
 
-        rel.push(webSearchAsync(data));
+        rel.push(api.get('', Object.assign({
+            method: 'web.search.newshelve'
+        }, data), {cache: true}));
     });
 
     return Promise.all(rel).then(res => {

@@ -31,15 +31,18 @@ class DetailAction extends YohoAction {
             req.cookies._browseskn,
             this.response
         );
+        let vipLevel = detailHelper.vipLevel(req.user.vip);
+        let uid = req.user.uid || 0;
+        let isStudent = req.user.isStudent || 0;
 
         return service.showMainAsync({
             pid: pid,
             gid: gid,
             channel: this.getSessionChannel(),
             gender: this.guessUserGender(),
-            uid: null,
-            isStudent: null,
-            vipLevel: null,
+            uid: uid,
+            isStudent: isStudent,
+            vipLevel: vipLevel,
             saveInCookies: saveCurrentGoodsInCookies
         }).then(result=> {
             const seo = result.seo;

@@ -1234,7 +1234,7 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
 
         statGoodsInfo.uid = uid;
         statGoodsInfo.skn = propOrigin('product_skn');
-        statGoodsInfo.productId = propOrigin('id');
+        statGoodsInfo.productId = propOrigin('product_id');
         statGoodsInfo.productName = result.name.replace('\'', '’');
         statGoodsInfo.brandName = (result.brandName || '').replace('\'', '’');
         statGoodsInfo.marketPrice = result.marketPrice;
@@ -1258,8 +1258,9 @@ const _detailDataPkg = (origin, uid, vipLevel) => {
             }
         }
 
-        statGoodsInfo.imageUrl = result.img;
-        statGoodsInfo.productUrl = helpers.urlFormat(url.parse(propOrigin('product_url')).pathname, null, 'item');
+        statGoodsInfo.imageUrl = 'http:' + result.img.split('?')[0];
+        statGoodsInfo.productUrl = 'http:' +
+            helpers.urlFormat(url.parse(propOrigin('product_url')).pathname, null, 'item');
         statGoodsInfo.smallSortId = result.smallSortId;
         statGoodsInfo.soldOut = soldOut ? 1 : 0;
 

@@ -414,7 +414,7 @@ const getShopAbout = (shopId, uid, channel) => {
                 shopId: shopId,
                 shopHome: `/?shopId=${shopId}`,
                 shopIntro: `/about?shopId=${shopId}`,
-                coled: _.get(result, '[1].is_favorite', 'N') === 'Y'
+                coled: _.get(result, '[2].data.is_favorite', 'N') === 'Y'
             });
             _.set(resData, 'brand.shopBanner', decorator.shopTopBannerBase);
             _.unset(resData, 'brand.brandBanner');
@@ -809,12 +809,21 @@ const getBaseShopData = (params, extra, channel, shopId) => {
                 shopId: shopId,
                 shopHome: `/?shopId=${shopId}`,
                 shopIntro: `/about?shopId=${shopId}`,
-                coled: _.get(result, '[2].is_favorite', 'N') === 'Y'
+                coled: _.get(result[2], 'data.is_favorite', 'N') === 'Y'
             });
             _.set(resData, 'brand.shopBanner', decorator.shopTopBannerBase);
             _.unset(resData, 'brand.brandBanner');
         }
 
+        if (result[2].code === 200) {
+            let shopName = _.get(result[2], 'data.shop_name', '');
+
+            _.set(resData, 'brand.pathNav[2]', {
+                name: shopName,
+                pathTitle: shopName
+            });
+        }
+
         return resData;
     });
 };