fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 7efb3744ad8cf819d86f62e3b0ed68dd5f0738eb 1 parent ea9714d1

add change

Inline Side-by-side
Showing 3 changed files with 6 additions and 8 deletions
@@ -396,7 +396,6 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => { @@ -396,7 +396,6 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
396 result.dis = true; 396 result.dis = true;
397 } else { 397 } else {
398 result.openSoon = true; 398 result.openSoon = true;
399 - result.hadLimitedCode = false;  
400 } 399 }
401 result.getLimitedCode = true; 400 result.getLimitedCode = true;
402 break; 401 break;
@@ -404,14 +403,12 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => { @@ -404,14 +403,12 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
404 result.buyNow = true; 403 result.buyNow = true;
405 result.dis = true; 404 result.dis = true;
406 result.limitedCodeSoldOut = true; 405 result.limitedCodeSoldOut = true;
407 - result.hadLimitedCode = false;  
408 break; 406 break;
409 case 3: // 开售后，商品已经售罄 407 case 3: // 开售后，商品已经售罄
410 result.soldOut = true; 408 result.soldOut = true;
411 break; 409 break;
412 case 4:// 开售后，立即购买（用户已领取限购码） 410 case 4:// 开售后，立即购买（用户已领取限购码）
413 result.buyNow = true; 411 result.buyNow = true;
414 - result.dis = false;  
415 result.hadLimitedCode = true; 412 result.hadLimitedCode = true;
416 if (uid) { // 限购码失效 413 if (uid) { // 限购码失效
417 result.getLimitedCodeDis = true; 414 result.getLimitedCodeDis = true;
@@ -419,7 +416,6 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => { @@ -419,7 +416,6 @@ const _getFashionTopGoodsStatus = (uid, showStatus, isBeginSale) => {
419 break; 416 break;
420 case 5: // 开售前，限购码已被抢光（用户未领取限购码） 417 case 5: // 开售前，限购码已被抢光（用户未领取限购码）
421 result.openSoon = true; 418 result.openSoon = true;
422 - result.hadLimitedCode = true;  
423 result.limitedCodeSoldOut = true; 419 result.limitedCodeSoldOut = true;
424 break; 420 break;
425 case 6: // 开售前，即将开售（用户已领取限购码） 421 case 6: // 开售前，即将开售（用户已领取限购码）
@@ -18,11 +18,11 @@ module.exports = { @@ -18,11 +18,11 @@ module.exports = {
18 domains: { 18 domains: {
19 favApi: 'http://192.168.102.31:8092/brower', 19 favApi: 'http://192.168.102.31:8092/brower',
20 20
21 - //api: 'http://api-test1.yohops.com:9999/',  
22 - //service: 'http://service-test1.yohops.com:9999/', 21 + api: 'http://api-test3.yohops.com:9999/',
  22 + service: 'http://service-test3.yohops.com:9999/',
23 23
24 - api: 'http://api.yoho.cn/',  
25 - service: 'http://service.yoho.cn/', 24 + //api: 'http://api.yoho.cn/',
  25 + //service: 'http://service.yoho.cn/',
26 search: 'http://192.168.102.216:8080/yohosearch/' 26 search: 'http://192.168.102.216:8080/yohosearch/'
27 }, 27 },
28 subDomains: { 28 subDomains: {
@@ -28,6 +28,8 @@ module.exports = () => { @@ -28,6 +28,8 @@ module.exports = () => {
28 req.user.isStudent = req.cookies.isStudent || 0; 28 req.user.isStudent = req.cookies.isStudent || 0;
29 } 29 }
30 30
  31 + req.user.uid = 20001048;
  32 +
31 // 记住我 33 // 记住我
32 // if (_.isEmpty(req.user) && req.cookies.isRemember === 'true' && req.cookies.remem) { 34 // if (_.isEmpty(req.user) && req.cookies.isRemember === 'true' && req.cookies.remem) {
33 // return cache.get(req.cookies.remem).then((result) => { 35 // return cache.get(req.cookies.remem).then((result) => {