wanghui 8 年 前
コミット
ad656e0da1

+ 4 - 2
src/main/java/com/goafanti/common/mapper/OrganizationInfoMapper.xml

@@ -250,7 +250,8 @@
 		a.id = c.uid
 	where 
 	a.type = 1 and b.id is not null
-	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
+	<!-- and c.audit_status = 5 --> 
+	and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
 	<if test="provinceId != null and provinceId != ''">
 		and b.location_province = #{provinceId,jdbcType=VARCHAR}
 	</if>
@@ -279,7 +280,8 @@
 		a.id = c.uid
 	where 
 	a.type = 1 and b.id is not null
-	and c.audit_status = 5 and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
+	<!-- and c.audit_status = 5  -->
+	and a.type = 1 and b.identity_type = '企业' and b.company_type = 1
 	<if test="provinceId != null and provinceId != ''">
 		and b.location_province = #{provinceId,jdbcType=VARCHAR}
 	</if>

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

@@ -42,10 +42,10 @@
   						<a th:href="${basePath + '/portal/technologyTrading/index.html'}">技术交易</a>
   						<ol class="subnavigation">
   							<li>
-  								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">专利交易</a>
+  								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">专利产品</a>
   							</li>
   							<li>
-  								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">成果交易</a>
+  								<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">技术成果</a>
   							</li>
   							<li>
   								<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">技术需求</a>
@@ -125,15 +125,19 @@
 							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt="" />
 							<p>合作电话:0731-85202685</p>
 							<p>400-8800-962八楼</p>
-						</div>
+						</div>		
 						<div class="cont_rightapp">
-							<img th:src="${portalHost+'/img/erweima_app.jpg'}" alt="" />
-							<p>安卓APP</p>
+							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
+							<p>iPhone版</p>
 						</div>
-						<div class="cont_right">
-							<img th:src="${portalHost+'/img/erweima.jpg'}" alt="" />
-							<p>科德公众号</p>
+						<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">
 						<p>友情链接</p>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/index.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 + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/financialIndex.css'}" rel="stylesheet">
 </head>

+ 8 - 5
src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html

@@ -33,11 +33,9 @@
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li>></li>
-	                <li><a href="#">科技金融  </a></li>
-	                <li>></li>               
-	                <li><a href="#">我要找资金   </a></li>
+	                <li><a th:href="${basePath + '/portal/financial/index.html'}">科技金融  </a></li>                
 	                <li>></li>
-	                <li><a href="#" >投资机构 </a></li>
+	                <li><a th:href="${basePath + '/portal/financial/investmentInstitution.html'}">投资机构 </a></li>
 	                <li>></li>
 	             	<li class="that" th:text="${bo.companyName}"></li>
 	            </ul>
@@ -76,7 +74,12 @@
         	<div class="detail_right">
         		<div class="institutions_top">
         			<div class="institutions_love">
-        				<img th:src="${portalHost + '/img/inverDetails_01.png'}" alt="" />
+						<p th:if="${bo.publicityPictureUrl != null and bo.publicityPictureUrl !=''}">
+        					<img th:src="${portalHost + bo.publicityPictureUrl}" alt="" />
+        				</p>
+        				<p th:if="${bo.publicityPictureUrl == null or bo.publicityPictureUrl ==''}">
+        					<img th:src="${avatarUploadHost + '/default/inverDatails.jpg'}" alt="" />
+        				</p>
         				<div class="love_text">
         					<p><img th:src="${portalHost + '/img/inverDatails_love.png'}" alt="" /><span> 12 </span> 收藏</p>
         					<p>线下约见<span> 32次</span></p>

+ 4 - 6
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -13,11 +13,9 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
@@ -33,7 +31,7 @@
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li>></li>
-	                <li><a href="#">科技金融 </a></li>	                
+	                <li><a th:href="${basePath + '/portal/financial/index.html'}">科技金融  </a></li>                  
 	                <li>></li>
 	                <li class="that"><a href="#" >投资机构 </a></li>
 	            </ul>

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

@@ -58,25 +58,25 @@
 		<div class="coupon rf">
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>科技服务1000元 代金券</h2>
+				<h2>注册即送代金券1000元,立即领取</h2>
 				<p>有限期至:2017-10-1</p>
 				</a>				
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>上线送大礼,做高新,软著免费(限一个)</h2>
+				<h2>做高新,送软著,立即领取</h2>
 				<p>有限期至:2017-10-1</p>
 				</a>						
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>专利申请,限时九折(前100个)</h2>
+				<h2>买专利,享九折,立即领取</h2>
 				<p>有限期至:2017-10-1</p>
 				</a>						
 			</div>
 			<div class="coupon_cont lf">
 				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>100元软著全包(限量100个)</h2>
