Authored by zhangxiaoru

merge

@@ -180,6 +180,9 @@ const _shopCouponsList = (shopId, uid) => { @@ -180,6 +180,9 @@ const _shopCouponsList = (shopId, uid) => {
180 * @private 180 * @private
181 */ 181 */
182 const getBrandFavStatus = (params) => { 182 const getBrandFavStatus = (params) => {
  183 + if (params.uid === 'undefined') {
  184 + params.uid = 0;
  185 + }
183 return api.get('', { 186 return api.get('', {
184 method: 'app.favorite.isFavorite', 187 method: 'app.favorite.isFavorite',
185 uid: params.uid || 0, 188 uid: params.uid || 0,
@@ -270,7 +270,7 @@ const formatProduct = (productData, showTags, showNew, showSale, width, height, @@ -270,7 +270,7 @@ const formatProduct = (productData, showTags, showNew, showSale, width, height,
270 // TODO student price 270 // TODO student price
271 result.studentPrice = parseInt(productData.sales_price * 100 * 0.9) / 100; 271 result.studentPrice = parseInt(productData.sales_price * 100 * 0.9) / 100;
272 result.is_soon_sold_out = (productData.is_soon_sold_out === 'Y'); 272 result.is_soon_sold_out = (productData.is_soon_sold_out === 'Y');
273 - let url = helpers.urlFormat(`/product/pro_${productData.product_id}_${productData.goods_list[0].goods_id}/${productData.cn_alphabet}.html`); 273 + let url = encodeURI(helpers.urlFormat(`/product/pro_${productData.product_id}_${productData.goods_list[0].goods_id}/${productData.cn_alphabet}.html`));
274 274
275 result.url = url.replace('http://', '//'); 275 result.url = url.replace('http://', '//');
276 276