Browse Source

Merge branch 'master' of jishutao/jitao-server into test

liliang4869 7 years ago
parent
commit
005339dafb

+ 5 - 5
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -157,7 +157,7 @@
 								 <span class="colorTime" th:if="${u2.validityPeriod}==null" th:text="无期限"></span>
 								 <span class="colorTime" th:if="${u2.validityPeriod}!=null" th:text="${#dates.format(u2.validityPeriod,'yyyy-MM-dd')+'到期'}"></span>
 								 <span class="colorOrange" th:if="${u2.demandType}==5" th:text="${u2.fundForPersonnel}==null?'人才:¥0元/月':${'人才:¥'+u2.fundForPersonnel+'元/月'}"></span>
-								 <span class="colorOrange" th:if="${u2.demandType}==3" th:text="${u2.fundForCrow}==null?'面议':${'期望资金:¥'+u2.fundForCrowd}+'万'"></span>
+								 <span class="colorOrange" th:if="${u2.demandType}==3" th:text="${u2.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+u2.fundForCrowd}+'万'"></span>
 							</p>
 						</div>
 						</a>
@@ -179,7 +179,7 @@
 										<span class="colorOrange" th:if="${u3.demandType}==3 and ${u3.researchType}==null">用途:未知</span>
 									<span class="colorOrange" th:if="${u3.demandType}==3 and ${u3.researchType}!=null" th:text="${u3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
 									<span class="colorOrange" th:if="${u3.demandType}==5" th:text="${u3.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+u3.fundForPersonnel+'元/月'}"></span>
-									<span class="colorOrange" th:if="${u3.demandType}==3" th:text="${u3.fundForCrowd}==null?'面议':${'期望资金:¥'+u3.fundForCrowd+'万'}"></span>
+									<span class="colorOrange" th:if="${u3.demandType}==3" th:text="${u3.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+u3.fundForCrowd+'万'}"></span>
 
 								</div>
 								
@@ -227,7 +227,7 @@
 							<p>
 								 <p class="problemDes" th:text="${h2.problemDes}"></p>	
 								 <span class="colorOrange" th:if="${h2.demandType}==5" th:text="${h2.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+h2.fundForPersonnel}+'元/月'"></span>
-								 <span class="colorOrange" th:if="${h2.demandType}==3" th:text="${h2.fundForCrowd}==null?'面议':${'期望资金:¥'+h2.fundForCrowd}+'万'"></span>
+								 <span class="colorOrange" th:if="${h2.demandType}==3" th:text="${h2.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+h2.fundForCrowd}+'万'"></span>
 								<span class="colorTime">	<img th:src="${portalHost+'/img/newMenu/demand-5.jpg'}" alt=""></span>
 							</p>
 						</div>
@@ -251,7 +251,7 @@
 							<span class="colorOrange" th:if="${h3.researchType}==null and ${h3.demandType}==3">用途:未知</span>
 									<span class="colorOrange" th:if="${h3.demandType}==3 and ${h3.researchType}!=null" th:text="${h3.researchType}==0?'用途:研发':'用途:扩大再生产'"></span>
 											<span class="colorOrange" th:if="${h3.demandType}==5" th:text="${h3.fundForPersonnel}==null?'人才:¥0.00元/月':${'人才:¥'+h3.fundForPersonnel+'元/月'}"></span>
-									<span class="colorOrange" th:if="${h3.demandType}==3" th:text="${h3.fundForCrowd}==NULL?'面议':${'期望资金:¥'+h3.fundForCrowd+'万'}"></span>
+									<span class="colorOrange" th:if="${h3.demandType}==3" th:text="${h3.fundForCrowd}==null?'期望资金:面议':${'期望资金:¥'+h3.fundForCrowd+'万'}"></span>
 								</div>
 							</p>
 							<p class="introduceP" >
@@ -376,7 +376,7 @@
 								<p th:text="${fundDemand.problemDes}"></p>
 								<div class="float-left">
 									<p>期望资金</p>
-									<p th:text="${fundDemand.fundForCrowd}==null?'面议':${'¥'+fundDemand.fundForCrowd+'万'}"></p>
+									<p th:text="${fundDemand.fundForCrowd}==null?'期望资金:面议':${'¥'+fundDemand.fundForCrowd+'万'}"></p>
 								</div>
 								<div class="float-right">
 									<p>资金用途</p>