Merge branch 'redesign‌-260706' into dev

common/components/dada/dada.php

@@ -206,7 +206,7 @@ class dada
         } else {
             //测试 :商户id: 73753    门店id: 11047059
             $config->setSourceId(73753);
-            $config->setHost("http://newopen.qa.imdada.cn");
+            $config->setHost("http://newopen.ndev.imdada.cn");
         }
         $config->setAppKey($appKey);
         $config->setAppSecret($appSecret);

common/components/delivery/platform/dada/Auth.php

@@ -23,7 +23,7 @@ class Auth
     const AUTHORIZE_URL_PROD = 'https://newopen.imdada.cn/';
     const TOKEN_URL_PROD = '';
     
-    const AUTHORIZE_URL_TEST = 'https://newopen.qa.imdada.cn/';
+    const AUTHORIZE_URL_TEST = 'https://newopen.ndev.imdada.cn/';
     const TOKEN_URL_TEST = '';
     
     protected $appKey;

common/components/delivery/platform/dada/Dada.php

@@ -9,7 +9,7 @@ class Dada
     const FORMAT = 'json';
 
     // 测试环境和生产环境基础 URL
-    const TEST_BASE_URL = 'https://newopen.qa.imdada.cn';
+    const TEST_BASE_URL = 'https://newopen.ndev.imdada.cn';
     const PROD_BASE_URL = 'https://newopen.imdada.cn';
 
     protected $baseUrl;
@@ -33,8 +33,8 @@ class Dada
             $this->appSecret = '828a03677a1c00a3a5b3c59209c4433d';
         } else {
             // 测试环境配置
-            $this->baseUrl = self::PROD_BASE_URL; // TODO
-            //$this->baseUrl = self::TEST_BASE_URL;
+            // $this->baseUrl = self::PROD_BASE_URL; // TODO
+            $this->baseUrl = self::TEST_BASE_URL;
             $this->appKey = 'dadaf2279d901a5ba40';
             $this->appSecret = '828a03677a1c00a3a5b3c59209c4433d';
         }