fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit ff5493b91c025211aa26bc8432bd82c4da043352 1 parent 3e3a3990

favorite

Inline Side-by-side
Showing 6 changed files with 276 additions and 276 deletions
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
8 8
9 const favoriteModel = require('../models/favorite'); 9 const favoriteModel = require('../models/favorite');
10 10
11 -const favorite = (req, res, next) => {  
12 - 11 +const favorite = (req, res) => {
  12 +
13 // favoriteModel.getfavoriteData(uid, page, limit).then((result) => { 13 // favoriteModel.getfavoriteData(uid, page, limit).then((result) => {
14 - 14 +
15 // }).catch(next); 15 // }).catch(next);
16 res.render('favorite', { 16 res.render('favorite', {
17 module: 'home', 17 module: 'home',
@@ -20,7 +20,7 @@ const favorite = (req, res, next) => { @@ -20,7 +20,7 @@ const favorite = (req, res, next) => {
20 productUrl: 'm.yohobuy.com', 20 productUrl: 'm.yohobuy.com',
21 brandUrl: 'm.yohobuy.com' 21 brandUrl: 'm.yohobuy.com'
22 } 22 }
23 - }) 23 + });
24 }; 24 };
25 25
26 let favProduct = (req, res, next) => { 26 let favProduct = (req, res, next) => {
@@ -32,7 +32,7 @@ let favProduct = (req, res, next) => { @@ -32,7 +32,7 @@ let favProduct = (req, res, next) => {
32 res.render('favorite/favorite-product', { 32 res.render('favorite/favorite-product', {
33 layout: false, 33 layout: false,
34 hasFavProduct: result 34 hasFavProduct: result
35 - }) 35 + });
36 }).catch(next); 36 }).catch(next);
37 }; 37 };
38 38
@@ -45,7 +45,7 @@ let favfavBrand = (req, res, next) => { @@ -45,7 +45,7 @@ let favfavBrand = (req, res, next) => {
45 res.render('favorite/favorite-brand', { 45 res.render('favorite/favorite-brand', {
46 layout: false, 46 layout: false,
47 hasFavBrand: result 47 hasFavBrand: result
48 - }) 48 + });
49 }).catch(next); 49 }).catch(next);
50 }; 50 };
51 51
@@ -64,4 +64,4 @@ module.exports = { @@ -64,4 +64,4 @@ module.exports = {
64 favProduct, 64 favProduct,
65 favfavBrand, 65 favfavBrand,
66 favoriteDelete 66 favoriteDelete
67 -}  
  67 +};
@@ -8,7 +8,8 @@ @@ -8,7 +8,8 @@
8 8
9 const logger = global.yoho.logger; 9 const logger = global.yoho.logger;
10 const api = global.yoho.API; 10 const api = global.yoho.API;
11 -const serviceAPI = global.yoho.ServiceAPI; 11 +
  12 +// const serviceAPI = global.yoho.ServiceAPI;
