Bläddra i källkod

Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/java/com/goafanti/admin/controller/AdminStarApiController.java
albertshaw 8 år sedan
förälder
incheckning
d390c703de

+ 1 - 0
src/main/java/com/goafanti/admin/controller/AdminStarApiController.java

@@ -120,4 +120,5 @@ public class AdminStarApiController extends BaseApiController {
 		starService.save(data, hot);
 		return res;
 	}
+	
 }

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -178,7 +178,7 @@
 			<a href="#">联系我们</a>
 		</div>
 		<div class="container support">
-			<a href="#">Copyright © 2016-2017 阿凡提 版权所有</a>
+			<a href="#">Copyright © 2016-2017 阿凡提 版权所有 湘ICP备15019731号-2</a>
 			<a href="#">技术支持:湖南智明科技有限公司</a>
 		</div>
 	</th:block>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 6 - 6
src/main/webapp/WEB-INF/views/portal/activity/activityIndex.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/highTech/evaluate/evaluate.html

@@ -91,7 +91,7 @@
 					<div class="form-group">
 						<label class="col-sm-2 control-label">注册时间 <span class="red">*</span></label>
 						<div class="col-sm-7 posi">
-							<input type="text" class="form-control" id="registDate">
+							<input id="registDate" class="form-control dateTime" type="text" placeholder="请选择日期"/> 
 						</div>
 					</div>
 					<div class="form-group">

+ 0 - 16
src/main/webapp/WEB-INF/views/portal/ipr/service.html

@@ -96,22 +96,6 @@
 			</div>
 			<div class="case_content">
 				<ul>
-					<li><a href="#"><img src="../../img/case_16.png"></a></li>
-					<li><a href="#"><img src="../../img/case_20.png"></a></li>
-					<li><a href="#"><img src="../../img/case_17.png"></a></li>
-					<li><a href="#"><img src="../../img/case_22.png"></a></li>
-					<li><a href="#"><img src="../../img/case_5.png"></a></li>
-					<li><a href="#"><img src="../../img/case_19.png"></a></li>
-					<li><a href="#"><img src="../../img/case_7.png"></a></li>
-					<li><a href="#"><img src="../../img/case_18.png"></a></li>
-					<li><a href="#"><img src="../../img/case_26.png"></a></li>
-					<li><a href="#"><img src="../../img/case_25.png"></a></li>
-					<li><a href="#"><img src="../../img/case_11.png"></a></li>
-					<li><a href="#"><img src="../../img/case_21.png"></a></li>
-					<li><a href="#"><img src="../../img/case_13.png"></a></li>
-					<li><a href="#"><img src="../../img/case_23.png"></a></li>
-					<li><a href="#"><img src="../../img/case_24.png"></a></li>
-
 					<li><a href="#"><img
 							th:src="${portalHost + '/img/case_16.png'}"></a></li>
 					<li><a href="#"><img

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -114,6 +114,7 @@
 	<footer>
 		<div th:replace="common::copyright"></div>
 	</footer>
+	<div class="msg"><span></span></div>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript"