shop-fav-bug

@@ -63,8 +63,14 @@ const _baseShop = (req, res, shopInfo, shopId) => {
  * 基础模板收藏
  */
 const baseShopFav = (req, res) => {
+    let allowOrigin = _.get(req, 'headers.origin', null) ?
+        req.headers.origin : req.protocol + '://' + req.headers.host;
+
+    res.setHeader('Access-Control-Allow-Origin', allowOrigin);
+    res.setHeader('Access-Control-Allow-Credentials', 'true');
+
     let isApp = req.query.app_version || req.query.appVersion || false;
-    let uid = isApp ? req.query.uid : req.user.uid;
+    let uid = req.user.uid || req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
     let shopId = req.query.shopId;
 
     listModel.getShopData(req, shopId, uid, isApp).then(result => {
@@ -116,7 +122,7 @@ const _shop = (req, res, shopId) => {
         } else {
             listModel.searchProductBySkn(result.hotListproductSkn).then(hotList => {
                 result = _.assign(result, pageHeader, {
-                    hotList: productProcess.processProductList(hotList)
+                    hotList: productProcess.processProductList(hotList, {isApp: isApp})
                 });
 
                 _.forEach(result.hotList, (value, key) => {
@@ -148,6 +154,12 @@ const _shop = (req, res, shopId) => {
  * app设置cookie
  */
 const shopAppCookie = (req, res) => {
+    let allowOrigin = _.get(req, 'headers.origin', null) ?
+        req.headers.origin : req.protocol + '://' + req.headers.host;
+
+    res.setHeader('Access-Control-Allow-Origin', allowOrigin);
+    res.setHeader('Access-Control-Allow-Credentials', 'true');
+
     let uid = req.query.uid;
 
     req.session.appUid = uid;
@@ -165,8 +177,14 @@ const shopAppCookie = (req, res) => {
  * 前端请求判断shop是否收藏
  */
 const shopFav = (req, res) => {
+    let allowOrigin = _.get(req, 'headers.origin', null) ?
+        req.headers.origin : req.protocol + '://' + req.headers.host;
+
+    res.setHeader('Access-Control-Allow-Origin', allowOrigin);
+    res.setHeader('Access-Control-Allow-Credentials', 'true');
+
     let isApp = req.query.app_version || req.query.appVersion || false;
-    let uid = isApp ? req.query.uid : req.user.uid;
+    let uid = req.user.uid ||  req.query.uid || req.cookies.appUid || _getUidFromUserAgent(req);
     let shopId = req.query.shopId;
 
     listModel.getShopFav(req, shopId, uid, isApp).then(result => {
@@ -352,18 +370,8 @@ const favoriteBrand = (req, res, next) => {
     if (req.headers.referer) {
         let refererSplit = _.split(req.headers.referer, '?');
 
-        let shopIdSplit = _.split(refererSplit[1], '&');
-        let shopId = '';
-
-        _.forEach(shopIdSplit, value => {
-            if (_.startsWith(value, 'shop_id')) {
-                shopId = value;
-                return;
-            }
-        });
-
-        if (shopId) {
-            refer = refererSplit[0] + '?' + shopId;
+        if (id) {
+            refer = refererSplit[0] + '?shop_id=' + id;
         }
     }
 
@@ -376,7 +384,7 @@ const favoriteBrand = (req, res, next) => {
             uid = _getUidFromUserAgent(req);
         }
 
-        url = `${refer}&openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"${refer}","param":{}},"requesturl":{"param":{},"url":""},"priority":"Y"}}`; // eslint-disable-line
+        url = `${refer}&openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"${refer}","param":{}},"requesturl":{"param":{"method":"app.favorite.add","id":"${id}","fav_id":"${id}","type":"shop"},"url":"${_.get(global, 'yoho.API.ApiUrl', '')}"},"priority":"Y"}}`; // eslint-disable-line
     }
 
     if (!id) {

@@ -105,6 +105,9 @@ const _getShopDecorator = (shopId) => {
  * @return array
  */
 const _getShopInfo = (shopId, uid) => {
+    if (uid === 'undefined') {
+        uid = 0;
+    }
     return api.get('', {
         method: 'app.shops.getIntro',
         shop_id: shopId,
@@ -528,7 +531,7 @@ const getShopData = (req, shopId, uid, isApp) => {
 
             if (result[1]) {
                 shopFilterSearchData.filter = productProcess.processFilter(result[1].filter || []);
-                shopFilterSearchData.goods = productProcess.processProductList(result[1].product_list || []);
+                shopFilterSearchData.goods = productProcess.processProductList(result[1].product_list || [], {isApp: isApp});
             }
 
             /* 店鋪優惠券 */