merge

@@ -180,6 +180,9 @@ const _shopCouponsList = (shopId, uid) => {
  * @private
  */
 const getBrandFavStatus = (params) => {
+    if (params.uid === 'undefined') {
+        params.uid = 0;
+    }
     return api.get('', {
         method: 'app.favorite.isFavorite',
         uid: params.uid || 0,

@@ -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://', '//');