12 const camelCase = global.yoho.camelCase; 13 const camelCase = global.yoho.camelCase;
13 const _ = require('lodash'); 14 const _ = require('lodash');
14 const config = global.yoho.config; 15 const config = global.yoho.config;
@@ -28,7 +29,7 @@ const favProduct = (uid, page, limit) => { @@ -28,7 +29,7 @@ const favProduct = (uid, page, limit) => {
28 }; 29 };
29 30
30 if (result && result.code === 200) { 31 if (result && result.code === 200) {
31 - 32 +
32 let list = camelCase(result); 33 let list = camelCase(result);
33 34
34 if (page > 1 && list === []) { 35 if (page > 1 && list === []) {
@@ -37,22 +38,22 @@ const favProduct = (uid, page, limit) => { @@ -37,22 +38,22 @@ const favProduct = (uid, page, limit) => {
37 } 38 }
38 39
39 if (page <= list.data.pageTotal) { 40 if (page <= list.data.pageTotal) {
40 - let hasFavProduct = [];  
41 41
42 _.forEach(list.data.productList, function(val) { 42 _.forEach(list.data.productList, function(val) {
43 let obj = {}; 43 let obj = {};
  44 +
44 // if (empty(val.productSkn)) { 45 // if (empty(val.productSkn)) {
45 // continue; 46 // continue;
46 // } 47 // }
47 48
48 if (val.goodsId && val.cnAlphabet) { 49 if (val.goodsId && val.cnAlphabet) {
49 - obj =_.assign (obj, { 50 + obj = _.assign(obj, {
50 link: config.siteUrl + '/product/list/pro_' + 51 link: config.siteUrl + '/product/list/pro_' +
51 val.productId + '_' + val.goodsId + '/' + 52 val.productId + '_' + val.goodsId + '/' +
52 val.cnAlphabet + '.html' 53 val.cnAlphabet + '.html'
53 }); 54 });
54 } else { 55 } else {
55 - obj =_.assign (obj, { 56 + obj = _.assign(obj, {
56 link: '' 57 link: ''
57 }); 58 });
58 } 59 }
@@ -97,14 +98,14 @@ const favProduct = (uid, page, limit) => { @@ -97,14 +98,14 @@ const favProduct = (uid, page, limit) => {
97 }); 98 });
98 99
99 resu.hasFavProduct.push(obj); 100 resu.hasFavProduct.push(obj);
100 - }); 101 + });
101 102
102 } else { 103 } else {
103 resu.push({ 104 resu.push({
104 - end: true 105 + end: true
105 }); 106 });
106 } 107 }
107 - 108 +
108 return resu.hasFavProduct; 109 return resu.hasFavProduct;
109 } else { 110 } else {
110 logger.error('收藏商品 cood 不是 200'); 111 logger.error('收藏商品 cood 不是 200');
@@ -126,32 +127,33 @@ const favfavBrand = (uid, page, limit) => { @@ -126,32 +127,33 @@ const favfavBrand = (uid, page, limit) => {
126 let list = camelCase(result); 127 let list = camelCase(result);
127 128
128 if (page > 1 && list === []) { 129 if (page > 1 && list === []) {
129 - resu.end = true; 130 + hasFavBrand.push({
  131 + end: true
  132 + });
130 return; 133 return;
131 } 134 }
132 135
133 if (page <= list.data.pageTotal) { 136 if (page <= list.data.pageTotal) {
134 - let brand = [];  
135 137
136 _.forEach(list.data.brandList, function(val) { 138 _.forEach(list.data.brandList, function(val) {
137 let obj = { 139 let obj = {
138 - productList: [] 140 + productList: []
139 }; 141 };
140 - let brandPro = []; 142 +
141 // if (empty(val.productSkn)) { 143 // if (empty(val.productSkn)) {
142 // continue; 144 // continue;
143 // } 145 // }
144 if (val.brandOrShopType === 'brandOrShopType') { 146 if (val.brandOrShopType === 'brandOrShopType') {
145 obj = _.assign(obj, { 147 obj = _.assign(obj, {
146 link: helpers.urlFormat('/product/index/brand', { 148 link: helpers.urlFormat('/product/index/brand', {
147 - shop_id: val.shopId 149 + shop_id: val.shopId
148 }) 150 })
149 - }) 151 + });
150 } else { 152 } else {
151 obj = _.assign(obj, { 153 obj = _.assign(obj, {
152 link: helpers.urlFormat('', {}, val.brandDomain) 154 link: helpers.urlFormat('', {}, val.brandDomain)
153 -  
154 - }) 155 +
  156 + });
155 } 157 }
156 158
157 obj = _.assign(obj, { 159 obj = _.assign(obj, {
@@ -164,34 +166,35 @@ const favfavBrand = (uid, page, limit) => { @@ -164,34 +166,35 @@ const favfavBrand = (uid, page, limit) => {
164 166
165 _.forEach(val.newProduct, function(data) { 167 _.forEach(val.newProduct, function(data) {
166 obj.productList.push({ 168 obj.productList.push({
167 - link: '/product/pro_' + data.productId + '_' + data.goods[0].id + '/' + data.cnAlphabet + '.html', 169 + link: '/product/pro_' + data.productId + '_' +
  170 + data.goods[0].id + '/' + data.cnAlphabet + '.html',
168 imgUrl: data.defaultImages, 171 imgUrl: data.defaultImages,
169 price: '¥' + data.marketPrice 172 price: '¥' + data.marketPrice
170 - }) 173 + });
171 174
172 if (data.marketPrice > data.salesPrice) { 175 if (data.marketPrice > data.salesPrice) {
173 obj.productList.push({ 176 obj.productList.push({
174 discount: '¥' + data.salesPrice 177 discount: '¥' + data.salesPrice
175 - }) 178 + });
176 } 179 }
177 - })  
178 - 180 + });
  181 +
179 hasFavBrand.push(obj); 182 hasFavBrand.push(obj);
180 }); 183 });
181 184
182 - console.log(hasFavBrand) 185 + // console.log(hasFavBrand);
183 return hasFavBrand; 186 return hasFavBrand;
184 } else { 187 } else {
185 hasFavBrand.push({ 188 hasFavBrand.push({
186 - end: true 189 + end: true
187 }); 190 });
188 } 191 }
189 - 192 +
190 } else { 193 } else {
191 logger.error('收藏品牌 cood 不是 200'); 194 logger.error('收藏品牌 cood 不是 200');
192 } 195 }
193 }); 196 });
194 -} 197 +};
195 198
196 const favoriteDelete = (uid, type, favId) => { 199 const favoriteDelete = (uid, type, favId) => {
197 200
@@ -200,11 +203,11 @@ const favoriteDelete = (uid, type, favId) => { @@ -200,11 +203,11 @@ const favoriteDelete = (uid, type, favId) => {
200 uid: uid, 203 uid: uid,
201 type: type, 204 type: type,
202 fav_id: favId 205 fav_id: favId
203 - })  
204 -} 206 + });
  207 +};
