Authored by 于良

Merge branch '6.4.0' into 6.4.1

@@ -7,7 +7,7 @@ let InitialState = Record({ @@ -7,7 +7,7 @@ let InitialState = Record({
7 channel: 1, // 1 - boy, 2 - girl, 3 - kid, 4 - lifestyle, 5 - yoho 7 channel: 1, // 1 - boy, 2 - girl, 3 - kid, 4 - lifestyle, 5 - yoho
8 host: 'http://api.yoho.cn', 8 host: 'http://api.yoho.cn',
9 serviceHost: 'http://api.yoho.cn', 9 serviceHost: 'http://api.yoho.cn',
10 - singleHost: 'http://single.yoho.cn/favorite', 10 + singleHost: 'http://api.yoho.cn',
11 }); 11 });
12 12
13 export default InitialState; 13 export default InitialState;
@@ -9,7 +9,7 @@ let InitialState = Record({ @@ -9,7 +9,7 @@ let InitialState = Record({
9 serviceHost: 'http://api.yoho.cn', 9 serviceHost: 'http://api.yoho.cn',
10 billHost: 'http://bill.m.yohobuy.com', 10 billHost: 'http://bill.m.yohobuy.com',
11 globalApiHost: 'http://api-global.yohobuy.com', 11 globalApiHost: 'http://api-global.yohobuy.com',
12 - singleHost: 'http://single.yoho.cn', 12 + singleHost: 'http://api.yoho.cn',
13 socialHost: 'http://social.yoho.cn', 13 socialHost: 'http://social.yoho.cn',
14 }); 14 });
15 15
@@ -207,11 +207,11 @@ export default class MineService { @@ -207,11 +207,11 @@ export default class MineService {
207 207
208 /** 208 /**
209 * 获取收藏商品数量 209 * 获取收藏商品数量
210 - * http://single.yoho.cn/favorite/ 210 + * http://api.yoho.cn
211 */ 211 */
212 async getMineFavProNum(fromPage = 'aFP_My') { 212 async getMineFavProNum(fromPage = 'aFP_My') {
213 return await this.api.get({ 213 return await this.api.get({
214 - url: '/favorite/', 214 + url: '',
215 body: { 215 body: {
216 method: 'app.favorite.getFavoriteCount', 216 method: 'app.favorite.getFavoriteCount',
217 fromPage, 217 fromPage,
@@ -7,7 +7,7 @@ let InitialState = Record({ @@ -7,7 +7,7 @@ let InitialState = Record({
7 channel: 1, // 1 - boy, 2 - girl, 3 - kid, 4 - lifestyle, 5 - yoho 7 channel: 1, // 1 - boy, 2 - girl, 3 - kid, 4 - lifestyle, 5 - yoho
8 host: 'http://api.yoho.cn', 8 host: 'http://api.yoho.cn',
9 serviceHost: 'http://api.yoho.cn', 9 serviceHost: 'http://api.yoho.cn',
10 - singleHost: 'http://single.yoho.cn/favorite', 10 + singleHost: 'http://api.yoho.cn',
11 yohoodTicketSkn:'51335912', 11 yohoodTicketSkn:'51335912',
12 yohoodTicketsSkn: '51335908', 12 yohoodTicketsSkn: '51335908',
13 showAntiFraud: true, 13 showAntiFraud: true,
@@ -5,7 +5,7 @@ import {Record, List, Map} from 'immutable'; @@ -5,7 +5,7 @@ import {Record, List, Map} from 'immutable';
5 let InitialState = Record({ 5 let InitialState = Record({
6 platform: 'ios', // ios, android 6 platform: 'ios', // ios, android
7 host: 'http://api.yoho.cn', 7 host: 'http://api.yoho.cn',
8 - singleApiHost: 'http://single.yoho.cn/favorite', 8 + singleApiHost: 'http://api.yoho.cn',
9 liveHost: 'http://apilive.yoho.cn', 9 liveHost: 'http://apilive.yoho.cn',
10 }); 10 });
11 11