瀏覽代碼

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/jitao-server.git into test

limin 7 年之前
父節點
當前提交
1d0217a36a

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

@@ -212,7 +212,7 @@
 					<a th:href="@{/portal/thinkTank/policyList?type=1}"><span class="line"></span><span>></span></a> 
 					
 				</h4>
-				<img th:src="(policys==null or ${policys[0].titleImg}==null or ${policys[0].titleImg} == '')?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
+				<img th:if="${policys[0]}!=null" th:src="(${policys[0].titleImg}==null or ${policys[0].titleImg} == '')?${portalHost+'/img/index/index_new2.jpg'}:${avatarUploadHost+policys[0].titleImg}" alt="">
 				<ul>				
 					<li th:each="p,pStatus:${policys}" th:if="${pStatus.index}==0">
 						<a th:href="@{/portal/news/newsDetail(id=${p.id},type=0)}">

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

@@ -135,7 +135,7 @@
             <li>南京</li>
             <li>合肥</li>
             <li>武汉</li>
-            <li>湖南</li>
+            <li>长沙</li>
             <li>南昌</li>
             <li>成都</li>
             <li>贵州</li>