Authored by 郭成尧

'合并代码''

@@ -14,6 +14,8 @@ exports.index = (req, res, next) => { @@ -14,6 +14,8 @@ exports.index = (req, res, next) => {
14 }; 14 };
15 15
16 indexModel.index(params).then(result => { 16 indexModel.index(params).then(result => {
  17 + result.isLogin = true;
  18 +
17 if (result) { 19 if (result) {
18 console.log(result); 20 console.log(result);
19 res.render('index', result); 21 res.render('index', result);
@@ -28,17 +30,17 @@ exports.index = (req, res, next) => { @@ -28,17 +30,17 @@ exports.index = (req, res, next) => {
28 // pageFooter: 1, 30 // pageFooter: 1,
29 // cartUrl: '//m.dev.yohobuy.com/cart/index/index', 31 // cartUrl: '//m.dev.yohobuy.com/cart/index/index',
30 // signinUrl: '//m.dev.yohobuy.com/signin.html?refer=%2F%2Fm.dev.yohobuy.com%2Fhome', 32 // signinUrl: '//m.dev.yohobuy.com/signin.html?refer=%2F%2Fm.dev.yohobuy.com%2Fhome',
31 - // isLogin: 1,  
32 - // wait_pay_num: 0,  
33 - // wait_cargo_num: 0,  
34 - // send_cargo_num: 0,  
35 - // brand_favorite_total: 0,  
36 - // product_favorite_total: 0,  
37 - // inbox_total: 0,  
38 - // comment_total: 0,  
39 - // refund_exchange_num: 0,  
40 - // yoho_coin_num: 0,  
41 - // coupon_num: 0,  
42 - // product_browse: 0 33 + // isLogin: true,
  34 + // wait_pay_num: 99,
  35 + // wait_cargo_num: 99,
  36 + // send_cargo_num: 99,
  37 + // brand_favorite_total: 99,
  38 + // product_favorite_total: 99,
  39 + // inbox_total: 99,
  40 + // comment_total: 99,
  41 + // refund_exchange_num: 99,
  42 + // yoho_coin_num: 99,
  43 + // coupon_num: 99,
  44 + // product_browse: 99
43 // }); 45 // });
44 }; 46 };
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
99 width: 212px; 99 width: 212px;
100 100
101 &.highlight { 101 &.highlight {
102 - background: rgba(200,200,200,.1) !important; 102 + background: rgba(200, 200, 200, 0.1) !important;
103 } 103 }
104 104
105 p { 105 p {