Authored by 沈志敏

Merge branch 'release/5.1' of git.yoho.cn:fe/yohobuywap-node into release/5.1

@@ -106,7 +106,7 @@ const favoriteBrand = (req, res, next) => { @@ -106,7 +106,7 @@ const favoriteBrand = (req, res, next) => {
106 /* 判断参数是否有效 */ 106 /* 判断参数是否有效 */
107 let id = req.body.id, 107 let id = req.body.id,
108 opt = req.body.opt || 'ok', 108 opt = req.body.opt || 'ok',
109 - uid = req.body.uid || req.cookies.appUid, 109 + uid = req.user.uid || (req.body.uid && parseInt(crypto.decrypt(null, req.body.uid))) || req.cookies.appUid,
110 isBrand = req.body.isBrand; 110 isBrand = req.body.isBrand;
111 111
112 if (!stringProcess.isNumeric(id) || !stringProcess.isNumeric(uid)) { 112 if (!stringProcess.isNumeric(id) || !stringProcess.isNumeric(uid)) {