Przeglądaj źródła

隐藏收藏、关注、部分需求

liliang4869 7 lat temu
rodzic
commit
fbd42f9510

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -1124,7 +1124,7 @@ order by release_date desc limit #{0}
   
     <select id="searchDemandList" resultType="com.goafanti.demand.bo.DemandListBo">
   select a.name,a.id,create_time as createTime ,picture_url as pictureUrl,data_category as dataCategory,is_hot as isHot,demand_type as demandType,
-  industry_category_a as industryCategoryA,industry_category_b as industryCategoryB,ic.name as industryCategory1,icc.name as industryCategory2
+  industry_category_a as industryCategoryA,industry_category_b as industryCategoryB,ic.name as industryCategory1,icc.name as industryCategory2,a.release_date as releaseDate
    from demand a
   left join industry_category ic on ic.id=a.industry_category_a
   left join industry_category icc on icc.id=a.industry_category_b

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

@@ -5,7 +5,9 @@
 
 <head th:fragment="header(title, link)">
   <meta charset="UTF-8">
-  <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}" />
+<!--   <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}" /> -->
+  <link rel="icon" type="image/png" th:href="${portalHost+'/img/ico_logo.png'}" sizes="16x16">
+
   <meta name="Keywords" content=""/>
 	<meta name="Description" content=""/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

Plik diff jest za duży
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


+ 3 - 3
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -39,9 +39,9 @@
 						<div th:if="${achievementdetail.firstPicture} != null ">
 							<img th:src= "${avatarUploadHost+achievementdetail.firstPicture}"alt=""  />
 						</div>
-						     <div class="collection">
-             <p><span class="heart"></span><span>收藏</span></p>
-        </div>
+<!-- 						     <div class="collection"> -->
+<!--              <p><span class="heart"></span><span>收藏</span></p> -->
+<!--         </div> -->
 					</div>
 					<div class="basic">
 						<div class="inline_span">

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

@@ -55,9 +55,9 @@
 				<div>
 					<ol>
 						<li><a href="#technology">企业技术需求</a></li>
-						<li><a href="#industry">地区产业需求</a></li>
+<!-- 						<li><a href="#industry">地区产业需求</a></li> -->
 						<li><a href="#study">产学研合作需求</a></li>
-						<li><a href="#capital">研产资金需求</a></li>
+<!-- 						<li><a href="#capital">研产资金需求</a></li> -->
 						<li><a href="#personnel">技术人才需求</a></li>
 					</ol>
 				</div>
@@ -294,38 +294,38 @@
 		</div>
 	</div>
 	<!-- 地区产业需求 -->
-	<div class="areaDemand" id="industry">
-		<div class="container">
-			<h3>
-				<img th:src="${portalHost+'/img/newMenu/demand-13.jpg'}" alt="">
-			</h3>
-		</div>
-		<div class="fullImg">
-			<img th:src="${portalHost+'/img/newMenu/demand-16.jpg'}" alt="" />
-			<div class="fullImgTxt container">
-				<ul class="row">
-					<li class="col-md-3" th:each="areaDemand,iterStat:${areaDemandList}">
-						<a th:href="@{/portal/technologyTrading/demandDetail(id=${areaDemand.id},type=${areaDemand.dataCategory})}">
-						<div class="warpImg">
-							<div th:if="${iterStat.even}" class="btnAreaBj">
-								<span class="btnArea" th:text="${areaDemand.name}"></span>
-							</div>
-							<div class="introduction">
-								<p th:text="${areaDemand.problemDes}"></p>
-							</div>
-							<div th:if="${iterStat.odd}" class="btnAreaBj">
-								<span class="btnArea" th:text="${areaDemand.name}"></span>
-							</div>
-							<div class="btnSee">
-								<span>立即查看产业需求</span>
-							</div>
-						</div>
-						</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
+<!-- 	<div class="areaDemand" id="industry"> -->
+<!-- 		<div class="container"> -->
+<!-- 			<h3> -->
+<!-- 				<img th:src="${portalHost+'/img/newMenu/demand-13.jpg'}" alt=""> -->
+<!-- 			</h3> -->
+<!-- 		</div> -->
+<!-- 		<div class="fullImg"> -->
+<!-- 			<img th:src="${portalHost+'/img/newMenu/demand-16.jpg'}" alt="" /> -->
+<!-- 			<div class="fullImgTxt container"> -->
+<!-- 				<ul class="row"> -->
+<!-- 					<li class="col-md-3" th:each="areaDemand,iterStat:${areaDemandList}"> -->
+<!-- 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${areaDemand.id},type=${areaDemand.dataCategory})}"> -->
+<!-- 						<div class="warpImg"> -->
+<!-- 							<div th:if="${iterStat.even}" class="btnAreaBj"> -->
+<!-- 								<span class="btnArea" th:text="${areaDemand.name}"></span> -->
+<!-- 							</div> -->
+<!-- 							<div class="introduction"> -->
+<!-- 								<p th:text="${areaDemand.problemDes}"></p> -->
+<!-- 							</div> -->
+<!-- 							<div th:if="${iterStat.odd}" class="btnAreaBj"> -->
+<!-- 								<span class="btnArea" th:text="${areaDemand.name}"></span> -->
+<!-- 							</div> -->
+<!-- 							<div class="btnSee"> -->
+<!-- 								<span>立即查看产业需求</span> -->
+<!-- 							</div> -->
+<!-- 						</div> -->
+<!-- 						</a> -->
+<!-- 					</li> -->
+<!-- 				</ul> -->
+<!-- 			</div> -->
+<!-- 		</div> -->
+<!-- 	</div> -->
 	<div class="container">
 		<div class="study" id="study">
 			<h4>
