Merge remote-tracking branch 'origin/hotfix-1506-hb'

src/main/webapp/resources/css/index.css

@@ -5307,7 +5307,7 @@ a.order-detail {
 	0%   { transform: rotate(360deg); }
 	100% { transform: rotate(0deg); }
 }
-.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
+.loading>.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
 .outer {
 	background-repeat: no-repeat;
 	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url("../img/all/loading.png"); animation: spin 800ms infinite linear; }

src/main/webapp/resources/css/index_mobile.css

@@ -268,7 +268,7 @@ a {
 	0%   { transform: rotate(360deg); }
 	100% { transform: rotate(0deg); }
 }
-.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
+.loading>.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
 .outer {
 	background-repeat: no-repeat;
 	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url("../img/all/loading.png"); animation: spin 800ms infinite linear; }

src/main/webapp/resources/css/register.css

@@ -369,7 +369,7 @@ form {
 	0%   { transform: rotate(360deg); }
 	100% { transform: rotate(0deg); }
 }
-.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
+.loading>.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
 .outer {
 	background-repeat: no-repeat;
 	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url("../img/all/loading.png"); animation: spin 800ms infinite linear; }

src/main/webapp/resources/css/serve.css

@@ -1483,7 +1483,7 @@ label {
 	0%   { transform: rotate(360deg); }
 	100% { transform: rotate(0deg); }
 }
-.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
+.loading>.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
 .outer {
 	background-repeat: no-repeat;
 	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url("../img/all/loading.png"); animation: spin 800ms infinite linear; }

src/main/webapp/resources/css/signin.css

@@ -408,7 +408,7 @@ h1,h2,h3 {
 	0%   { transform: rotate(360deg); }
 	100% { transform: rotate(0deg); }
 }
-.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
+.loading>.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
 .outer {
 	background-repeat: no-repeat;
 	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url("../img/all/loading.png"); animation: spin 800ms infinite linear; }

src/main/webapp/resources/css/storage.css

@@ -186,7 +186,7 @@ a {
 	0%   { transform: rotate(360deg); }
 	100% { transform: rotate(0deg); }
 }
-.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
+.loading>.wrap { width: 64px; height: 64px; position: absolute;left: 50%;top:50%;margin-left:-32px;margin-top: -32px; }
 .outer {
 	background-repeat: no-repeat;
 	background-size:100%; position: absolute; width: 100%; height: 100%; background-image: url("../img/all/loading.png"); animation: spin 800ms infinite linear; }

src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -461,7 +461,7 @@ input[type="radio"], input[type="checkbox"] {
     }
     .detail .top .top-right{
         position:absolute;
-        top:3px;
+        top:30px;
         right:0;
         color:#999;
     }