plustar

@@ -114,6 +114,7 @@ const favoriteBrand = (req, res, next) => {
 
     // 执行收藏或取消操作
     return brandModel.favoriteBrand(uid, id, opt).then(data => {
+        console.log(data)
         if (!data) {
             res.json({
                 code: 400,
@@ -123,7 +124,7 @@ const favoriteBrand = (req, res, next) => {
         }
         res.json({
             code: 200,
-            message: '成功',
+            message: '收藏成功',
             data: ''
         });
     }).catch(next);

@@ -16,7 +16,7 @@ let channels = {
 };
 
 const getListData = (req, res, next) => {
-    let gender = req.query.gender || req.cookies._Channel && channels[req.cookies._Channel] || 1;
+    let gender = req.query.gender || req.cookies._Channel && channels[req.cookies._Channel] || '1,3';
     let recom = '4';
     let all = '1';
 
@@ -40,8 +40,8 @@ const getListData = (req, res, next) => {
 };
 
 const getDetailData = (req, res, next) => {
-    let id = req.query.id || 342;
-    let uid = req.user.uid || 8039759;
+    let id = req.query.id;
+    let uid = req.user.uid;
     let udid = req.sessionID || 'yoho';
     let gender = req.query.gender || req.cookies._Channel && channels[req.cookies._Channel] || '1,3';
     let isApp = req.query.app_version || req.query.appVersion || false;
@@ -63,7 +63,6 @@ const getDetailData = (req, res, next) => {
             pageHeader: headerModel.setNav({
                 navTitle: result.brandName
             }),
-            pageFooter: true,
             ps: result
         });
     }).catch(next);

@@ -46,8 +46,34 @@ const collectArticle = (uid, id, opt) => {
     }
 };
 
+//品牌收藏
+
+const favoriteBrand = (uid, id, opt) => {
+
+    if (opt === 'ok') {
+        let param = {
+            id: id,
+            uid: uid,
+            type: 'brand'
+        };
+    } else {
+        let param = {
+            fav_id: id,
+            uid: uid,
+            type: 'brand'
+        };
+    }
+    
+
+    if (opt === 'ok') {
+        return api.get('app.favorite.add', param);
+    } else {
+        return api.get('app.favorite.cancel', param);
+    }
+};
 
 module.exports = {
     praiseArticle,
-    collectArticle
+    collectArticle,
+    favoriteBrand
 };

@@ -20,7 +20,7 @@ const formaData = (data, gender) => {
                 let obj = {};
 
                 obj = _.assign(obj, {
-                    url: '/plustar/brandinfo?id=' + val.id + '&gender=' + gender,
+                    url: '/guang/plustar/brandinfo?id=' + val.id + '&gender=' + gender,
                     img: list.src,
                     deps: val.brand_title
                 });
@@ -31,15 +31,13 @@ const formaData = (data, gender) => {
             build.push({
                 imgs: imgs
             });
-
         }
 
-
         // 单张图
         if (val.data[0]) {
             _.forEach(val.data, function(list) {
                 build.push({
-                    url: '/plustar/brandinfo?id=' + val.id + '&gender=' + gender,
+                    url: '/guang/plustar/brandinfo?id=' + val.id + '&gender=' + gender,
                     img: list.src,
                     deps: val.brand_title
                 });
@@ -89,7 +87,7 @@ const getNewProduct = (brandId, gender, url) => {
     }).then((result) => {
 
         if (result && result.code === 200) {
-            // console.log(result.data.product_list)
+            //console.log(result.data.product_list)
             // let naList = [];
             let newArrival = {
                 naList: []
@@ -97,6 +95,8 @@ const getNewProduct = (brandId, gender, url) => {
 
             if (result.data.product_list) {
                 _.forEach(result.data.product_list, function(list, index) {
+                    let obj = {};
+                    let price
                     // console.log(list)
                     if (index <= 5) {
                         let tag = [];
@@ -129,14 +129,14 @@ const getNewProduct = (brandId, gender, url) => {
                         });
 
                         if (list.market_price && list.market_price !== false) {
-                            newArrival.naList.push({
-                                price: list.market_price + '.00'
-                            });
+                                price = list.market_price + '.00'
+                                console.log(price)
                         }
+                        console.log(price)
 
                         newArrival.moreUrl = url;
 
-                        newArrival.naList.push({
+                        obj = _.assign(obj, {
                             id: list.product_skn,
                             product_id: list.product_id,
                             thumb: helpers.image(list.default_images, 235, 314),
@@ -148,12 +148,21 @@ const getNewProduct = (brandId, gender, url) => {
                             url: '/product/pro_' + list.product_id + '_' +
                                 list.goods_list[0].goods_id + '/' + list.cn_alphabet + '.html',
                             tags: tag
-                        });
+                        })
+
+                        if (price) {
+                            obj = _.assign(obj, {
+                                price: price
+                            });
+                        }
+
+                        newArrival.naList.push(obj);
+
                     }
                 });
             }
 
-            // console.log(newArrival)
+            console.log(newArrival)
             return newArrival;
         } else {
             logger.error('new data return code is not 200');

@@ -38,6 +38,7 @@ router.get('/author/list', index.editor); // 编辑简介
 router.get('/index/page', index.pageData); // 逛列表页面的资讯分页
 
 router.post('/opt/praiseArticle', opt.praiseArticle); // 资讯文章点赞 (H5里显示点赞)
+router.post('/opt/favoriteBrand', opt.favoriteBrand); // 品牌收藏 
 
 router.get('/info/index', info.index); // 逛详情页
 router.get('/info/mini', info.mini); // 逛mini内容页