换用新的api和service地址

@@ -24,8 +24,8 @@ class Yohobuy
     // const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     /* 测试环境 */
-    const API_URL = 'http://test2.open.yohobuy.com/';
-    const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+    const API_URL = 'http://devapi.yoho.cn:58078/';
+    const SERVICE_URL = 'http://devservice.yoho.cn:58077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
     const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/';        //我的订单
     const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL

@@ -276,17 +276,13 @@
     seajs.use('js/me/personal-details');
 </script>
 {{/if}}
-<<<<<<< HEAD
 {{#if browseRecordPage}}
 <script>
     seajs.use('js/me/browse-record');
 </script>
 {{/if}}
-=======
 {{#if logisticInfoPage}}
 <script>
     seajs.use('js/me/logistic');
 </script>
 {{/if}}
-
->>>>>>> feature/logistic