Merge branch 'release/5.1' into grey

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

@@ -270,7 +270,7 @@ const formatProduct = (productData, showTags, showNew, showSale, width, height,
     // TODO student price
     result.studentPrice = parseInt(productData.sales_price * 100 * 0.9) / 100;
     result.is_soon_sold_out = (productData.is_soon_sold_out === 'Y');
-    let url = helpers.urlFormat(`/product/pro_${productData.product_id}_${productData.goods_list[0].goods_id}/${productData.cn_alphabet}.html`);
+    let url = encodeURI(helpers.urlFormat(`/product/pro_${productData.product_id}_${productData.goods_list[0].goods_id}/${productData.cn_alphabet}.html`));
 
     result.url = url.replace('http://', '//');