@@ -356,41 +356,41 @@
 				<img th:src="${portalHost+'/img/newMenu/demand-18.jpg'}" alt="">
 			</div>
 		</div>
-		<div class="study capital" id="capital">
-			<h4>
-				研产资金需求 <a th:href="@{/portal/technologyTrading/demandList}">查看更多 > </a>
-			</h4>
-		</div>
-		<div class="capitalMain row">
-			<div class="col-sm-2">
-				<img th:src="${portalHost+'/img/newMenu/demand-19.jpg'}" alt="">
-			</div>
-			<div class="col-sm-10">
-				<ol class="row">
+<!-- 		<div class="study capital" id="capital"> -->
+<!-- 			<h4> -->
+<!-- 				研产资金需求 <a th:href="@{/portal/technologyTrading/demandList}">查看更多 > </a> -->
+<!-- 			</h4> -->
+<!-- 		</div> -->
+<!-- 		<div class="capitalMain row"> -->
+<!-- 			<div class="col-sm-2"> -->
+<!-- 				<img th:src="${portalHost+'/img/newMenu/demand-19.jpg'}" alt=""> -->
+<!-- 			</div> -->
+<!-- 			<div class="col-sm-10"> -->
+<!-- 				<ol class="row"> -->
 					
-					<li class="col-sm-3" th:each="fundDemand:${fundDemandList}">
-						<a th:href="@{/portal/technologyTrading/demandDetail(id=${fundDemand.id},type=${fundDemand.dataCategory})}">
-						<div class="capital-administration">
-							<div class="capitalBj">
-								<h4 th:text="${fundDemand.name}"></h4>
-								<p th:text="${fundDemand.problemDes}"></p>
-								<div class="float-left">
-									<p>期望资金</p>
-									<p th:text="${fundDemand.fundForCrowd}==null?'期望资金:面议':${'¥'+fundDemand.fundForCrowd+'万'}"></p>
-								</div>
-								<div class="float-right">
-									<p>资金用途</p>
-									<p th:if="${fundDemand.researchType}==null">未知用途</p>
-									<p th:if="${fundDemand.researchType}!=null" th:text="${fundDemand.researchType}==0?'研发':'扩大再生产'"></p>
-								</div>
-							</div>
-							<a  th:href="@{/portal/technologyTrading/demandDetail(id=${fundDemand.id},type=${fundDemand.dataCategory})}">立即查看</a>
-						</div>
-						</a>
-					</li>
-				</ol>
-			</div>
-		</div>
+<!-- 					<li class="col-sm-3" th:each="fundDemand:${fundDemandList}"> -->
+<!-- 						<a th:href="@{/portal/technologyTrading/demandDetail(id=${fundDemand.id},type=${fundDemand.dataCategory})}"> -->
+<!-- 						<div class="capital-administration"> -->
+<!-- 							<div class="capitalBj"> -->
+<!-- 								<h4 th:text="${fundDemand.name}"></h4> -->
+<!-- 								<p th:text="${fundDemand.problemDes}"></p> -->
+<!-- 								<div class="float-left"> -->
+<!-- 									<p>期望资金</p> -->
+<!-- 									<p th:text="${fundDemand.fundForCrowd}==null?'期望资金:面议':${'¥'+fundDemand.fundForCrowd+'万'}"></p> -->
+<!-- 								</div> -->
+<!-- 								<div class="float-right"> -->
+<!-- 									<p>资金用途</p> -->
+<!-- 									<p th:if="${fundDemand.researchType}==null">未知用途</p> -->
+<!-- 									<p th:if="${fundDemand.researchType}!=null" th:text="${fundDemand.researchType}==0?'研发':'扩大再生产'"></p> -->
+<!-- 								</div> -->
+<!-- 							</div> -->
+<!-- 							<a  th:href="@{/portal/technologyTrading/demandDetail(id=${fundDemand.id},type=${fundDemand.dataCategory})}">立即查看</a> -->
+<!-- 						</div> -->
+<!-- 						</a> -->
+<!-- 					</li> -->
+<!-- 				</ol> -->
+<!-- 			</div> -->
+<!-- 		</div> -->
 		<div class="study capital" id="personnel">
 			<h4>
 				技术人才需求 <a th:href="@{/portal/technologyTrading/demandList}">查看更多 > </a>

+ 3 - 3
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -32,9 +32,9 @@
 						<div th:if="${demand.firstPic} != null " >
 							<img th:src= "${avatarUploadHost+demand.firstPic}"alt="" />
 						</div>
-						<div class="collection">
-				             <p><span class="heart"></span><span>收藏</span></p>
-				        </div>
+<!-- 						<div class="collection"> -->
+<!-- 				             <p><span class="heart"></span><span>收藏</span></p> -->
+<!-- 				        </div> -->
 					</div>
 					<div class="basic">
 						<div>

+ 3 - 3
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -39,9 +39,9 @@
 						th:src="${avatarUploadHost + '/default/subscriberDetail.jpg'}"
 						alt="" />
 			</div>
-			<div class="collection">
-            	 <p><span class="heart"></span><span>收藏</span></p>
-       		</div>
+<!-- 			<div class="collection"> -->
+<!--             	 <p><span class="heart"></span><span>收藏</span></p> -->
+<!--        		</div> -->
 		</div>
 		<div class="basc_p">
 			<h4>关于智者</h4>