+				<h2>百元做软著,限量领取</h2>
 				<p>有限期至:2017-10-1</p>
 				</a>								
 			</div>
@@ -89,6 +89,10 @@
 	<div id="product">
 		<div class="caption">精品成果<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a></div>
 		<div class="content">
+			<div class="con_hover">
+				<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
+				<p>详情</p>
+			</div>
 			<div class="cont cont_top1">
 				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
 					<div class="img">
@@ -152,7 +156,7 @@
 		</div>
 	</div>
 	<div id="policy">
-		<div class="captions">智政 <a th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a></a></div>
+		<div class="captions">智政 <a th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a></div>
 		<div class="pol_cont">
 			<div class="pol_left">
 				<img th:src="${portalHost+'/img/policy.jpg'}" alt=""/>
@@ -196,7 +200,7 @@
 	<div class="need_main">
 		<div id="need">
 			<div class="caption">精品需求</div>
-			<span class="more"><a href="#">MORE+</a></span>
+			<span class="more"><a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a></span>
 			<div class="carousel">
 				<span class="need_prev"><</span>
 				<div class="need_imgs">
@@ -205,30 +209,50 @@
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa&type=1'}">
 								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />	
 								<p>新型纳米涂料技术</p>
+								<div class="need_black">
+									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>汽车空调的辅助制冷装置</p>
+								<div class="need_black">
+									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf&type=1'}">
 								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>高性能铅炭电池</p>
+								<div class="need_black">
+									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>ABS板材改性工程塑料的配方及研究</p>
+								<div class="need_black">
+									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 						<li>
 							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d&type=1'}">
 								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
 								<p>机械领域新型产品或技术</p>
+								<div class="need_black">
+									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
+									<p>详情</p>
+								</div>
 							</a>
 						</li>
 					</ul>

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


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

@@ -36,6 +36,7 @@
 				<div class="serve_left">
 					<div>
 						<span>
+							<img th:src="${portalHost+'/img/tech_tyhs.png'}" alt=""/>
 							<img th:src="${portalHost+'/img/tech_ty.png'}" alt=""/>
 						</span>
 						<h3>专业诊断保障!</h3>
@@ -44,7 +45,9 @@
 					</div>
 					<div>
 						<span>
+						
 							<img th:src="${portalHost+'/img/tech_tr.png'}" alt=""/>
+							<img th:src="${portalHost+'/img/tech_trbs.png'}" alt=""/>
 						</span>
 						<h3>专业能力保障!</h3>
 						<p>专业优秀的服务团队,提供高效率、高质量的服务,加上系统的资料整理流程和模块,有效保证了高成功率。</p>
@@ -53,6 +56,7 @@
 					<div>
 						<span>
 							<img th:src="${portalHost+'/img/tech_th.png'}" alt=""/>
+							<img th:src="${portalHost+'/img/tech_tss.png'}" alt=""/>
 						</span>
 						<h3>专业跟踪服务!</h3>
 						<p>在规范的客户信息数据库基础上,对客户进行后期项目跟踪,进行后端信息资源对接,协助企业构建科技管理体系。
@@ -123,11 +127,12 @@
   					<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">了解政策</a>
   				</li>  				
   			</ul>
+  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即咨询</a>
   		</div>
   	</div>
   	<div class="customer">
   		<div class="customer_main container">
-  			<span class="that" id="office">公司</span>
+  			<span class="that" id="office">公司</span>
 			<span id="custom">大客户</span>
   		</div>
   		<hr />

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

@@ -12,7 +12,7 @@
 		<div th:replace="common::nav('user','subscriberDetail')"></div>
 	</header>
 	<div class="banner">
-    	<img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/>
+    	<img th:src="${portalHost + '/img/thinkerDetail_banner01.jpg'}" alt=""/>
 	</div>
 	<div id="all_thinkerDetail">
 		<div class="thinkerdetail_top" th:each="rePartnerDetail:${rePartnerDetail}">
@@ -51,8 +51,13 @@
 				</div> 
 			</div>
 			<div class="detailcenter_right">
-				<div class="right_img">
-					<img th:src="${portalHost + '/img/thinker_detail2.jpg'}" alt="" />
+				<div class="right_img">				
+					<p th:if="${rePartnerDetail.personPortraitUrl != null and rePartnerDetail.personPortraitUrl !=''}">
+        					<img th:src="${avatarUploadHost + rePartnerDetail.personPortraitUrl}" alt="" />      					
+        			</p>
+        			<p th:if="${rePartnerDetail.personPortraitUrl == null or rePartnerDetail.personPortraitUrl ==''}">
+        					<img th:src="${avatarUploadHost + '/default/subscriberDetail.jpg'}" alt="" />
+        			</p>
 					<div>
 						线下约见 <span>32次</span>
 					</div>