Showing
5 changed files
with
70 additions
and
55 deletions
@@ -72,7 +72,7 @@ exports.myDetails = (req, res, next) => { | @@ -72,7 +72,7 @@ exports.myDetails = (req, res, next) => { | ||
72 | * @param next | 72 | * @param next |
73 | */ | 73 | */ |
74 | 74 | ||
75 | -exports.record = (req, res, next) => { | 75 | +exports.record = (req, res) => { |
76 | 76 | ||
77 | let headerData = headerModel.setNav({ | 77 | let headerData = headerModel.setNav({ |
78 | navTitle: '浏览记录' | 78 | navTitle: '浏览记录' |
@@ -83,18 +83,36 @@ exports.record = (req, res, next) => { | @@ -83,18 +83,36 @@ exports.record = (req, res, next) => { | ||
83 | module: 'home', | 83 | module: 'home', |
84 | page: 'browse-record', | 84 | page: 'browse-record', |
85 | title: '浏览记录', | 85 | title: '浏览记录', |
86 | + browseRecordPage: true, | ||
86 | pageFooter: true | 87 | pageFooter: true |
87 | }; | 88 | }; |
88 | 89 | ||
90 | + res.render('browse-record', responseData); | ||
89 | 91 | ||
90 | - indexModel.record({ | 92 | +}; |
91 | 93 | ||
92 | - }).then(result => { | ||
93 | - console.log(Object.assign(responseData, result)); | ||
94 | - res.render('browse-record', Object.assign(responseData, result)); | ||
95 | - }).catch(next); | 94 | +exports.recordContent = (req, res, next) => { |
95 | + let uid = req.user.uid || 6228593; // TODO | ||
96 | + | ||
97 | + let udid = req.user.udid; | ||
98 | + | ||
99 | + let page = req.query.page || 1; | ||
100 | + | ||
101 | + let limit = 10; | ||
96 | 102 | ||
103 | + indexModel.recordContent(uid, udid, page, limit).then((result) => { | ||
104 | + res.render('browse-record-content', result); | ||
105 | + }).catch(next); | ||
97 | }; | 106 | }; |
98 | 107 | ||
108 | +exports.delRecord = (req, res, next) => { | ||
109 | + let uid = req.user.uid || 6228593; // TODO | ||
110 | + | ||
111 | + let skn = req.user.skn || 0; | ||
112 | + | ||
113 | + indexModel.delRecord(uid, skn).then((result) => { | ||
114 | + res.json(result); | ||
115 | + }).catch(next); | ||
116 | +}; | ||
99 | 117 | ||
100 | 118 |
@@ -144,49 +144,73 @@ const myDetails = (params) => { | @@ -144,49 +144,73 @@ const myDetails = (params) => { | ||
144 | }); | 144 | }); |
145 | }; | 145 | }; |
146 | 146 | ||
147 | + | ||
148 | + | ||
147 | /** | 149 | /** |
148 | * 浏览记录 | 150 | * 浏览记录 |
149 | * @param params | 151 | * @param params |
150 | */ | 152 | */ |
151 | - | ||
152 | - | ||
153 | -const record = (params) => { | 153 | +const recordContent = (uid, udid, page, limit) => { |
154 | 154 | ||
155 | return api.get('', { | 155 | return api.get('', { |
156 | method: 'app.browse.product', | 156 | method: 'app.browse.product', |
157 | - uid: params.uid || 6228593, | ||
158 | - limit: 100, | ||
159 | - page: 1 | 157 | + uid: uid || 6228593, // TODO |
158 | + limit: limit, | ||
159 | + page: page | ||
160 | }, {code: 200}).then((result) => { | 160 | }, {code: 200}).then((result) => { |
161 | 161 | ||
162 | let resu = { | 162 | let resu = { |
163 | - recordResult: [] | 163 | + browseRecord: [] |
164 | }; | 164 | }; |
165 | 165 | ||
166 | if (result && result.code === 200) { | 166 | if (result && result.code === 200) { |
167 | + let list = result; | ||
168 | + | ||
169 | + // 不能再查到结果了 | ||
170 | + if (page > 1 && list === []) { | ||
171 | + resu.noRecord = true; | ||
172 | + } | ||
173 | + | ||
174 | + if (result.data.total === 0) { | ||
175 | + resu.total = 0; | ||
176 | + } | ||
177 | + | ||
178 | + | ||
179 | + _.forEach(list.data.product_list, function(val) { | ||
180 | + let obj = { | ||
181 | + productList: [] | ||
182 | + }; | ||
183 | + | ||
167 | 184 | ||
168 | - _.forEach(result.data.product_list, function(val) { | ||
169 | - let obj = {}; | ||
170 | obj = _.assign(obj, { | 185 | obj = _.assign(obj, { |
171 | product_name: val.product_name, | 186 | product_name: val.product_name, |
172 | product_skn: val.product_skn, | 187 | product_skn: val.product_skn, |
173 | - invalidGoods: val.status === 0, | ||
174 | - storage: val.storage | 188 | + storage: val.storage, |
189 | + image: val.image, | ||
190 | + link: '/product/show_' + val.product_skn + '.html', | ||
191 | + sales_price: val.sales_price, | ||
192 | + market_price: (val.market_price - val.sales_price) > 0 ? val.market_price : false, | ||
193 | + invalidGoods: val.status === 0 | ||
175 | }); | 194 | }); |
176 | - resu.recordResult.push(obj); | ||
177 | 195 | ||
196 | + resu.browseRecord.push(obj); | ||
178 | }); | 197 | }); |
179 | - | 198 | + return resu; |
180 | } | 199 | } |
181 | - | ||
182 | - // console.log(resu); | ||
183 | - return resu; | ||
184 | }); | 200 | }); |
185 | }; | 201 | }; |
186 | 202 | ||
203 | +const delRecord = (uid, skn) => { | ||
204 | + return api.get('', { | ||
205 | + method: 'app.browse.delete', | ||
206 | + uid: uid, | ||
207 | + skn: skn | ||
208 | + }); | ||
209 | +}; | ||
187 | 210 | ||
188 | module.exports = { | 211 | module.exports = { |
189 | index, | 212 | index, |
190 | myDetails, | 213 | myDetails, |
191 | - record | 214 | + recordContent, |
215 | + delRecord | ||
192 | }; | 216 | }; |
@@ -47,6 +47,10 @@ router.get('/mycurrency', currencyController.myCurrency); // yoho币总数 | @@ -47,6 +47,10 @@ router.get('/mycurrency', currencyController.myCurrency); // yoho币总数 | ||
47 | router.get('/currencyDetail', currencyController.currencyDetail); // yoho币列表 | 47 | router.get('/currencyDetail', currencyController.currencyDetail); // yoho币列表 |
48 | router.post('/ajaxCurrencyDetail', currencyController.ajaxCurrencyDetail); // yoho币列表 | 48 | router.post('/ajaxCurrencyDetail', currencyController.ajaxCurrencyDetail); // yoho币列表 |
49 | 49 | ||
50 | +router.get('/record', homeController.record); // 浏览记录 | ||
51 | +router.get('/recordContent', homeController.recordContent); // 浏览记录 | ||
52 | +router.get('/delRecord', homeController.delRecord); // 删除浏览记录 | ||
53 | + | ||
50 | // 我的收藏 | 54 | // 我的收藏 |
51 | router.get('/favorite', favorite.favorite); | 55 | router.get('/favorite', favorite.favorite); |
52 | 56 |
1 | {{# browseRecord}} | 1 | {{# browseRecord}} |
2 | <a class="browse-record-good clearfix {{#if invalidGoods}}invalidGoods{{/if}}" data-skn="{{product_skn}}" href="{{link}}"> | 2 | <a class="browse-record-good clearfix {{#if invalidGoods}}invalidGoods{{/if}}" data-skn="{{product_skn}}" href="{{link}}"> |
3 | - <img class="thumb lazy" data-original="{{image}}"> | 3 | + <img class="thumb lazy" data-original="{{image image 447 596}}"> |
4 | <div class="deps clearfix"> | 4 | <div class="deps clearfix"> |
5 | <p class="name row">{{product_name}}</p> | 5 | <p class="name row">{{product_name}}</p> |
6 | <p class="price row"> | 6 | <p class="price row"> |
1 | <div class="browse-record-page yoho-page"> | 1 | <div class="browse-record-page yoho-page"> |
2 | <div class="records"> | 2 | <div class="records"> |
3 | 3 | ||
4 | - {{# browseRecord}} | ||
5 | - <a class="browse-record-good clearfix {{#if invalidGoods}}invalidGoods{{/if}}" data-skn="{{product_skn}}" href="{{link}}"> | ||
6 | - <img class="thumb lazy" data-original="{{image}}"> | ||
7 | - <div class="deps clearfix"> | ||
8 | - <p class="name row">{{product_name}}</p> | ||
9 | - <p class="price row"> | ||
10 | - <span class="sale-price{{#unless market_price}} original-price{{/unless}}">¥{{sales_price}}</span> | ||
11 | - | ||
12 | - {{#if market_price}} | ||
13 | - <span class="market-price">¥{{market_price}}</span> | ||
14 | - {{/if}} | ||
15 | - </p> | ||
16 | - <p class="sold-out row"> | ||
17 | - {{#unless storage}} | ||
18 | - <span class="sold-out-tag">已售罄</span> | ||
19 | - {{/unless}} | ||
20 | - </p> | ||
21 | - <span class="iconfont del-icon"></span> | ||
22 | - </div> | ||
23 | - </a> | ||
24 | - | ||
25 | - {{/ browseRecord}} | ||
26 | - | ||
27 | - {{#if noRecord}} | ||
28 | - <div class="no-record"> | ||
29 | - <div class="icon"></div> | ||
30 | - <span>暂无浏览记录</span> | ||
31 | - <a class="walk-way" href="{{walkwayUrl}}">随便逛逛</a> | ||
32 | - </div> | ||
33 | - {{/if}} | ||
34 | - | ||
35 | </div> | 4 | </div> |
36 | <div class="load-more hide"> | 5 | <div class="load-more hide"> |
37 | <span class="more">正在加载...</span> | 6 | <span class="more">正在加载...</span> |
-
Please register or login to post a comment