张泽世 / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit 677a2f7506713440021f4af519eeb7a5c93b0353 1 parent 27a51bec

url 处理修改

Inline Side-by-side
Showing 4 changed files with 21 additions and 21 deletions
@@ -14,15 +14,15 @@ const renderData = { @@ -14,15 +14,15 @@ const renderData = {
14 module: 'channel', 14 module: 'channel',
15 page: 'home', 15 page: 'home',
16 homeHeader: { 16 homeHeader: {
17 - searchUrl: helpers.url('/search', null, 'search') 17 + searchUrl: helpers.urlFormat('/search', null, 'search')
18 }, 18 },
19 maybeLike: true, 19 maybeLike: true,
20 showFooterTab: { 20 showFooterTab: {
21 - indexUrl: helpers.url('/?go=1'), // 首页  
22 - categoryUrl: helpers.url('/cate'), // 分类  
23 - guangUrl: helpers.url('', null, 'guang'), // 逛首页  
24 - shoppingCartUrl: helpers.url('/cart/index/index'), // 购物车  
25 - mineUrl: helpers.url('/home') // 个人中心 21 + indexUrl: helpers.urlFormat('/?go=1'), // 首页
  22 + categoryUrl: helpers.urlFormat('/cate'), // 分类
  23 + guangUrl: helpers.urlFormat('', null, 'guang'), // 逛首页
  24 + shoppingCartUrl: helpers.urlFormat('/cart/index/index'), // 购物车
  25 + mineUrl: helpers.urlFormat('/home') // 个人中心
26 }, 26 },
27 pageFooter: true 27 pageFooter: true
28 }; 28 };
@@ -34,10 +34,10 @@ const getShopsInfo = (data) => { @@ -34,10 +34,10 @@ const getShopsInfo = (data) => {
34 34
35 params.shop_id = value.shop_id; 35 params.shop_id = value.shop_id;
36 enterStore[key].url = 36 enterStore[key].url =
37 - helpers.url('/product/index/brand', params); 37 + helpers.urlFormat('/product/index/brand', params);
38 } else { 38 } else {
39 enterStore[key].url = 39 enterStore[key].url =
40 - helpers.url('', null, value.brand_domain); 40 + helpers.urlFormat('', null, value.brand_domain);
41 } 41 }
42 }); 42 });
43 return enterStore; 43 return enterStore;
@@ -110,7 +110,7 @@ const getLimitCodeUrl = (productCode, skn, ua) => { @@ -110,7 +110,7 @@ const getLimitCodeUrl = (productCode, skn, ua) => {
110 let params = {}; 110 let params = {};
111 111
112 params.lp = productCode; 112 params.lp = productCode;
113 - url = 'yohobuy://' + helpers.url('/limitpurchase', params); 113 + url = 'yohobuy://' + helpers.urlFormat('/limitpurchase', params);
114 } 114 }
115 return url; 115 return url;
116 }; 116 };
@@ -138,8 +138,8 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -138,8 +138,8 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
138 if (uid === null || typeof uid === 'undefined') { 138 if (uid === null || typeof uid === 'undefined') {
139 let params = {}; 139 let params = {};
140 140
141 - params.refer = helpers.url('/product/show_' + origin.erpProductId + '.html');  
142 - dest.loginUrl = helpers.url('/signin.html', params); 141 + params.refer = helpers.urlFormat('/product/show_' + origin.erpProductId + '.html');
  142 + dest.loginUrl = helpers.urlFormat('/signin.html', params);
143 } 143 }
144 144
145 // 商品促销短语 145 // 商品促销短语
@@ -241,7 +241,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -241,7 +241,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
241 params.product_id = origin.id; 241 params.product_id = origin.id;
242 params.total = dest.feedbacks.consultsNum; 242 params.total = dest.feedbacks.consultsNum;
243 243
244 - dest.feedbacks.consultsUrl = helpers.url('/product/detail/consults', params); 244 + dest.feedbacks.consultsUrl = helpers.urlFormat('/product/detail/consults', params);
245 245
246 } else { // 暂无咨询 246 } else { // 暂无咨询
247 247
@@ -249,7 +249,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -249,7 +249,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
249 249
250 params.product_id = origin.id; 250 params.product_id = origin.id;
251 251
252 - dest.feedbacks.consultsUrl = helpers.url('/product/detail/consultform', params); 252 + dest.feedbacks.consultsUrl = helpers.urlFormat('/product/detail/consultform', params);
253 } 253 }
254 254
255 // 商品评价 255 // 商品评价
@@ -273,7 +273,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -273,7 +273,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
273 params.product_id = origin.id; 273 params.product_id = origin.id;
274 params.total = dest.feedbacks.commentsNum; 274 params.total = dest.feedbacks.commentsNum;
275 275
276 - dest.feedbacks.commentsUrl = helpers.url('/product/detail/comments', params); 276 + dest.feedbacks.commentsUrl = helpers.urlFormat('/product/detail/comments', params);
277 } 277 }
278 278
279 // 品牌信息 279 // 品牌信息
@@ -284,7 +284,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -284,7 +284,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
284 284
285 params.productSkn = origin.erpProductId; 285 params.productSkn = origin.erpProductId;
286 params.brandId = origin.brand.id; 286 params.brandId = origin.brand.id;
287 - dest.preferenceUrl = helpers.url('/product/detail/preference', params, ''); 287 + dest.preferenceUrl = helpers.urlFormat('/product/detail/preference', params, '');
288 } 288 }
289 289
290 dest.productSkn = origin.erpProductId; 290 dest.productSkn = origin.erpProductId;
@@ -431,7 +431,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -431,7 +431,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
431 431
432 // 悬浮的购物车信息 432 // 悬浮的购物车信息
433 dest.cartInfo = {}; 433 dest.cartInfo = {};
434 - dest.cartInfo.cartUrl = helpers.url('/cart/index/index', null); 434 + dest.cartInfo.cartUrl = helpers.urlFormat('/cart/index/index', null);
435 dest.cartInfo.numInCart = 0; 435 dest.cartInfo.numInCart = 0;
436 dest.cartInfo.goodsInstore = origin.storage; 436 dest.cartInfo.goodsInstore = origin.storage;
437 437
@@ -471,9 +471,9 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -471,9 +471,9 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
471 dest = procShowStatus(dest, showStatus, isBeginSale); 471 dest = procShowStatus(dest, showStatus, isBeginSale);
472 dest.cartInfo.limitProductCode = origin.limitProductCode; 472 dest.cartInfo.limitProductCode = origin.limitProductCode;
473 dest.cartInfo.limitCodeUrl = getLimitCodeUrl(origin.limitProductCode, origin.erpProductId, ua); 473 dest.cartInfo.limitCodeUrl = getLimitCodeUrl(origin.limitProductCode, origin.erpProductId, ua);
474 - dest.cartInfo.limitProductPay = helpers.url('/cart/index/orderEnsure'); // 待处理 相关处理逻辑还不存在 474 + dest.cartInfo.limitProductPay = helpers.urlFormat('/cart/index/orderEnsure'); // 待处理 相关处理逻辑还不存在
475 } else { 475 } else {
476 - dest.cartInfo.addToCartUrl = helpers.url('/product/buy_' + origin.id + '_' + 476 + dest.cartInfo.addToCartUrl = helpers.urlFormat('/product/buy_' + origin.id + '_' +
477 origin.goodsList.id + '.html'); // 待处理 相关处理逻辑还不存在 477 origin.goodsList.id + '.html'); // 待处理 相关处理逻辑还不存在
478 } 478 }
479 } else if (notForSale) { 479 } else if (notForSale) {
@@ -490,7 +490,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -490,7 +490,7 @@ const detailDataPkg = (origin, uid, vipLevel, ua) => {
490 } 490 }
491 491
492 // 底部简介的URL链接 待处理 492 // 底部简介的URL链接 待处理
493 - // dest.introUrl = helpers.url('/product/intro_' + origin.erpProductId + 493 + // dest.introUrl = helpers.urlFormat('/product/intro_' + origin.erpProductId +
494 // '/' + origin.cnAlphabet + '.html', null, ''); 494 // '/' + origin.cnAlphabet + '.html', null, '');
495 495
496 dest.introUrl = 'http://localhost:6001/product/detail/intro/' + origin.erpProductId; 496 dest.introUrl = 'http://localhost:6001/product/detail/intro/' + origin.erpProductId;
@@ -23,4 +23,4 @@ @@ -23,4 +23,4 @@
23 <div class="pagination-inner"> 23 <div class="pagination-inner">
24 </div> 24 </div>
25 </div> 25 </div>
26 -</div>  
  26 +</div>
@@ -30,7 +30,7 @@ exports.image = (url, width, height, mode) => { @@ -30,7 +30,7 @@ exports.image = (url, width, height, mode) => {
30 * @param {[string]} module 模块 30 * @param {[string]} module 模块
31 * @return {[string]} 31 * @return {[string]}
32 */ 32 */
33 -exports.url = (uri, qs, module) => { 33 +exports.urlFormat = (uri, qs, module) => {
34 const subDomain = '.m.yohobuy.com'; 34 const subDomain = '.m.yohobuy.com';
35 const subName = { 35 const subName = {
36 default: config.siteUrl, 36 default: config.siteUrl,