Merge branch 'feature/serviceCenter-0101' into uuhelper/01

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/assets/css/main.css

@@ -490,6 +490,9 @@ footer .txt2{
 	height: 56px;
 	border-bottom: 1px solid #d2d2d2;
 }
+.hot-news li:hover a{
+	color: #2867c2;
+}
 .hot-news li:last-child{
 	border-bottom: none;
 }

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_question.html

@@ -105,6 +105,9 @@
     .section2 .content p a:hover{
     text-decoration: underline;
     }
+    .section2{
+    background: #f8f8f8;
+    }
 </#macro>
 <@layout>
 <section id="banner" class="banner">

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/content_version.html

@@ -173,11 +173,11 @@
     text-overflow: ellipsis;
     display: -webkit-box;
     -moz-box-orient: vertical;
-    -moz-line-clamp: 3;
+    -moz-line-clamp: 2;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
+    -webkit-line-clamp: 2;
     -o-box-orient: vertical;
-    -o-line-clamp: 3;
+    -o-line-clamp: 2;
     }
 </#macro>
 <@layout>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_b2b.html

@@ -37,7 +37,7 @@
 	font-size: 14px;
 	color: #bac7dd;
 	}
-	.banner .express:hover a{
+	.banner .express a:hover{
 	background: #217fc9;
 	color: #fff;
 	border: none;

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_contact.html

@@ -30,7 +30,7 @@
 						<ul>
 							<li><strong>总&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;机：</strong><span class="text-num">0755-26994749</span></li>
 							<li><strong>合作加盟：</strong><span class="text-num">15814041616 (廖先生)</span></li>
-							<li><strong>售&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;前：</strong><span class="text-num">800-830-1818</span></li>
+							<li><strong>售&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;前：</strong><span class="text-num">0755-26994808</span></li>
 							<li><strong>售&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;后：</strong><span class="text-num">400-830-1818</span></li>
 							<li><strong>邮&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;箱：</strong><span class="text-num">${OPTION('web_administrator_email')!'sa@usoftchina.com'}</span></li>
 						</ul>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_mall.html

@@ -36,7 +36,7 @@
 	font-size: 14px;
 	color: #bac7dd;
 	}
-	.banner .express:hover a{
+	.banner .express a:hover{
 	background: #217fc9;
 	color: #fff;
 	border: none;

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_saas.html

@@ -37,7 +37,7 @@
 	font-size: 14px;
 	color: #bac7dd;
 	}
-	.banner .express:hover a{
+	.banner .express a:hover{
 	background: #217fc9;
 	color: #fff;
 	border: none;

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/page_version.html

@@ -157,7 +157,18 @@
     padding: 0 50px;
     font-size: 14px;
     color:#787878;
+    line-height: 30px;
     text-align: left;
+    overflow: hidden;
+    word-break: break-all;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -moz-box-orient: vertical;
+    -moz-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    -o-box-orient: vertical;
+    -o-line-clamp: 2;
     }
 </#macro>
 <@layout>
@@ -175,10 +186,10 @@
     <div class="section-item breadcrumbs">
         <div class="content">
             <ul>
-                <li><a href="">当前位置:</a></li>
-                <li><a href="">首页&nbsp;&gt;</a></li>
+                <li><a>当前位置:</a></li>
+                <li><a href="${CPATH}/">首页&nbsp;&gt;</a></li>
                 <li><a href="">服务中心&nbsp;&gt;</a></li>
-                <li><a href="">常见问题</a></li>
+                <li><a>升级公告</a></li>
             </ul>
         </div>
     </div>

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_events.html

@@ -245,6 +245,7 @@ $(document).ready(function() {
 	top: 0px;
 	left: 66px;
 	z-index: 10000;
+	box-shadow: 3px 3px 3px #1e1e1e;
 	}
 	.main-content .container .course10 .pop{
 	top: 0;
@@ -256,7 +257,7 @@ $(document).ready(function() {
 	font-size: 14px;
 	color: #2363c2;
 	height: 30px;
-	line-height: 30px;
+	line-height: 20px;
 	width: 280px;
 	height: auto;
 	}

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_news.html

@@ -34,7 +34,7 @@ $(document).ready(function() {
 <@layout>
 <style>
 	#banner {
-		background: url("${CTPATH}/images/question/banner.jpg") no-repeat;
+		background: url("${CTPATH}/images/question/banner1.jpg") no-repeat;
 		padding: 88px 0;
 		color: #fff;
 		background-size:100% 100%;
@@ -207,7 +207,7 @@ $(document).ready(function() {
 		margin-right: 40px;
 		line-height: 23px;
 		width: 200px;
-		height: 160px;
+		height: 170px;
 	}
 	.allNews .news-detail{
 		width: 460px;
@@ -240,7 +240,7 @@ $(document).ready(function() {
         line-height: 23px;
         font-size: 14px;
         color: #787878;
-        margin: 20px 0 30px 0;
+        margin: 20px 0 20px 0;
 		word-break: break-all;
 		text-overflow: ellipsis;
 		display: -webkit-box;

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_question.html

@@ -109,6 +109,9 @@
     color: #255cb6;
     font-weight: bold;
     }
+    .section5{
+    background: #f8f8f8;
+    }
 </#macro>
 <@layout>
 <section id="banner" class="banner">

jpress-web-template-usoftchina/src/main/webapp/templates/usoftchina/taxonomy_version.html

@@ -243,10 +243,12 @@
         <div class="content">
             <@jp.contents module="version" pageSize="4" orderBy="meta:upgrade_time">
                 <#list contents as cont>
-                    <div class="version-list">
-                        <div><span><a href="${cont.url!}">UAS管理系统 ${(cont.getMetadataByKey("version_number"))!}版本</a></span><em>${(cont.getMetadataByKey("upgrade_time"))!}</em></div>
-                        <p>${(cont.getMetadataByKey("version_summary"))!}</p>
-                    </div>
+                    <a href="${cont.url!}">
+                        <div class="version-list">
+                            <div><span>UAS管理系统 ${(cont.getMetadataByKey("version_number"))!}版本</span><em>${(cont.getMetadataByKey("upgrade_time"))!}</em></div>
+                            <p>${(cont.getMetadataByKey("version_summary"))!}</p>
+                        </div>
+                    </a>
                 </#list>
             </@jp.contents>
         </div>