Merge branch 'master' into dev

src/main/webapp/resources/js/common/services.js

@@ -151,7 +151,17 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 					// defer.promise.then(function (resolve) {
 					// 	$rootScope.b2bUrl = resolve.url;
 					// });
-					$rootScope.b2bUrl = this.getRootPath().indexOf('usoftchina.com') > -1 ? 'https://b2b.usoftchina.com' : 'http://192.168.253.12:9000/b2b-test';
+					if (this.getRootPath().indexOf('tb2c.usoftchina.com') > -1 || this.getRootPath().indexOf('tmall.usoftchina.com') > -1) {
+                        $rootScope.b2bUrl = 'https://tb2b.usoftchina.com'
+					} else if (this.getRootPath().indexOf('tb2c.usoftchina.com') > -1 || this.getRootPath().indexOf('rmall.usoftchina.com') > -1) {
+                        $rootScope.b2bUrl = 'https://rb2b.usoftchina.com'
+					} else if (this.getRootPath().indexOf('pb2c.usoftchina.com') > -1 || this.getRootPath().indexOf('pmall.usoftchina.com') > -1) {
+                        $rootScope.b2bUrl = 'https://pb2b.usoftchina.com'
+                    } else if (this.getRootPath().indexOf('b2c.usoftchina.com') > -1 || this.getRootPath().indexOf('mall.usoftchina.com') > -1) {
+                        $rootScope.b2bUrl = 'https://b2b.usoftchina.com'
+					} else {
+                        $rootScope.b2bUrl = 'https://tb2b.usoftchina.com'
+					}
 				}
 				return $rootScope.b2bUrl;
 			}