fe / yohobuywap-node · Commits

Go to a project

Authored by lijing
Commit fef805cadd172c84adfdf6b9eecef962e2420176 2 parents 368da778 9aee3061

Merge branch 'feature/usercenter' of http://git.yoho.cn/fe/yohobuywap-node into feature/usercenter 

 the commit.
Inline Side-by-side
Showing 9 changed files with 94 additions and 64 deletions
@@ -42,19 +42,19 @@ exports.address = (req, res, next) => { @@ -42,19 +42,19 @@ exports.address = (req, res, next) => {
42 * @param next 42 * @param next
43 */ 43 */
44 exports.addressAct = (req, res, next) => { 44 exports.addressAct = (req, res, next) => {
45 - let responseData = {  
46 - module: 'home',  
47 - page: 'address-act',  
48 - pageHeader: headerModel.setNav({  
49 - navTitle: '编辑地址'  
50 - }),  
51 - title: '编辑地址'  
52 - };  
53 -  
54 addressModel.address({ 45 addressModel.address({
55 id: req.params.id, 46 id: req.params.id,
56 uid: req.user.uid || 8039759 // TODO 待删除 47 uid: req.user.uid || 8039759 // TODO 待删除
57 }).then(result => { 48 }).then(result => {
  49 + let responseData = {
  50 + module: 'home',
  51 + page: 'address-act',
  52 + pageHeader: headerModel.setNav({
  53 + navTitle: result.navTitle
  54 + }),
  55 + title: result.navTitle
  56 + };
  57 +
58 res.render('address/address-act', Object.assign(responseData, result)); 58 res.render('address/address-act', Object.assign(responseData, result));
59 }).catch(next); 59 }).catch(next);
60 }; 60 };
@@ -35,10 +35,15 @@ let favProduct = (req, res, next) => { @@ -35,10 +35,15 @@ let favProduct = (req, res, next) => {
35 let limit = 10; 35 let limit = 10;
36 36
37 favoriteModel.favProduct(uid, page, limit).then((result) => { 37 favoriteModel.favProduct(uid, page, limit).then((result) => {
38 - res.render('favorite/favorite-product', {  
39 - layout: false,  
40 - hasFavProduct: result  
41 - }); 38 +
  39 + if (typeof(result.total) === "undefined" && typeof(result.more) === "undefined") {
  40 + res.render('favorite/favorite-product', {
  41 + layout: false,
  42 + hasFavProduct: result.hasFavProduct
  43 + });
  44 + } else {
  45 + res.json(result);
  46 + }
42 }).catch(next); 47 }).catch(next);
43 }; 48 };
44 49
@@ -48,10 +53,16 @@ let favfavBrand = (req, res, next) => { @@ -48,10 +53,16 @@ let favfavBrand = (req, res, next) => {
48 let limit = 10; 53 let limit = 10;
49 54
50 favoriteModel.favfavBrand(uid, page, limit).then((result) => { 55 favoriteModel.favfavBrand(uid, page, limit).then((result) => {
51 - res.render('favorite/favorite-brand', {  
52 - layout: false,  
53 - hasFavBrand: result  
54 - }); 56 +
  57 + if (typeof(result.total) === "undefined" && typeof(result.more) === "undefined") {
  58 + res.render('favorite/favorite-brand', {
  59 + layout: false,
  60 + hasFavBrand: result.hasFavBrand
  61 + });
  62 + } else {
  63 + res.json(result);
  64 + }
  65 +
55 }).catch(next); 66 }).catch(next);
56 }; 67 };
57 68
@@ -110,11 +110,13 @@ const address = (params) => { @@ -110,11 +110,13 @@ const address = (params) => {
110 return o.address_id === params.id; 110 return o.address_id === params.id;
111 })), 111 })),
112 addressList: camelCase(result[1] ? result[1].data : []), 112 addressList: camelCase(result[1] ? result[1].data : []),
113 - addressActionPage: true 113 + navTitle: '编辑地址'
114 }; 114 };
115 } else { 115 } else {
116 return { 116 return {
117 - address: camelCase(selfAddress.data) 117 + address: camelCase(selfAddress.data),
  118 + addressList: camelCase(result[1] ? result[1].data : []),
  119 + navTitle: '添加地址'
118 }; 120 };
119 } 121 }
120 } 122 }
@@ -127,7 +129,7 @@ const address = (params) => { @@ -127,7 +129,7 @@ const address = (params) => {
127 */ 129 */
128 const saveAddress = (params) => { 130 const saveAddress = (params) => {
129 if (params.id) { 131 if (params.id) {
130 - params.id = crypto.encryption(null, params.id); 132 + params.id = crypto.decrypt(null, params.id);
131 } 133 }
132 return _saveAddressData(params).then(result => { 134 return _saveAddressData(params).then(result => {
133 return result; 135 return result;
@@ -23,7 +23,7 @@ const favProduct = (uid, page, limit) => { @@ -23,7 +23,7 @@ const favProduct = (uid, page, limit) => {
23 page: page, 23 page: page,
24 limit: limit 24 limit: limit
25 }).then((result) => { 25 }).then((result) => {
26 - // console.log(result) 26 +
27 let resu = { 27 let resu = {
28 hasFavProduct: [] 28 hasFavProduct: []
29 }; 29 };
@@ -34,7 +34,10 @@ const favProduct = (uid, page, limit) => { @@ -34,7 +34,10 @@ const favProduct = (uid, page, limit) => {
34 34
35 if (page > 1 && list === []) { 35 if (page > 1 && list === []) {
36 resu.end = true; 36 resu.end = true;
37 - return; 37 + }
  38 +
  39 + if (list.data.total === 0) {
  40 + resu.total = 0;
38 } 41 }
39 42
40 if (page <= list.data.pageTotal) { 43 if (page <= list.data.pageTotal) {
@@ -101,12 +104,10 @@ const favProduct = (uid, page, limit) => { @@ -101,12 +104,10 @@ const favProduct = (uid, page, limit) => {
101 }); 104 });
102 105
103 } else { 106 } else {
104 - resu.push({  
105 - end: true  
106 - }); 107 + resu.more = true;
107 } 108 }
108 109
109 - return resu.hasFavProduct; 110 + return resu;
110 } else { 111 } else {
111 logger.error('收藏商品 cood 不是 200'); 112 logger.error('收藏商品 cood 不是 200');
112 } 113 }
@@ -121,16 +122,20 @@ const favfavBrand = (uid, page, limit) => { @@ -121,16 +122,20 @@ const favfavBrand = (uid, page, limit) => {
121 page: page, 122 page: page,
122 limit: limit 123 limit: limit
123 }).then((result) => { 124 }).then((result) => {
124 - let hasFavBrand = []; 125 +
  126 + let resu = {
  127 + hasFavBrand: []
  128 + }
125 129
126 if (result && result.code === 200) { 130 if (result && result.code === 200) {
127 let list = camelCase(result); 131 let list = camelCase(result);
128 132
129 if (page > 1 && list === []) { 133 if (page > 1 && list === []) {
130 - hasFavBrand.push({  
131 - end: true  
132 - });  
133 - return; 134 + resu.end = true;
  135 + }
  136 +
  137 + if (list.data.total === 0) {
  138 + resu.total = 0;
134 } 139 }
135 140
136 if (page <= list.data.pageTotal) { 141 if (page <= list.data.pageTotal) {
@@ -179,17 +184,14 @@ const favfavBrand = (uid, page, limit) => { @@ -179,17 +184,14 @@ const favfavBrand = (uid, page, limit) => {
179 } 184 }
180 }); 185 });
181 186
182 - hasFavBrand.push(obj);  
183 - });  
184 -  
185 - // console.log(hasFavBrand);  
186 - return hasFavBrand; 187 + resu.hasFavBrand.push(obj);
  188 + });
  189 +
187 } else { 190 } else {
188 - hasFavBrand.push({  
189 - end: true  
190 - }); 191 + resu.more = true;
191 } 192 }
192 193
  194 + return resu;
193 } else { 195 } else {
194 logger.error('收藏品牌 cood 不是 200'); 196 logger.error('收藏品牌 cood 不是 200');
195 } 197 }
@@ -38,4 +38,8 @@ @@ -38,4 +38,8 @@
38 </div> 38 </div>
39 {{/if}} 39 {{/if}}
40 </div> 40 </div>
41 -{{/ hasFavBrand}}  
  41 +{{/ hasFavBrand}}
  42 +
  43 +{{!-- {{#if more}}
  44 + <div class="fav-brand-load-more">没有更多了</div>
  45 +{{/if}} --}}
@@ -30,4 +30,7 @@ @@ -30,4 +30,7 @@
30 </div> 30 </div>
31 </a> 31 </a>
32 </li> 32 </li>
33 -{{/ hasFavProduct}}  
  33 +{{/ hasFavProduct}}
  34 +{{!-- {{#if more}}
  35 + <div class="fav-brand-load-more">没有更多了</div>
  36 +{{/if}} --}}
@@ -18,8 +18,12 @@ module.exports = { @@ -18,8 +18,12 @@ module.exports = {
18 // api: 'http://devapi.yoho.cn:58078/', 18 // api: 'http://devapi.yoho.cn:58078/',
19 // service: 'http://devservice.yoho.cn:58077/', 19 // service: 'http://devservice.yoho.cn:58077/',
20 20
  21 + // api: 'http://api.yoho.cn/',
  22 + // service: 'http://service.yoho.cn/',
  23 +
21 api: 'http://testapi.yoho.cn:28078/', 24 api: 'http://testapi.yoho.cn:28078/',
22 service: 'http://testservice.yoho.cn:28077/', 25 service: 'http://testservice.yoho.cn:28077/',
  26 +
23 singleApi: 'http://192.168.102.31:8092/' 27 singleApi: 'http://192.168.102.31:8092/'
24 }, 28 },
25 subDomains: { 29 subDomains: {
@@ -21,8 +21,7 @@ var $addressForm = $('.edit-address'), @@ -21,8 +21,7 @@ var $addressForm = $('.edit-address'),
21 isSubmiting, 21 isSubmiting,
22 currentPage = 'edit', 22 currentPage = 'edit',
23 newArea = [], 23 newArea = [],
24 - chinaAddressList,  
25 - queryString = window.queryString; 24 + chinaAddressList;
26 25
27 $($editAddressPage, $addressListPage).css('min-height', function() { 26 $($editAddressPage, $addressListPage).css('min-height', function() {
28 return $(window).height() - $('#yoho-header').height(); 27 return $(window).height() - $('#yoho-header').height();
@@ -93,14 +92,16 @@ $addressForm.on('submit', function() { @@ -93,14 +92,16 @@ $addressForm.on('submit', function() {
93 tip.show(res.message || '网络出了点问题~'); 92 tip.show(res.message || '网络出了点问题~');
94 isSubmiting = false; 93 isSubmiting = false;
95 loading.hideLoadingMask(); 94 loading.hideLoadingMask();
96 - } else {  
97 - if (queryString.refer === 'shopping') { 95 + } else if (window.queryString) {
  96 + if (window.queryString.refer === 'shopping') {
98 window.location.href = '/cart/index/selectAddress'; 97 window.location.href = '/cart/index/selectAddress';
99 - } else if (queryString.refer === 'modify') { 98 + } else if (window.queryString.refer === 'modify') {
100 window.location.href = '/home/addressModify'; 99 window.location.href = '/home/addressModify';
101 } else { 100 } else {
102 window.location.href = '/home/address'; 101 window.location.href = '/home/address';
103 } 102 }
  103 + } else {
  104 + window.location.href = '/home/address';
104 } 105 }
105 }).fail(function() { 106 }).fail(function() {
106 tip.show('网络出了点问题~'); 107 tip.show('网络出了点问题~');
@@ -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);
@@ -91,17 +91,19 @@ function loadData($parent, url, page) { @@ -91,17 +91,19 @@ function loadData($parent, url, page) {
91 $loadMore.addClass('hide'); 91 $loadMore.addClass('hide');
92 } 92 }
93 93
94 - if (data === ' ') { 94 + if (data.total === 0) {
  95 +
95 $loadingMask.addClass('hide'); 96 $loadingMask.addClass('hide');
96 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide'); 97 $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
97 window.rePosFooter(); 98 window.rePosFooter();
98 - } else if (data === 'end') { 99 + } else if (data.more === true) {
  100 + console.log(0)
99 101
100 - // 处理data等于end时如果loadingMask存在且没有hide样式的情况 102 + //处理data等于end时如果loadingMask存在且没有hide样式的情况
101 if ($loadingMask && !$loadingMask.hasClass('hide')) { 103 if ($loadingMask && !$loadingMask.hasClass('hide')) {
102 $loadingMask.addClass('hide'); 104 $loadingMask.addClass('hide');
103 105
104 - // $parent.closest('.fav-type').find('.fav-null-box').removeClass('hide'); 106 + //$parent.closest('.fav-type').find('.fav-null-box').removeClass('hide');
105 } 107 }
106 108
107 $parent.closest('.fav-type').find('.fav-load-background') 109 $parent.closest('.fav-type').find('.fav-load-background')
@@ -113,14 +115,14 @@ function loadData($parent, url, page) { @@ -113,14 +115,14 @@ function loadData($parent, url, page) {
113 } else if (data.length > 10) { 115 } else if (data.length > 10) {
114 $parent.append(data); 116 $parent.append(data);
115 117
116 - // 如果有数据loadingMask会被remove掉 118 + //如果有数据loadingMask会被remove掉
117 $loadingMask.remove(); 119 $loadingMask.remove();
118 if (url === 'favBrand') { 120 if (url === 'favBrand') {
119 - initSwiper(data);// 如果是收藏品牌需要初始化swiper 121 + initSwiper(data);//如果是收藏品牌需要初始化swiper
120 122
121 - brandLockId = false;// 请求成功后解锁品牌收藏page++ 123 + brandLockId = false;//请求成功后解锁品牌收藏page++
122 } else { 124 } else {
123 - lockId = false;// 请求成功后解锁商品收藏page++ 125 + lockId = false;//请求成功后解锁商品收藏page++
124 } 126 }
125 } 127 }
126 window.rePosFooter(); 128 window.rePosFooter();
@@ -170,7 +172,7 @@ favTabHammer.on('tap', function(e) { @@ -170,7 +172,7 @@ favTabHammer.on('tap', function(e) {
170 172
171 }); 173 });
172 174
173 -// 删除收藏的商品 175 +//删除收藏的商品
174 favContentHammer = new Hammer(document.getElementById('fav-content')); 176 favContentHammer = new Hammer(document.getElementById('fav-content'));
175 177
176 favContentHammer.on('tap', function(e) { 178 favContentHammer.on('tap', function(e) {
@@ -203,6 +205,7 @@ favContentHammer.on('tap', function(e) { @@ -203,6 +205,7 @@ favContentHammer.on('tap', function(e) {
203 dialogText: '已经取消收藏' 205 dialogText: '已经取消收藏'
204 }); 206 });
205 $(e.target).closest('li').remove(); 207 $(e.target).closest('li').remove();
  208 + location.reload();
206 } else if (data.code === 400) { 209 } else if (data.code === 400) {
207 diaLog.showDialog({ 210 diaLog.showDialog({
208 autoHide: true, 211 autoHide: true,
@@ -218,7 +221,7 @@ favContentHammer.on('tap', function(e) { @@ -218,7 +221,7 @@ favContentHammer.on('tap', function(e) {
218 } 221 }
219 }).fail(function() { 222 }).fail(function() {
220 223
221 - // TODO 224 + //TODO
222 225
223 diaLog.showDialog({ 226 diaLog.showDialog({
224 autoHide: true, 227 autoHide: true,
@@ -230,7 +233,7 @@ favContentHammer.on('tap', function(e) { @@ -230,7 +233,7 @@ favContentHammer.on('tap', function(e) {
230 233
231 function scrollHandler() { 234 function scrollHandler() {
232 235
233 - // 距离底部未1/4列表高度+底部高度的时候加载更多 236 + //距离底部未1/4列表高度+底部高度的时候加载更多
234 if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) { 237 if ($(window).scrollTop() + winH >= $(document).height() - 0.25 * $favBrandList.height() - footerH) {
235 if (brandTab) { 238 if (brandTab) {
236 $brandLoadMore.filter('.hide').removeClass('hide'); 239 $brandLoadMore.filter('.hide').removeClass('hide');
@@ -252,7 +255,7 @@ function scrollHandler() { @@ -252,7 +255,7 @@ function scrollHandler() {
252 } 255 }
253 } 256 }
254 257
255 -// srcoll to load more 258 +//srcoll to load more
256 $(window).scroll(scrollHandler); 259 $(window).scroll(scrollHandler);
257 260
258 $(document).on('touchend', '.swiper-header', function() { 261 $(document).on('touchend', '.swiper-header', function() {