Merge branch 'master' into release/1.0.0

 //****** 线上环境url，提交代码务必检查确认 ******
-// export const API_HOST = 'https://api.yoho.cn';
-// export const SERVICE_HOST = 'https://api.yoho.cn';
+export const API_HOST = 'https://api.yoho.cn';
+export const SERVICE_HOST = 'https://api.yoho.cn';
 export const APP_REPORT_HOST = 'https://app.yoho.cn/collect/v3';
 export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile';
 export const ACTIVITY_HOST = 'https://action.yoho.cn';
@@ -21,8 +21,8 @@ export const ACTIVITY_HOST = 'https://action.yoho.cn';
 // export const SERVICE_HOST = 'http://api-test2.dev.yohocorp.com';
 
 // *********测试3环境*********
- export const API_HOST = 'http://api-test3.dev.yohocorp.com';
- export const SERVICE_HOST = 'http://api-test3.dev.yohocorp.com';
+//  export const API_HOST = 'http://api-test3.dev.yohocorp.com';
+//  export const SERVICE_HOST = 'http://api-test3.dev.yohocorp.com';
 
 
 

@@ -60,9 +60,9 @@ function getResourceCode(channel){
 //获取首页的contentcode
 function getHomeContentCode(channel){
   let config = {
-    boy:'305e0a7a4aba32b08c6dd6dc5da47fa9',
+    boy:'5857d247888b8a603a22a221386fd8e9',
     // boy: '9cb6138be8e60c96f48107da481816c2',
-    girl:'5d9665e6a0a8ec5b2f0c126b36364d24'
+    girl:'fc6fece83dfa2b347555fff5c87a2178 '
   }
   return config[channel]?config[channel]:config['boy'];
 }