Merge branch 'feature/home' into develop

@@ -64,7 +64,7 @@ const component = {
         let testData = {
         let testData = {
             brandUrl: helpers.urlFormat('/product/new'),
             brandUrl: helpers.urlFormat('/product/new'),
             productUrl: helpers.urlFormat('/product/new')
             productUrl: helpers.urlFormat('/product/new')
-        }
+        };
 
 
         if (tab === 'brand') {
         if (tab === 'brand') {
             res.render('favorite-brand', _.merge({
             res.render('favorite-brand', _.merge({
@@ -84,22 +84,22 @@ const component = {
 
 
         if (page > 2) return res.json([]);
         if (page > 2) return res.json([]);
 
 
-        let testData = []
+        let testData = [];
         for (var i = 1; i <= 9; i++) {
         for (var i = 1; i <= 9; i++) {
             if (tab === 'brand') {
             if (tab === 'brand') {
                 testData.push({
                 testData.push({
                     fav_id: Number(page + i),
                     fav_id: Number(page + i),
-                    brandName: "品牌名测试" + Number(page + i),
+                    brandName: '品牌名测试' + Number(page + i),
                     invalidGoods: true
                     invalidGoods: true
-                })
+                });
             } else {
             } else {
                 testData.push({
                 testData.push({
                     fav_id: Number(page + i),
                     fav_id: Number(page + i),
-                    title: "商品名测试测试测试测试测试测试测试测试" + Number(page + i),
+                    title: '商品名测试测试测试测试测试测试测试测试' + Number(page + i),
                     invalidGoods: true,
                     invalidGoods: true,
                     discountPrice: '¥' + 900,
                     discountPrice: '¥' + 900,
                     price: '¥' + 990
                     price: '¥' + 990
-                })
+                });
             }
             }
         }
         }
 
 
@@ -114,4 +114,4 @@ const component = {
     }
     }
 };
 };
 
 
-module.exports = component;
+module.exports = component;

@@ -21,4 +21,4 @@ router.get('/favorite', home.favorite); // 个人中心 - 收藏
 router.get('/favorite/favpaging', home.favpaging); // 个人中心 - 收藏商品/品牌(翻页)
 router.get('/favorite/favpaging', home.favpaging); // 个人中心 - 收藏商品/品牌(翻页)
 router.post('/favorite/favdel', home.favdel); // 个人中心 - 收藏商品/品牌(刪除)
 router.post('/favorite/favdel', home.favdel); // 个人中心 - 收藏商品/品牌(刪除)
 
 
-module.exports = router;
+module.exports = router;

@@ -2,11 +2,11 @@ const Vue = require('yoho-vue');
 const infiniteScroll = require('yoho-vue-infinite-scroll');
 const infiniteScroll = require('yoho-vue-infinite-scroll');
 const BrandList = require('home/fav-brand-list.vue');
 const BrandList = require('home/fav-brand-list.vue');
 
 
-Vue.use(infiniteScroll)
+Vue.use(infiniteScroll);
 
 
 new Vue({
 new Vue({
     el: '#fav-content',
     el: '#fav-content',
     components: {
     components: {
         'fav-brand-list': BrandList
         'fav-brand-list': BrandList
     }
     }
-});
+});

@@ -2,11 +2,11 @@ const Vue = require('yoho-vue');
 const infiniteScroll = require('yoho-vue-infinite-scroll');
 const infiniteScroll = require('yoho-vue-infinite-scroll');
 const ProductList = require('home/fav-product-list.vue');
 const ProductList = require('home/fav-product-list.vue');
 
 
-Vue.use(infiniteScroll)
+Vue.use(infiniteScroll);
 
 
 new Vue({
 new Vue({
     el: '#fav-content',
     el: '#fav-content',
     components: {
     components: {
         'fav-product-list': ProductList
         'fav-product-list': ProductList
     }
     }
-});
+});

@@ -65,17 +65,14 @@
             font-size: 34px;
             font-size: 34px;
             line-height: 88px;
             line-height: 88px;
 
 
-            span {
-                color: #e0e0e0;
-                float: right;
-            }
-
             &.highlight {
             &.highlight {
                 background: #eee;
                 background: #eee;
             }
             }
 
 
             .read-order {
             .read-order {
+                color: #b0b0b0;
                 font-size: 30px;
                 font-size: 30px;
+                float: right;
             }
             }
         }
         }