Merge branch 'release-201844-wangcz' of ssh://10.10.100.21/source/platform-b2c into release-201844-wangcz

src/main/resources/ptest/sys.properties

@@ -59,9 +59,9 @@ inquiryServiceInnerUrl=http://192.168.100.9:8080
 messageServiceUrl=http://192.168.100.2:8080
 
 #b2b
-b2b=https://test-b2b.uuzcc.cn
-b2bDomain=https://test-b2b.uuzcc.cn
-b2bInner=http://192.168.100.13:8080
+b2b=https://rel-b2b.uuzcc.cn
+b2bDomain=https://rel-b2b.uuzcc.cn
+b2bInner=http://192.168.100.52:8080
 
 #lottery
 lottery=http://192.168.253.3:26789

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -109,8 +109,9 @@ define([ 'app/app' ], function(app) {
             }
             if ($scope.endDate && bool == 2) {
                 $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
-                $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                $scope.endDate = new Date($scope.endDate.getTime() - 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
             }
+            $scope.startDate = new Date($scope.startDate.getTime() - 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
         };
 
         $scope.detailOpenClick = function (type) {

src/main/webapp/resources/js/usercenter/controllers/forstore/messagePersonalCtrl.js

@@ -322,6 +322,9 @@ define(['app/app'], function(app) {
         var getData = function () {
             InternalMessage.getUrl({}, function(data) {
                 var url = data.url;
+                if (url == "http://192.168.100.2:8080") {
+                    url = 'https://test-message.uuzcc.cn';
+                }
                 var param = {
                     'receiverUu': data.userUU,
                     'receiverEnuu': data.enUU,
@@ -343,6 +346,9 @@ define(['app/app'], function(app) {
             InternalMessage.getUrl({}, function(info) {
                 if (info) {
                     var url = info.url;
+                    if (url == "http://192.168.100.2:8080") {
+                        url = 'https://test-message.uuzcc.cn';
+                    }
                     var param = {
                         'receiverUu': info.userUU,
                         'receiverEnuu': info.enUU,

src/main/webapp/resources/view/common/sidebar.html

@@ -42,7 +42,7 @@
 	#sidebar .sidebar-content li .sidebar-menu {
 		position: absolute;
 		display: block;
-		right: 0;
+		right: -8px;
 		top: 0;
 		bottom: 0;
 		width: 200px;
@@ -63,11 +63,11 @@
 	}
 	#sidebar .sidebar-content li:hover .sidebar-menu {
 		display: block;
-		-webkit-transform: translateX(-72px);
-		-moz-transform: translateX(-72px);
-		-ms-transform: translateX(-72px);
-		-o-transform: translateX(-72px);
-		transform: translateX(-72px);
+		-webkit-transform: translateX(-82px);
+		-moz-transform: translateX(-82px);
+		-ms-transform: translateX(-82px);
+		-o-transform: translateX(-82px);
+		transform: translateX(-82px);
 	}
 	#sidebar .sidebar-content li .foot-record{
 		/* display: none; */