205 208
206 module.exports = { 209 module.exports = {
207 - favProduct,  
208 - favfavBrand,  
209 - favoriteDelete 210 + favProduct,
  211 + favfavBrand,
  212 + favoriteDelete
210 }; 213 };
@@ -15,16 +15,16 @@ const favorite = require(`${cRoot}/favorite`); @@ -15,16 +15,16 @@ const favorite = require(`${cRoot}/favorite`);
15 // 查看二维码 15 // 查看二维码
16 router.get('/QRcode/:id', personalController.QRcode); 16 router.get('/QRcode/:id', personalController.QRcode);
17 17
18 -//我的收藏 18 +// 我的收藏
19 router.get('/favorite', favorite.favorite); 19 router.get('/favorite', favorite.favorite);
20 20
21 -//收藏的商品 21 +// 收藏的商品
22 router.get('/favProduct', favorite.favProduct); 22 router.get('/favProduct', favorite.favProduct);
23 23
24 -//收藏的品牌 24 +// 收藏的品牌
25 router.get('/favBrand', favorite.favfavBrand); 25 router.get('/favBrand', favorite.favfavBrand);
26 26
27 -//取消收藏 27 +// 取消收藏
28 router.post('/favoriteDel', favorite.favoriteDelete); 28 router.post('/favoriteDel', favorite.favoriteDelete);
29 29
30 module.exports = router; 30 module.exports = router;
@@ -23,10 +23,10 @@ var $navLi = $('#fav-tab > li'), @@ -23,10 +23,10 @@ var $navLi = $('#fav-tab > li'),
23 $favProductList = $('.fav-product-list'), 23 $favProductList = $('.fav-product-list'),
24 $favBrandList = $('.fav-brand-swiper-wrapper'), 24 $favBrandList = $('.fav-brand-swiper-wrapper'),
25 pageId = 1, 25 pageId = 1,
26 - brandPageId = 1, //收藏品牌的当前页数 26 + brandPageId = 1, // 收藏品牌的当前页数
27 lockId = true, 27 lockId = true,
28 - brandLockId = true, //收藏品牌是否可下拉加载更多  
29 - brandTab = false; //当前是否停留在收藏品牌页 28 + brandLockId = true, // 收藏品牌是否可下拉加载更多
  29 + brandTab = false; // 当前是否停留在收藏品牌页
