Merge remote-tracking branch 'origin/release/1.0' into release/1.0

@@ -136,15 +136,17 @@ const favorite = {
                 };
                 retData.brandList = data.brandList;
 
-                retData.brandList.forEach(b => {
-                    b.newProduct.forEach(p => {
-                        p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`;
+                if (retData.brandList) {
+                    retData.brandList.forEach(b => {
+                        b.newProduct.forEach(p => {
+                            p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
+                        });
+                        b.newProduct.push({
+                            more: true
+                        });
+                        b.newProduct = _.chunk(b.newProduct, 4);
                     });
-                    b.newProduct.push({
-                        more: true
-                    });
-                    b.newProduct = _.chunk(b.newProduct, 4);
-                });
+                }
                 ret.content.favorite.data = retData;
             }
 

@@ -27,10 +27,6 @@ const navigation = [
         name: '我的收藏'
     },
     {
-        link: url('/me/message'),
-        name: '我的消息'
-    },
-    {
         link: url('/me/currency'),
         name: '我的YOHO币'
     },

@@ -80,10 +80,10 @@ router.post('/account/checkVerifyMobile', auth, account.checkVerifyMobile);
 
 
 // 我的收藏
-router.get('/collection', favorite.goods);
-router.get('/collection/brand', favorite.brand);
-router.get('/collection/editorial', favorite.editorial);
-router.post('/collection/cancel', favorite.cancel);
-router.post('/collection/editorial/cancel', favorite.editorialCancel);
+router.get('/collection', auth, favorite.goods);
+router.get('/collection/brand', auth, favorite.brand);
+router.get('/collection/editorial', auth, favorite.editorial);
+router.post('/collection/cancel', auth, favorite.cancel);
+router.post('/collection/editorial/cancel', auth, favorite.editorialCancel);
 
 module.exports = router;

@@ -242,7 +242,10 @@ const helpers = {
                         o.url = `${config.siteUrl}/product/pro_${g.productId}_${o.goodsId}/${o.cnAlphabet}.html`;
                     });
                 }
-
+                g.salesPrice = g.salesPrice || g.marketPrice;
+                if (g.salesPrice === g.marketPrice) {
+                    delete g.marketPrice;
+                }
                 g.url = `${config.siteUrl}/product/pro_${g.productId}_${goodsId}/${g.cnAlphabet}.html`;
             });
         }