Browse Source

军邦修改1.0.3

anderx 6 years ago
parent
commit
5edaa48ded

+ 17 - 0
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -20,6 +20,23 @@ public interface JtBusinessService {
 	JtBusinessProjectResult getBusinessProjectDetail(String id);
 	JtBusinessCategoryTree getCategoryTree(String id);
 	List<JtBusinessCategoryBo>getCategoryBoList(Integer module);
+	/**
+	 * 
+	 * @param tag
+	 * @param topId
+	 * @param secondId
+	 * @param name
+	 * @param pageSize 数量
+	 * @param pageNo   页码
+	 * @param privateProject
+	 * @param auditStatus
+	 * @param module 模块
+	 * @param isHot  热门
+	 * @param orderType
+	 * @param orderSort
+	 * @param ownerId
+	 * @return
+	 */
 	Pagination<JtBusinessProjectResult>getProjects(String tag,String topId,String secondId,String name, Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module,Integer isHot,Integer orderType,Integer orderSort,String ownerId); 
 	int insertCategory(JtBusinessCategory jtBusinessCategory);
 	int deleteCategoryById(String id);

+ 11 - 6
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -820,12 +820,17 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/portal/index")
 	public ModelAndView mainIndex(HttpServletRequest request, ModelAndView modelview) {
 //		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
-		modelview.setViewName("/portal/index");
-		List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getHomeIndex(1,1);
-		patentCategory = patentCategory.subList(0, Math.min(7, patentCategory.size()));
-		modelview.addObject("patentCategory", patentCategory);
+		modelview.setViewName("/portal/index");
+		//
+		List<JtBusinessCategoryBo> patentCategory = jtBusinessService.getHomeIndex(1,1);
+		List<JtBusinessProject> sss = (List<JtBusinessProject>) jtBusinessService
+				.getProjects(null,null, null, null, 7, 1, 1, 2, null, 1, 1, 0, null).getList();
+		patentCategory = patentCategory.subList(0, Math.min(7, patentCategory.size()));
+		System.out.println(sss.size());
+		
+		modelview.addObject("patentCategory", sss);
 		List<JtBusinessProject> jtBusinessProjects = (List<JtBusinessProject>) jtBusinessService
-				.getProjects(null,null, null, null, 8, 1, 1, 2, null, 1, 0, 0, null).getList();
+				.getProjects(null,null, null, null, 6, 1, 1, 2, null, 1, 0, 0, null).getList();
 		for (JtBusinessProject project : jtBusinessProjects) {
 			if (project.getMaxImgUrl() != null && project.getMaxImgUrl().length() <= 0)
 				project.setMaxImgUrl(null);
@@ -1163,7 +1168,7 @@ public class WebpageController extends BaseController {
 		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
 		modelAndView.setViewName("/portal/technologyTrading/tradingIndex");
 		// 成果
-		List<AchievementObject> achievementObjects = achievementService.getHotAchievements(4, url,
+		List<AchievementObject> achievementObjects = achievementService.getHotAchievements(2, url,
 				"web_achievement_trading_index");
 		for (AchievementObject a : achievementObjects) {
 			if (null != a.getTechnicalPictureUrl() && a.getTechnicalPictureUrl().contains(",")) {

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -38,10 +38,10 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-#static.host=//jb.jishutao.com/client/1.0.2
+static.host=//jb.jishutao.com/client/1.0.2
 #portal.host=//jb.jishutao.com/portal/1.0.2
 #本地
-static.host=//sclient.jishutao.com:8088/client/1.0.2
+#static.host=//sclient.jishutao.com:8088/client/1.0.2
 portal.host=//sportal.jishutao.com:80/portal/1.0.2
 
 avatar.host=//ss.jishutao.com

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

@@ -50,6 +50,9 @@
 							<img th:src="${portalHost+'/img/index/index_shopCar.jpg'}" alt="">购物车(<span class="numberTotal">0</span>)件 </a>
                         <span class="glyphicon glyphicon-tint tint" aria-hidden="true"></span>
 					</li>
+					<li>
+						<a  th:if="!${isLogin}"  th:href="@{/admin/login}">管理员</a>
+					</li>
 				</ul>
 			</div>
 			<!-- <div class="APP">
@@ -196,7 +199,7 @@
                     </li>   
                      <li th:class="${subM}=='aboutUs'?active:''" >
                      	<div>
-                         <a th:href="@{/portal/aboutUs}">关于</a>
+                         <a th:href="@{/portal/aboutUs}">关于军邦</a>
                         </div>
                      </li>                         
                              
@@ -242,34 +245,26 @@
 	<th:block th:fragment="copyright">
 	<div id="bottom">
 			<div class="bottom">
-				<div class="bottom_text">
+				<!-- <div class="bottom_text">
 					<div class="text_top">
 						<a th:href="@{/portal/aboutUs}">关于公司/</a>
 						<a onclick="openZoosUrl('chatwin');">联系我们</a>
 						<p> Copyright &copy 2016-2017 科德 版权所有 <a href="http://www.miitbeian.gov.cn/" target="_blank">湘ICP备19003891号</a>
 							-1 技术支持:湖南阿凡提信息科技有限公司</p>
-					</div>
+					</div> -->
 					<div class="text_center">
+						<div class="logo">
+			                <a th:href="@{/portal/index}">
+			                    <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
+			                </a>
+            			</div>
 						<div class="cont_left">
-							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt=""/>
-							<p>湖南省长沙市岳麓区茶子山东路湘江财富金融中心D栋12层</p>
-						</div>
-						<div class="cont_center">
-							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt=""/>
-							<p>合作电话:0731-89907207</p>
-							<p>400-8800-962</p>
+							<p>地&nbsp;&nbsp;&nbsp;&nbsp;址:湖南省长沙市岳麓区茶子山东路湘江财富金融中心D栋12层</p>
+							<p>合作电话:0731-89907207&nbsp;/&nbsp;400-8800-962</p>
+							<span>备&nbsp;案&nbsp;号:</span><a href="http://www.miitbeian.gov.cn/" target="_blank">湘ICP备19003891号&nbsp;&nbsp; -1 </a>
 						</div>
-						<!-- <div class="cont_rightapp">
-							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
-							<p>iPhone版</p>
-						</div>
-						<div class="cont_right android">
-							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
-							<p>Android版</p>
-						</div> -->
 						<div class="cont_right">
 							<img th:src="${portalHost+'/img/erweima.jpg'}" alt=""/>
-							<p>微信公众号</p>
 						</div>					
 					</div>
 					<!-- <div class="text_bottom">
@@ -316,7 +311,7 @@
 						<span class="glyphicon glyphicon-phone-alt"></span>
 					</a>
 					<div class="phoneTxt">
-						<p>联系电话</p>
+						<p>联系电话</p>
 						<p>400-8800-962</p>
 					</div>
 				</li>

File diff suppressed because it is too large
+ 11 - 232
src/main/webapp/WEB-INF/views/portal/aboutUs.html


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

@@ -11,7 +11,7 @@
 体系认证,专利申请,军工三证,工程技术研究中心,创新小巨人等湖南省市科技项目申报、
 成果转化的信息咨询旗舰企业,获得政府部门权威认证的咨询服务机构."/>
 	  <link rel="icon" type="image/png" th:href="${portalHost+'/img/ico_logo.png'}" sizes="16x16">
-	<title>军邦技</title>
+	<title>军邦技</title>
 <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/index.css'}" rel="stylesheet"></head>
@@ -37,7 +37,6 @@
 			<!-- 轮播(Carousel)项目 -->
 			<div class="carousel-inner" >
 				<div class="item active" th:each="banner,bStatus:${bannerlist}" th:if="${bStatus.first}">
-				<!-- /portal/continueHigh  /portal/militaryProject   /portal/practicalPatent -->
 					<a th:if="${banner.forwardUrl}!=null and ${banner.forwardUrl}!=''" th:href="|${basePath }${ banner.forwardUrl}"><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 					<a th:if="${banner.forwardUrl}==null or ${banner.forwardUrl}==''" ><img th:src="|${avatarUploadHost}${banner.imgUrl}" th:alt="${banner.text}"></a>
 				</div>
@@ -51,181 +50,107 @@
 			<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 		</div>
 		
-	<!-- 	<div class="indexSearch">
-			<ul class="jumpType">
-				<li class="active">成果</li>
-				<li>需求</li>
-				<li>专利</li>
-				<li>政策</li>
-				<li>项目</li>
-			</ul>
-			<div class="search-inp">
-				<div class="input-group searchDiv">
-					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
-					<img th:src="${portalHost+'/img/newMenu/searchImg.png'}" alt="" class="searchImg">
-				
-				</div>
-				 <a  th:href="@{/portal/assessment}" class="zaixian">在线评估</a>
-				 
-				
-				<a th:href="@{/portal/evaluation/evaluate}" href="/portal/evaluation/evaluate" class="gaoqi">高企自评</a>
-			</div>
-			<ul class="jump">
-				<li>
-					<a href="/portal/thinkTank/policyList?type=1">政策</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=0">资讯</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=99">技淘观点</a>
-				</li>
-				<li>
-					<a href="/portal/thinkTank/policyList?type=98">知产百科</a>
-				</li>
-			</ul>
-			<span class="apply head_login">申请会员</span>
-		</div> -->
-
+	
 	<!-- 主体内容区域 -->
-	<div id="terrace">
+	<div id="backg">
+		<div id="terrace">
 		<div class="RecommendTitle">
-			<h2>装备采购信息</h2>
+			<h2>军工资质认定</h2>
 			<span></span>
 			<hr>
 		</div>
-			<!-- <div class="terrace_title">
-			
-				<img th:src="${portalHost+'/img/indedImg/inded12.png'}" alt="" />
-				</div>
-			
-			<div class="terrace_cont">
-				<div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>智慧</h4>
-						<p>海量智力成果认知您的需求</p>
-					</div>
-				</div>
-				<div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>合伙</h4>
-						<p>秉承十七载荣赢数万客户</p>
-					</div>
-				</div><div>
-					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
-					<div class="terraceH">
-						<h4>社区</h4>
-						<p>严选数千位专家顾问答疑解惑</p>
-					</div>
-				</div>
-			</div>-->
 		</div> 
 		<div id="apply">
 			<div class="apply">
+			<a th:href="@{/portal/service/serviceDetail(id=${patentCategory[0].id})}">
 				<div class="apply_left">
-					<a >
-						<img th:src="${portalHost+'/img/indedImg/inded15.jpg'}" alt="" />
-					</a>
+					<div id="apply_left_in">
+						<img alt="" th:src="${portalHost+'/img/indedImg/inded7.png'}" />
+						<p th:text="${patentCategory[0].name}">产权申请</p>
+					</div>
 				</div>
+			</a>
+				
 				<div class="apply_right">
 					<div th:each="p0,pcStatus:${patentCategory}">
-						<a th:href="'/portal/service/patentList?secondId='+${p0.topLevelId}">
-							<img th:src="${portalHost+'/img/indedImg/inded20.jpg'}" alt="" th:if="${pcStatus.index}==0"/>
-							<img th:src="${portalHost+'/img/indedImg/inded21.jpg'}" alt="" th:if="${pcStatus.index}==1"/>
-							<img th:src="${portalHost+'/img/indedImg/inded22.jpg'}" alt="" th:if="${pcStatus.index}==2"/>
-							<img th:src="${portalHost+'/img/indedImg/inded23.jpg'}" alt="" th:if="${pcStatus.index}==3"/>
-							<img th:src="${portalHost+'/img/indedImg/inded24.jpg'}" alt="" th:if="${pcStatus.index}==4"/>
-							<img th:src="${portalHost+'/img/indedImg/inded25.jpg'}" alt="" th:if="${pcStatus.index}==5"/>
-							<h4 th:text="${p0.topLevel}"> 发明专利</h4>
+						<a th:href="@{/portal/service/serviceDetail(id=${p0.id})}" th:if="${pcStatus.index}!=0">
+							<img th:src="${portalHost+'/img/indedImg/inded11.png'}" alt="" th:if="${pcStatus.index}==1"/>
+							<img th:src="${portalHost+'/img/indedImg/inded12.png'}" alt="" th:if="${pcStatus.index}==2"/>
+							<img th:src="${portalHost+'/img/indedImg/inded20.png'}" alt="" th:if="${pcStatus.index}==3"/>
+							<img th:src="${portalHost+'/img/indedImg/inded13.png'}" alt="" th:if="${pcStatus.index}==4"/>
+							<img th:src="${portalHost+'/img/indedImg/inded14.png'}" alt="" th:if="${pcStatus.index}==5"/>
+							<img th:src="${portalHost+'/img/indedImg/inded9.png'}" alt="" th:if="${pcStatus.index}==6"/>
+							<span th:text="${p0.name}"> 发明专利</span>
 						</a>
 					</div>
 				</div>
 			</div>
 			
 		</div>
-		<div class="container">
+	</div>
+		<div id="con">
+		<div id="terrace">
 		<div class="RecommendTitle">
-			<h2>政策资讯</h2>
+			<h2>装备采购信息</h2>
 			<span></span>
 			<hr>
 		</div>
+		</div>
 		<div class="news">
 			<div class="consultation">
-				<h4>资讯
-				 <a th:href="@{/portal/thinkTank/policyList?type=0}"><span class="line"></span><span>></span></a>
-				</h4>
+				<a th:href="@{/portal/thinkTank/policyList?type=0}"><span>更多</span></a>
 				<ul>
 					
 					<li th:each="n:${news}">
 						<a th:href="@{/portal/news/newsDetail(id=${n.id},type=1)}">
 							<div class="time">
-								<span th:text="${#dates.format(n.releaseDate,'MM-dd')}">03-12</span>
-								<span th:text="${#dates.format(n.releaseDate,'yyyy')}">2018</span>
+								<div class ="number1"><span th:text="${#dates.format(n.releaseDate,'MM-dd')}">03-12</span></div>
+								<div class ="number2"><span th:text="${#dates.format(n.releaseDate,'yyyy')}">2018</span></div>
 							</div>
 							<div class="newTxt">
 								<h5 th:text="${#strings.abbreviate(n.title,18)}">加奖金哦违法爱按金额积分经济积分经济积分经济if啊积分经济交往和居委会看看哇卡哇卡...</h5>
 								<p th:text="${#strings.abbreviate(n.summary,65)}">哈哈哈哈海鸥科技打飞机附近的啊我的㘝技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+								<img th:src="${portalHost+'/img/indedImg/inded4.png'}" alt="" />
+								<span>查看详情</span>
 							</div>
 						</a>
 					</li>
 				</ul>
 			</div>
 		</div>
-	</div>
-		<!-- <div id="wield">
-			<div class="terrace_title">
-				<img th:src="${portalHost+'/img/indedImg/inded4.png'}" alt="" />
-			</div>
-			<div class="wield_cont">
-				<div class="video">
-					<video id="video1" controls="true" controlslist="nodownload">
-						<source src="http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4 "  type="video/mp4">
-						<source th:src="${vurl == null? 'http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4': videoServer+vurl}"  type="video/mp4">
-
-						您的浏览器不支持 HTML5 video 标签。
-					</video>
-				</div>
-				<img th:src="${portalHost+'/img/indedImg/inded5.png'}" alt="" />
-			</div>
-				<div class="moreVideo">
-				<a href="/portal/video.html">查看更多视频 >></a>
+	
+		<div class="RecommendTitle">
+			<div id="terrace">
+				<h2>军民转换技术</h2>
+				<span></span>
+			<hr >
 			</div>
-		</div> -->
-		<!-- <div class="brands">
-			<a th:href="@{/portal/service/brandBuild}">
-			<img th:src="${portalHost+'/img/indedImg/inded6.png'}" alt="" />
-			</a>
 		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/marketOpen}">
-			<img th:src="${portalHost+'/img/indedImg/inded7.png'}" alt="" />
-			</a>
-			<div class="brandsDiv">
-				<img th:src="${portalHost+'/img/indedImg/inded31.jpg'}" alt="" class="active"/>
-				<img th:src="${portalHost+'/img/indedImg/inded32.jpg'}" alt="" />
-				<img th:src="${portalHost+'/img/indedImg/inded33.jpg'}" alt="" />
+		<div class="skill">
+			<div id="skill1">
+				
 			</div>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/governmentSupport}">
-			<img th:src="${portalHost+'/img/indedImg/inded8.png'}" alt="" />
-			</a>
-		</div>
-		<div class="brands">
-			<a th:href="@{/portal/service/taxFinance}">
-			<img th:src="${portalHost+'/img/indedImg/inded9.png'}" alt="" />
-			</a>
-			<div>
-				<img th:src="${portalHost+'/img/indedImg/inded34.jpg'}" alt="" class="active"/>
-				<img th:src="${portalHost+'/img/indedImg/inded35.jpg'}" alt="" />
-				<img th:src="${portalHost+'/img/indedImg/inded36.jpg'}" alt="" />
+			<div id="skill2">
+					<a  class="skill3" th:href="@{/portal/technologyTrading/achievementList}">
+					<img th:src="${portalHost+'/img/indedImg/inded6.png'}" alt="" />
+					<span>技术成果</span>
+					</a>
+					<a  class="skill3" th:href="@{/portal/technologyTrading/demandList}">
+					<img th:src="${portalHost+'/img/indedImg/inded5.png'}" alt="" />
+					<span>技术需求</span>
+					</a>
 			</div>
-		</div> -->
+		</div>
+	</div>
+		
+			
 		<div id="hotProject">
-			<div class="terrace_title">
-				<img th:src="${portalHost+'/img/indedImg/inded10.png'}" alt="" />
+		<div class="RecommendTitle">
+		<div id="terrace">
+				<h2>配套服务</h2>
+				<span></span>
+			<hr >
+			</div>
 			</div>
 			<div class="hotProject_cont" >
 				<div th:each="p,pStatus:${projects}">

+ 1 - 0
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -13,6 +13,7 @@
 		<div th:replace="common::nav('news','newsDetail')"></div>
 
 	<div id="policyDetail">
+	<div><p><a  th:href="@{/portal/index}">首页</a>&nbsp;&gt;<a th:href="@{/portal/thinkTank/policyList}">采购信息</a>&nbsp;&gt;</p></div>
 		<div id="policy_content">
 			<div class="content_left" th:each="newsDetail:${newsDetail}">
 				<h3 th:text="${newsDetail.title}?${newsDetail.title}:''"></h3>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


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

@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>军邦技 - 技术服务列表</title>
+    <title>军邦技 - 技术服务列表</title>
    
 <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet"><link th:href="${portalHost+'/newMenu/serviceList.css'}" rel="stylesheet"></head>

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

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>军邦技 - 成果详情</title>
+<title>军邦技 - 成果详情</title>
 <link th:href="${portalHost +'/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/achievementDetail.css'}" rel="stylesheet">
@@ -40,9 +40,9 @@
 						<div class ="serviceDetailsImg" th:if="${achievementdetail.firstPicture} != null ">
 							<img th:src= "${avatarUploadHost+achievementdetail.firstPicture}"alt=""  />
 						</div>
-						     <div class="collection">
+				<!-- 		     <div class="collection">
              <p><span th:class="${isInterested}==null?'heart':'heart active'"></span><span>收藏</span></p>
-        </div>					
+        </div>	 -->				
 					</div>
 					<div class="basic">
 						<div class="inline_span">
@@ -63,9 +63,9 @@
 						<!-- <div class="inline_span">
    							  <span>价格:</span> <span class="price">212</span>
 						</div> -->
-						<div class="inline_span">
+					<!-- 	<div class="inline_span">
    							  <span>所属公司:</span> <span class="companyName" th:text="${achievementdetail.ownerName}==null?'佚名':${achievementdetail.ownerName}"></span>
-						</div>
+						</div> -->
 						<div class="inline_span1">
 							<span>最近更新</span><span th:text="${achievementdetail.releaseDate}?${#dates.format(achievementdetail.releaseDate,'yyyy-MM-dd')}:暂无该信息"></span>  
 						</div>
@@ -112,7 +112,7 @@
 			<div class="publicComment">
                 <ol class="tabEvaluate">
                     <li class="active">技术简介</li>
-                    <li>用户评价(<span class="numberBars">0</span>)
+                   <!--  <li>用户评价(<span class="numberBars">0</span>) -->
                 </ol>
                 <div class="tabList ">
                     <div class="serviceDetailsList">
@@ -159,7 +159,7 @@
 							</div>
                         </div>
                     </div>
-                    <div class="evaluateList">
+                    <!-- <div class="evaluateList">
                         <div class="commentDetails">评价 :<span>好评-100%</span><span>中评-100%</span><span>差评-100%</span></div>
                         <div>
                             <div class="commentStar">
@@ -216,7 +216,7 @@
                                 <span class="totalCount">共0条数据1</span>
                             </nav>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
 		</div>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementList.html


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

@@ -4,7 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-<title>军邦技 - 科技需求详情</title>
+<title>军邦技 - 科技需求详情</title>
 <link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/demandDetail.css'}" rel="stylesheet">
@@ -33,9 +33,9 @@
 						<div class ="serviceDetailsImg" th:if="${demand.firstPic} != null " >
 							<img th:src= "${avatarUploadHost+demand.firstPic}"alt="" />
 						</div>
-						<div class="collection">
+						<!-- <div class="collection">
 				             <p><span th:class="${interested}==null?'heart':'heart active'"></span><span>收藏</span></p>
-				        </div>
+				        </div> -->
 					</div>
 					<div class="basic">
 						<div>
@@ -48,9 +48,9 @@
 						<div class="inline_span" >
 							<span th:text="${demand.demandType}==3?'需求资金:':'需求预算:'">需求预算:</span> <span class="price" th:text="${demand.budgetCost}?${demand.budgetCost}+万元:价格面议"></span>
 						</div>
-						<div class="inline_span">
+					<!-- 	<div class="inline_span">
    							  <span>所属公司:</span> <span class="companyName" th:text="${demand.employerName}==null?'佚名':${demand.employerName}"></span>
-						</div>
+						</div> -->
 						<div class="inline_span">
 							<span>有效日期:</span> <span th:text="${demand.validityPeriod}?${#dates.format(demand.validityPeriod,'yyyy-MM-dd')}:永久"></span>
 						</div>
@@ -89,7 +89,7 @@
 			 <div class="publicComment">
                 <ol class="tabEvaluate">
                     <li class="active">技术简介</li>
-                    <li>用户评价(<span class="numberBars">0</span>)
+                   <!--  <li>用户评价(<span class="numberBars">0</span>) -->
                 </ol>
                 <div class="tabList ">
                     <div class="serviceDetailsList">
@@ -144,7 +144,7 @@
 							</div>
                         </div>
                     </div>
-                    <div class="evaluateList">
+                    <!-- <div class="evaluateList">
                         <div class="commentDetails">评价 :<span>好评-100%</span><span>中评-100%</span><span>差评-100%</span></div>
                         <div>
                             <div class="commentStar">
@@ -201,7 +201,7 @@
                                 <span class="totalCount">共0条数据1</span>
                             </nav>
                         </div>
-                    </div>
+                    </div> -->
                 </div>
             </div>
 			

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandList.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html


+ 5 - 4
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-	<title>军邦技 - 信息列表</title>
+	<title>军邦技 - 信息列表</title>
 	<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank/policyList.css'}" rel="stylesheet">
@@ -37,8 +37,8 @@
 					<li value="">不限</li>
 					<li value="1">政策</li>
 					<li value="0">资讯</li>
-					<li value='99'>技淘观点</li>
-					<li value='98'>知产百科</li>
+					<li value='99'>观点</li>
+					<li value='98'>百科</li>
 				</ol>
 			</div>	
 			<div class="area">
@@ -51,6 +51,7 @@
 		</div>
 		<div class="listContent">
 			<div class="newLsit">
+			<div><p><a th:href="@{/portal/index}">首页</a>&nbsp;&gt;采购信息&nbsp;</p></div>
 				<ul>
 					
 				</ul>
@@ -77,7 +78,7 @@
 				</div>
 			</div>
 			<div class="hotNew">
-				<p><span>热点资讯</span></p>
+				<p><span>热点资讯&gt;&gt;</span></p>
    				<ul>
   					<li th:each="news:${newsList}">
   						<a th:href="@{/portal/news/newsDetail(id=${news.id})}">