30 30
31 require('../common'); 31 require('../common');
32 32
@@ -38,7 +38,7 @@ function showFavTab(index) { @@ -38,7 +38,7 @@ function showFavTab(index) {
38 $favContainer.eq(index).addClass('show'); 38 $favContainer.eq(index).addClass('show');
39 } 39 }
40 40
41 -//初始化swiper 41 +// 初始化swiper
42 function initSwiper(data) { 42 function initSwiper(data) {
43 var i, 43 var i,
44 idStrReg = /container-(\d+)['"]{1}/gi, 44 idStrReg = /container-(\d+)['"]{1}/gi,
@@ -47,10 +47,10 @@ function initSwiper(data) { @@ -47,10 +47,10 @@ function initSwiper(data) {
47 idArrLen = idArr.length, 47 idArrLen = idArr.length,
48 containerId; 48 containerId;
49 49
50 - //$swiperList = $('.swiper-container'); 50 + // $swiperList = $('.swiper-container');
51 for (i = 0; i < idArrLen; i++) { 51 for (i = 0; i < idArrLen; i++) {
52 52
53 - /*id = $swiperList.eq(i).attr('data-id'); 53 + /* id = $swiperList.eq(i).attr('data-id');
54 54
55 if (!!swiperObj[id]) { 55 if (!!swiperObj[id]) {
56 swiperObj[id].destroy(true, true); 56 swiperObj[id].destroy(true, true);
@@ -97,11 +97,11 @@ function loadData($parent, url, page) { @@ -97,11 +97,11 @@ function loadData($parent, url, page) {
97 window.rePosFooter(); 97 window.rePosFooter();
98 } else if (data === 'end') { 98 } else if (data === 'end') {
99 99
100 - //处理data等于end时如果loadingMask存在且没有hide样式的情况 100 + // 处理data等于end时如果loadingMask存在且没有hide样式的情况
101 if ($loadingMask && !$loadingMask.hasClass('hide')) { 101 if ($loadingMask && !$loadingMask.hasClass('hide')) {
102 $loadingMask.addClass('hide'); 102 $loadingMask.addClass('hide');
103 103
104 - //$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide'); 104 + // $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
105 } 105 }
106 106
107 $parent.closest('.fav-type').find('.fav-load-background') 107 $parent.closest('.fav-type').find('.fav-load-background')
@@ -113,14 +113,14 @@ function loadData($parent, url, page) { @@ -113,14 +113,14 @@ function loadData($parent, url, page) {
113 } else if (data.length > 10) { 113 } else if (data.length > 10) {
114 $parent.append(data); 114 $parent.append(data);
115 115
116 - //如果有数据loadingMask会被remove掉 116 + // 如果有数据loadingMask会被remove掉
117 $loadingMask.remove(); 117 $loadingMask.remove();
118 if (url === 'favBrand') { 118 if (url === 'favBrand') {
119 - initSwiper(data);//如果是收藏品牌需要初始化swiper 119 + initSwiper(data);// 如果是收藏品牌需要初始化swiper
120 120
121 - brandLockId = false;//请求成功后解锁品牌收藏page++ 121 + brandLockId = false;// 请求成功后解锁品牌收藏page++
122 } else { 122 } else {
123 - lockId = false;//请求成功后解锁商品收藏page++ 123 + lockId = false;// 请求成功后解锁商品收藏page++
124 } 124 }
125 } 125 }
126 window.rePosFooter(); 126 window.rePosFooter();
@@ -170,7 +170,7 @@ favTabHammer.on('tap', function(e) { @@ -170,7 +170,7 @@ favTabHammer.on('tap', function(e) {
170 170
171 }); 171 });
172 172
173 -//删除收藏的商品 173 +// 删除收藏的商品
174 favContentHammer = new Hammer(document.getElementById('fav-content')); 174 favContentHammer = new Hammer(document.getElementById('fav-content'));
175 175
176 favContentHammer.on('tap', function(e) { 176 favContentHammer.on('tap', function(e) {
@@ -218,7 +218,7 @@ favContentHammer.on('tap', function(e) { @@ -218,7 +218,7 @@ favContentHammer.on('tap', function(e) {
218 } 218 }
219 }).fail(function() { 219 }).fail(function() {
220 220
221 - //TODO 221 + // TODO
222 222
223 diaLog.showDialog({ 223 diaLog.showDialog({
224 autoHide: true, 224 autoHide: true,
@@ -230,7 +230,7 @@ favContentHammer.on('tap', function(e) { @@ -230,7 +230,7 @@ favContentHammer.on('tap', function(e) {
230 230
231 function scrollHandler() { 231 function scrollHandler() {
232 232
233 - //距离底部未1/4列表高度+底部高度的时候加载更多 233 + // 距离底部未1/4列表高度+底部高度的时候加载更多
234 if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) { 234 if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) {
235 if (brandTab) { 235 if (brandTab) {
236 $brandLoadMore.filter('.hide').removeClass('hide'); 236 $brandLoadMore.filter('.hide').removeClass('hide');
@@ -252,7 +252,7 @@ function scrollHandler() { @@ -252,7 +252,7 @@ function scrollHandler() {
252 } 252 }
253 } 253 }
254 254
255 -//srcoll to load more 255 +// srcoll to load more
256 $(window).scroll(scrollHandler); 256 $(window).scroll(scrollHandler);
257 257
258 $(document).on('touchend', '.swiper-header', function() { 258 $(document).on('touchend', '.swiper-header', function() {
@@ -59,9 +59,9 @@ @@ -59,9 +59,9 @@
59 display: block; 59 display: block;
60 width: 188px; 60 width: 188px;
61 height: 171px; 61 height: 171px;
62 - /*background: resolve("me/fav/fav-null.png");*/ 62 + background: resolve("me/fav/fav-null.png");
63 background-size: 100% 100%; 63 background-size: 100% 100%;
64 - margin: 0 auto 45px auto; 64 + margin: 0 auto 45px;
65 } 65 }
66 } 66 }
67 67
@@ -69,265 +69,263 @@ @@ -69,265 +69,263 @@
69 width: 472px; 69 width: 472px;
70 height: 88px; 70 height: 88px;
71 line-height: 88px; 71 line-height: 88px;
72 - margin: 80px auto 0 auto; 72 + margin: 80px auto 0;
73 background: #444; 73 background: #444;
74 text-align: center; 74 text-align: center;
75 color: #fff; 75 color: #fff;
76 display: block; 76 display: block;
77 font-size: 26px; 77 font-size: 26px;
78 - border-radius:.2rem; 78 + border-radius: 0.2rem;
  79 + }
  80 + }
  81 +
  82 + .fav-product-list {
  83 + list-style: none;
  84 + margin-left: 30px;
  85 +
  86 + li {
  87 + height: auto;
  88 + overflow: hidden;
  89 + margin-top: 20px;
79 } 90 }
80 91
81 - .fav-product-list {  
82 - list-style: none;  
83 - margin-left: 30px; 92 + .fav-img-box {
  93 + width: 90px;
  94 + height: 120px;
  95 + float: left;
  96 + margin-right: 24px;
84 97
85 - li {  
86 - height: auto; 98 + img {
  99 + display: block;
87 overflow: hidden; 100 overflow: hidden;
88 - margin-top: 20px; 101 + width: 100%;
  102 + height: 100%;
89 } 103 }
  104 + }
90 105
91 - .fav-img-box {  
92 - width: 90px;  
93 - height: 120px;  
94 - float: left;  
95 - margin-right: 24px; 106 + .fav-info-list {
  107 + color: #444;
  108 + font-size: 24px;
  109 + border-bottom: 1px solid #e0e0e0;
  110 + padding-bottom: 20px;
  111 + height: 120px;
  112 + overflow: hidden;
  113 + position: relative;
96 114
97 - img {  
98 - display: block;  
99 - overflow: hidden;  
100 - width: 100%;  
101 - height: 100%;  
102 - } 115 + h2 {
  116 + width: 430px;
  117 + white-space: nowrap;
  118 + overflow: hidden;
  119 + text-overflow: ellipsis;
103 } 120 }
104 121
105 - .fav-info-list {  
106 - color: #444;  
107 - font-size: 24px;  
108 - border-bottom: 1px solid #e0e0e0;  
109 - padding-bottom: 20px;  
110 - height: 120px;  
111 - overflow: hidden;  
112 - position: relative; 122 + .new-price {
  123 + color: #d1021c;
  124 + }
  125 +
  126 + .price-underline {
  127 + text-decoration: line-through;
  128 + margin-left: 15px;
  129 + color: #b0b0b0;
  130 + }
  131 +
  132 + .save-price {
  133 + position: absolute;
  134 + bottom: 20px;
  135 + left: 0;
  136 + width: 100%;
  137 + min-height: 24px;
113 138
114 - h2 {  
115 - width: 430px;  
116 - /*white-space: nowrap;  
117 - overflow: hidden;*/  
118 - text-overflow: ellipsis; 139 + .del-fav {
  140 + text-indent: 0;
  141 + margin-left: 0;
119 } 142 }
120 143
121 - .fav-price { 144 + span {
  145 + color: #d1021c;
  146 + }
122 147
123 - .new-price {  
124 - color: #d1021c;  
125 - } 148 + .sell-out {
  149 + padding: 5px 18px;
  150 + color: #fffefe;
  151 + border-radius: 20px;
  152 + background: #7f7f7f;
  153 + font-size: 22px;
  154 + }
126 155
127 - .price-underline {  
128 - text-decoration: line-through;  
129 - margin-left: 15px;  
130 - color: #b0b0b0;  
131 - } 156 + .del-fav {
  157 + width: 2rem;
  158 + height: 1.5rem;
  159 + line-height: 1.5rem;
  160 + position: absolute;
  161 + top: 50%;
  162 + margin-top: -0.75rem;
  163 + right: 0;
  164 + color: #999;
  165 + padding-right: 0.75rem;
  166 + text-align: right;
132 } 167 }
  168 + }
133 169
134 - .save-price { 170 + .save-price-number {
  171 + text-indent: 42px;
  172 + color: #b0b0b0;
  173 + padding-top: 3px;
  174 +
  175 + &:before {
  176 + content: '';
  177 + display: block;
  178 + background: url("/me/fav/save-price.png");
  179 + width: 32px;
  180 + height: 32px;
135 181
136 position: absolute; 182 position: absolute;
137 - bottom: 20px; 183 + top: 50%;
138 left: 0; 184 left: 0;
139 - width: 100%;  
140 - min-height: 24px;  
141 -  
142 - &.save-price-number {  
143 - text-indent: 42px;  
144 - color: #b0b0b0;  
145 - padding-top: 3px;  
146 -  
147 - &:before {  
148 - content: '';  
149 - display: block;  
150 - /*background: url("/me/fav/save-price.png");*/  
151 - width: 32px;  
152 - height: 32px;  
153 -  
154 - position: absolute;  
155 - top: 50%;  
156 - left: 0;  
157 - margin-top: -16px;  
158 -  
159 - }  
160 - span {  
161 - margin-left: 15px;  
162 - }  
163 - .del-fav {  
164 - text-indent: 0;  
165 - margin-left: 0;  
166 - }  
167 - }  
168 -  
169 - span {  
170 - color: #d1021c;  
171 -  
172 - &.sell-out {  
173 - padding: 5px 18px;  
174 - color: #fffefe;  
175 - border-radius: 20px;  
176 - background: #7f7f7f;  
177 - font-size: 22px;  
178 - }  
179 -  
180 - &.del-fav {  
181 - width: 2rem;  
182 - height: 1.5rem;  
183 - line-height: 1.5rem;  
184 - position: absolute;  
185 - top: 50%;  
186 - margin-top: -0.75rem;  
187 - right: 0;  
188 - color: #999;  
189 -  
190 - padding-right: 0.75rem;  
191 - text-align: right;  
192 -  
193 - }  
194 - } 185 + margin-top: -16px;
  186 +
  187 + }
  188 + span {
  189 + margin-left: 15px;
195 } 190 }
196 } 191 }
197 } 192 }
198 - /*品牌收藏*/  
199 - .fav-brand-swiper { 193 + }
  194 +
  195 + .fav-brand-swiper {
  196 + border-top: 1px solid #e0e0e0;
  197 + border-bottom: 28px solid #f0f0f0;
  198 + position: relative;
  199 +
  200 + &:nth-of-type(1) {
  201 + border-top: 0;
  202 + }
  203 +
  204 + &:after {
  205 + content: '';
  206 + position: absolute;
  207 + left: 0;
  208 + bottom: -2px;
200 border-top: 1px solid #e0e0e0; 209 border-top: 1px solid #e0e0e0;
201 - border-bottom: 28px solid #f0f0f0; 210 + display: block;
  211 + width: 100%;
  212 + height: 1px;
  213 + }
  214 +
  215 + .swiper-header {
  216 + height: 100px;
  217 + padding: 20px 30px;
  218 + display: inline-block;
202 position: relative; 219 position: relative;
  220 + width: 100%;
  221 + box-sizing: border-box;
  222 +
  223 + .fav-more {
  224 + width: 2.5rem;
  225 + height: 2.5rem;
  226 + position: absolute;
  227 + top: 0;
  228 + right: 0;
203 229
204 - &:nth-of-type(1) {  
205 - border-top: 0; 230 + &:after {
  231 + width: 18px;
  232 + height: 29px;
  233 + background: url("/me/fav/fav-more.png");
  234 + position: absolute;
  235 + top: 50%;
  236 + right: 30px;
  237 + margin-top: -15px;
  238 + content: '';
  239 + }
206 } 240 }
  241 + }
207 242
208 - &:after {  
209 - content: '';  
210 - position: absolute;  
211 - left: 0;  
212 - bottom: -2px;  
213 - border-top: 1px solid #e0e0e0;  
214 - display: block;  
215 - width: 100%;  
216 - height: 1px; 243 + .brand-info {
  244 + float: left;
  245 +
  246 + .brand-name {
  247 + font-size: 28px;
  248 +
  249 + b {
  250 + color: #b0b0b0;
  251 + font-weight: normal;
  252 + }
217 } 253 }
218 254
219 - .swiper-header {  
220 - height: 100px;  
221 - padding: 20px 30px;  
222 - display: inline-block;  
223 - position: relative;  
224 - width: 100%;  
225 - box-sizing: border-box;  
226 -  
227 - .swiper-logo {  
228 - height: 100%;  
229 - display: inline-block;  
230 - float: left;  
231 - margin-right: 45px;  
232 -  
233 - > img {  
234 - max-height: 100%;  
235 - vertical-align: middle;  
236 - } 255 + .brand-update {
  256 + font-size: 22px;
  257 +
  258 + b {
  259 + color: #b0b0b0;
  260 + font-weight: normal;
237 } 261 }
238 262
239 - .brand-info {  
240 - float: left;  
241 -  
242 - .brand-name {  
243 - font-size: 28px;  
244 -  
245 - b {  
246 - color: #b0b0b0;  
247 - font-weight: normal;  
248 - }  
249 - }  
250 -  
251 - .brand-update {  
252 - font-size: 22px;  
253 -  
254 - b {  
255 - color: #b0b0b0;  
256 - font-weight: normal;  
257 - }  
258 -  
259 - .brand-new {  
260 - color: #86bf4a;  
261 - margin-right: 24px;  
262 - }  
263 - .brand-discount {  
264 - color: #d1021c;  
265 - }  
266 - } 263 + .brand-new {
  264 + color: #86bf4a;
  265 + margin-right: 24px;
267 } 266 }
268 - .fav-more {  
269 - width: 2.5rem;  
270 - height: 2.5rem;  
271 - position: absolute;  
272 - top: 0;  
273 - right: 0; 267 + .brand-discount {
  268 + color: #d1021c;
  269 + }
  270 + }
  271 + }
  272 +
  273 + .swiper-logo {
  274 + height: 100%;
  275 + display: block;
  276 + float: left;
  277 + margin-right: 45px;
  278 +
  279 + > img {
  280 + max-height: 100%;
  281 + vertical-align: middle;
  282 + }
  283 + }
  284 +
  285 + .swiper-container {
  286 + height: 365px;
  287 + margin: 0 30px;
  288 +
  289 + .swiper-slide {
  290 + width: 225px;
  291 + height: 100%;
  292 + float: left;
  293 + padding-right: 30px;
274 294
275 - &:after {  
276 - width: 18px;  
277 - height: 29px;  
278 - background: url("/me/fav/fav-more.png");  
279 - position: absolute;  
280 - top: 50%;  
281 - right: 30px;  
282 - margin-top: -15px;  
283 - content: '';  
284 - } 295 + &:nth-last-of-type(1) {
  296 + padding-right: 0;
  297 + }
  298 +
  299 + img {
  300 + display: block;
  301 + width: 100%;
  302 + height: 300px;
  303 + overflow: hidden;
  304 + }
  305 + .brand-product {
  306 + height: 65px;
  307 + line-height: 65px;
  308 + text-align: center;
  309 + font-size: 22px;
285 } 310 }
286 } 311 }
287 - .swiper-container {  
288 - height: 365px;  
289 - margin: 0 30px;  
290 -  
291 - .swiper-slide {  
292 - width: 225px;  
293 - height: 100%;  
294 - float: left;  
295 - padding-right: 30px;  
296 -  
297 - &:nth-last-of-type(1) {  
298 - padding-right: 0;  
299 - }  
300 -  
301 - img {  
302 - display: block;  
303 - width: 100%;  
304 - height: 300px;  
305 - overflow: hidden;  
306 - }  
307 - .brand-product {  
308 - height: 65px;  
309 - line-height: 65px;  
310 - text-align: center;  
311 - font-size: 22px;  
312 -  
313 - .price-discount {  
314 - span {  
315 - color: #d1021c  
316 - }  
317 - b {  
318 - color: #b0b0b0;  
319 - text-decoration: line-through;  
320 - font-weight: normal;  
321 - margin-left: 13px;  
322 - }  
323 - }  
324 - } 312 +
  313 + .price-discount {
  314 + span {
  315 + color: #d1021c;
  316 + }
  317 + b {
  318 + color: #b0b0b0;
  319 + text-decoration: line-through;
  320 + font-weight: normal;
  321 + margin-left: 13px;
325 } 322 }
326 } 323 }
327 } 324 }
328 } 325 }
329 326
330 - .fav-load-more,.fav-brand-load-more { 327 + .fav-load-more,
  328 + .fav-brand-load-more {
331 width: 100%; 329 width: 100%;
332 height: 2rem; 330 height: 2rem;
333 line-height: 2rem; 331 line-height: 2rem;
@@ -335,16 +333,15 @@ @@ -335,16 +333,15 @@
335 color: #444; 333 color: #444;
336 334
337 &.load-background { 335 &.load-background {
338 - /*background: resolve('loading.gif') center center no-repeat;*/ 336 + background: resolve('loading.gif') center center no-repeat;
339 background-size: auto 40%; 337 background-size: auto 40%;
340 } 338 }
341 } 339 }
342 .fav-content-loading { 340 .fav-content-loading {
343 width: 100%; 341 width: 100%;
344 height: 2rem; 342 height: 2rem;
345 - /*background: resolve('loading.gif') center center no-repeat;*/ 343 + background: resolve('loading.gif') center center no-repeat;
346 background-size: auto 40%; 344 background-size: auto 40%;
347 -  
348 position: absolute; 345 position: absolute;
349 top: 50%; 346 top: 50%;
350 left: 0; 347 left: 0;