merge

@@ -393,7 +393,7 @@ class CartData
         $param['delivery_way'] = $deliveryWay;
 
         /* tar add 161130 结算优化 */
-        if ($times === 2) {
+        if ($times === 2 || $times === '2') {
             $param['is_continue_buy'] = 'Y';
         } else {
             $param['is_continue_buy'] = 'N';

@@ -13205,7 +13205,7 @@ var appIconPosition = {
 
 $('.nav-back').on('touchend', function() {
     richTip.show(
-        ['超过支付失效后订单会被取消，', '请尽快到我的订单完成支付哦！'],
+        ['超过支付时效后订单会被取消，', '请尽快到我的订单完成支付哦！'],
         [
             {
                 href: '/home/orders',

@@ -25,7 +25,7 @@ var appIconPosition = {
 
 $('.nav-back').on('touchend', function() {
     richTip.show(
-        ['超过支付失效后订单会被取消，', '请尽快到我的订单完成支付哦！'],
+        ['超过支付时效后订单会被取消，', '请尽快到我的订单完成支付哦！'],
         [
             {
                 href: '/home/orders',

@@ -15,16 +15,16 @@ define('USE_INTER_FACE_SHUNT', false);//分流开关
 
 #dev环境
 
-define('API_URL', 'http://dev-api.yohops.com:9999/');
-define('SERVICE_URL', 'http://dev-service.yohops.com:9999/');
-define('YOHOBUY_URL', 'http://www.yohobuy.com/');
-define('SERVICE_NOTIFY', 'http://dev-service.yohops.com:9999/');
+//define('API_URL', 'http://dev-api.yohops.com:9999/');
+//define('SERVICE_URL', 'http://dev-service.yohops.com:9999/');
+//define('YOHOBUY_URL', 'http://www.yohobuy.com/');
+//define('SERVICE_NOTIFY', 'http://dev-service.yohops.com:9999/');
 
 
-//define('API_URL', 'http://api-test1.yohops.com:9999/');
-//define('SERVICE_URL', 'http://service-test1.yohops.com:9999/');
-//define('YOHOBUY_URL', 'http://www.yohobuy.com/');
-//define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');
+define('API_URL', 'http://api-test3.yohops.com:9999/');
+define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
+define('YOHOBUY_URL', 'http://www.yohobuy.com/');
+define('SERVICE_NOTIFY', 'http://service-test3.yohops.com:9999/');
 
 $application = new Application(APPLICATION_PATH . '/configs/application.developer.ini');
 $application->bootstrap()->run();

@@ -13,8 +13,8 @@ defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');
 
 define('USE_INTER_FACE_SHUNT', true);//分流开关
 
-define('API_URL', 'http://api-test2.yohops.com:9999/');
-define('SERVICE_URL', 'http://service-test2.yohops.com:9999/');
+define('API_URL', getenv('TEST_API') ? getenv('TEST_API') : 'http://api-test2.yohops.com:9999/');
+define('SERVICE_URL', getenv('TEST_SERVICE') ? getenv('TEST_SERVICE') : 'http://service-test2.yohops.com:9999/');
 define('YOHOBUY_URL', 'http://www.yohobuy.com/');
 define('SERVICE_NOTIFY', 'http://service-test1.yohops.com:9999/');