Pārlūkot izejas kodu

修改释放业务时同事将客户释放的问题

anderx 6 gadi atpakaļ
vecāks
revīzija
d93f06d56f

+ 3 - 74
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -821,9 +821,8 @@ public class WebpageController extends BaseController {
 	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(6, patentCategory.size()));
+		patentCategory = patentCategory.subList(0, Math.min(7, patentCategory.size()));
 		modelview.addObject("patentCategory", patentCategory);
 		List<JtBusinessProject> jtBusinessProjects = (List<JtBusinessProject>) jtBusinessService
 				.getProjects(null,null, null, null, 8, 1, 1, 2, null, 1, 0, 0, null).getList();
@@ -832,74 +831,21 @@ public class WebpageController extends BaseController {
 				project.setMaxImgUrl(null);
 			if (project.getMinImgUrl() != null && project.getMinImgUrl().length() <= 0)
 				project.setMinImgUrl(null);
-			
 			//去除数据中的标签
 			if(StringUtils.isNotBlank(project.getIntroduce())){
 				project.setIntroduce(project.getIntroduce().replaceAll("\\<.*?>", "")); 
 			}
-				
-			
 		}
-		
 		modelview.addObject("projects", jtBusinessProjects);
-		List<PolicyResult> policies = (List<PolicyResult>) policyService
-				.searchPolicy("", 2, null, null, "web_index", 1, 99, null).getList();
-		for (PolicyResult p : policies) {
-			if (null != p.getTitleImg() && p.getTitleImg().contains(",")) {
-				p.setTitleImg(p.getTitleImg().substring(0, p.getTitleImg().indexOf(",")));
-			}
-		}
-		modelview.addObject("policys", policies);//政策
 		List<News> newsList = (List<News>) newsService
-				.listNews(0, null, null, null, null, null, null, 1, 3, "2", null, null,null).getList();
+				.listNews(0, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
 		modelview.addObject("news", newsList);//资讯
-		//
-		List<News> subscriptions = (List<News>) newsService
-				.listNews(99, null, null, null, null, null, null, 1, 8, "2", null, null,null).getList();
-		modelview.addObject("subscription", subscriptions);//技淘观点精选
-
-		if (subscriptions != null && subscriptions.size() > 0 && subscriptions.get(0).getSourceUrl() != null
-				&& subscriptions.get(0).getSourceUrl().contains(".")) {
-			modelview.addObject("videoUrl", subscriptions.get(0).getSourceUrl());
-		}
-		
 		//获得轮播图数据
 		List<Banners> blist = bannersService.findBannersList("index", 0, 4, 1);
 		if(null != blist){
 			modelview.addObject("bannerlist", blist);
 		}
-		//视频
-		AdminVideoBo video =  adminVideoService.getIndexVideo(1);
-		if(null != video ){
-			String url = video.getUrl();
-			modelview.addObject("vurl", url);
-		}
-		// List<AchievementObject>
-		// achievementObjects=achievementService.getHotAchievements(9, url,
-		// "web_index");
-		// modelview.addObject("achievements",achievementObjects);
-		//
-		//
-		//
-		//
-		// List<DemandListBo> demandListBos=demandService.getHotDemand(9, url,
-		// "web_index");
-		// for(DemandListBo demandListBo:demandListBos) {
-		// if(demandListBo.getPictureUrl()==null ||
-		// !demandListBo.getPictureUrl().contains("."))demandListBo.setPictureUrl(null);
-		// else
-		// demandListBo.setPictureUrl(demandListBo.getPictureUrl().split(",")[0]);
-		// }
-		// //专家
-		// List<UserIdentityBo>aExperts=userIdentityService.getExperts(8);
-		// for(UserIdentityBo u:aExperts) {
-		// if(u.getHeadPortraitUrl()!=null &&
-		// u.getHeadPortraitUrl().length()<=0) {
-		// u.setHeadPortraitUrl(null);
-		// }
-		// }
-		// modelview.addObject("experts",aExperts);
-		// modelview.addObject("demands",demandListBos);
+	
 
 		return modelview;
 	}
@@ -1212,7 +1158,6 @@ public class WebpageController extends BaseController {
 	/*
 	 * 交易
 	 */
-	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/portal/technologyTrading/tradingIndex")
 	public ModelAndView patentTrading(HttpServletRequest request, ModelAndView modelAndView) {
 		String url = com.goafanti.common.utils.StringUtils.getDomainByHttpRequest(request);
@@ -1236,22 +1181,6 @@ public class WebpageController extends BaseController {
 			}
 		}
 		modelAndView.addObject("demand", demandListBos);
-
-		// 政策
-		List<Policy> policies = (List<Policy>) policyService.searchPolicy(null, 2, null, null, "web_index", 1, 5, null)
-				.getList();
-		modelAndView.addObject("policy", policies);
-
-		// 专家
-		List<UserIdentityBo> userIdentityBos = userIdentityService.getExperts(3);
-		modelAndView.addObject("expert", userIdentityBos);
-		
-		//获得轮播图数据
-		List<Banners> blist = bannersService.findBannersList("tradingIndex", 0, 3, 1);
-		if(null != blist){
-			modelAndView.addObject("tbannerlist", blist);
-		}
-
 		return modelAndView;
 	}
 

+ 26 - 42
src/main/resources/props/config_local.properties

@@ -1,46 +1,29 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://192.168.0.17:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5e10\u53f7
-jdbc.username=dev
-#\u5bc6\u7801
-jdbc.password=123456
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
+#jdbc.url=jdbc:mysql://localhost:3306/jb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=dev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20181217?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
-#\u521d\u59cb\u8fde\u63a5\u6570
 jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
 jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
-#jdbc.maxIdle=20
-#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
 jdbc.minIdle=0
-#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
-jdbc.maxWait=120000
-#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
+jdbc.maxWait=60000
 jdbc.testOnBorrow=false
-#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
 jdbc.testOnReturn=false
-#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
 jdbc.testWhileIdle=true
-#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
-#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
 jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
 jdbc.minEvictableIdleTimeMillis=300000
-#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
 jdbc.removeAbandoned=true
-#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
 jdbc.removeAbandonedTimeout=300
-#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
-jdbc.logAbandoned=true
-#\u7edf\u8ba1\u76d1\u63a7
+jdbc.logAbandoned=false
 jdbc.filters=stat
 
-logging.level.com.goafanti=DEBUG
+logging.level.com.goafanti=ERROR
 
-jedis.host=192.168.0.17
+jedis.host=localhost
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456
@@ -52,24 +35,27 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-app.mobile.website=http://m.kedexinxi.com
+app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-static.host=//sclient.jishutao.com:8088/client/1.0.0
-
-portal.host=//sportal.jishutao.com:80/portal/1.0.1
-
-avatar.host=//sclient.jishutao.com
-avatar.upload.host=//sclient.jishutao.com/upload
+#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
+portal.host=//sportal.jishutao.com:80/portal/1.0.2
 
-upload.path=F:/jitao/public/upload
-upload.private.path=F:/jitao/private/upload
+avatar.host=//ss.jishutao.com
+avatar.upload.host=//ss.jishutao.com/upload
+
+upload.path=/data/static/junbang/upload
+upload.private.path=/data/static/private/jb/upload
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 aesSecretKey=aft1234567890123
 
 mobileCodeTemplate=SMS_37845022
+mobileRemindCodeTemplate=SMS_137421952
 patentTemplate=SMS_72005286
 examineAdopt=SMS_147971258
 examineNoAdopt=SMS_147971261
@@ -82,10 +68,8 @@ jiguang.appKey=dbcea43366e038073452a04e
 jiguang.masterSecret=59792298288e4f635c737def
 jiguang.pushUrl=https://api.jpush.cn/v3/push
 
-ffmpeg.path=E\:\\mytools\\ffmpeg-20181028-bdfd2e3-win64-static\\bin\\ffmpeg.exe
-ffprobe.path=E\:\\mytools\\ffmpeg-20181028-bdfd2e3-win64-static\\bin\\ffprobe.exe
-
-video.server=http://192.168.0.20
-video.temppath=F:/data/local/video
-
 collect_flag=true
+ffmpeg.path=/usr/bin/ffmpeg
+ffprobe.path=/usr/bin/ffprobe
+video.server=http://119.23.60.246
+video.temppath=/data/video/

+ 22 - 72
src/main/webapp/WEB-INF/views/common.html

@@ -26,11 +26,11 @@
 	  <div class="header">
 		<div class="container">
 			<div class="photoHeader"><img th:src="${portalHost+'/img/newMenu/index_header400.jpg'}" alt="">400-8800-962</div>
-			<div class="navigationList webkitHover">
+			<!-- <div class="navigationList webkitHover">
 				<a>网站导航
 					<span class="webkitDown"></span>
 				</a>
-			</div>
+			</div> -->
 			<div>
 				<ul>
 					<li>
@@ -52,7 +52,7 @@
 					</li>
 				</ul>
 			</div>
-			<div class="APP">
+			<!-- <div class="APP">
 				<img th:src="${portalHost+'/img/indedImg/inded30.png'}" alt="" />
 				<a>APP下载
 					<span class="webkitDown"></span>
@@ -67,11 +67,11 @@
 						<p>Android版</p>
 					</div>
 				</div>
-			</div>
+			</div> -->
 		</div>
 		<div class="navWrapper webkitHover">
 			<ol>
-				<li>
+				<!-- <li>
 					<div>知识产权申请</div>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
@@ -92,7 +92,7 @@
 						<a th:href="@{/portal/service/patent#encyclopedias}">知产百科</a>
 					</p>
 
-				</li>
+				</li> -->
 				<li>
 					<div>知识产权运用</div>
 					<span>
@@ -137,40 +137,8 @@
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
 					</p> -->
 				</li>
+				
 				<!-- <li>
-					<div>知识产权维权</div>
-					<span>
-						<img th:src="${portalHost+'/img/index/index_webkit4.png'}" alt="">
-					</span>
-					<p>
-						<a th:href="@{/portal/service/patent#recentPublish}">最新发布</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/patent#patentService}">专利服务</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/patent#branchService}">商标服务</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/patent#copyrightService}">版权服务</a>
-					</p>
-					<p>
-						<a th:href="@{/portal/service/patent#encyclopedias}">知产百科</a>
-					</p>
-				</li> -->
-				<!-- <li>
-					<div>智库咨询</div>
-					<span>
-						<img src="http://192.168.1.166/portal/1.0.0/img/index/index_webkit1.png" alt="">
-					</span>
-					<p>
-						<a href="#">智政</a>
-					</p>
-					<p>
-						<a href="#">智者</a>
-					</p>
-				</li> -->
-				<li>
 					<div>关于公司 </div>
 					<span>
 						<img th:src="${portalHost+'/img/index/index_webkit1.png'}" alt="">
@@ -187,7 +155,7 @@
 					<p>
 						<a th:href="@{/portal/aboutUs#development}">发展历程</a>
 					</p>
-				</li>
+				</li> -->
 			</ol>
 		</div>
 	</div>
@@ -210,46 +178,28 @@
  
                        </div>
                     </li>
-                    <li th:class="${subM}=='apply'?active:''" >
-                    <div>
-                        <a th:href="@{/portal/service/patent}">申请</a>
- 
-                       </div>
-                    </li>
                     <li th:class="${subM}=='serviceIndex'?active:''" >
                     <div>
-                        <a th:href="@{/portal/service/serviceIndex}">运用</a>
+                        <a th:href="@{/portal/thinkTank/policyList}">采购信息</a>
  
                        </div>
                     </li>
-                    <li th:class="${subM}=='adviser'?active:''" >
-                       <div>
-                         <a th:href="@{/portal/adviser}">顾问</a>
-                       </div>
-                    </li>                         
                     <li th:class="${subM}=='trading'?active:''" >
                    		 <div>
-	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">交易</a>
-	 						<!-- <ol class="subnavigation">
-	                            <li>
-	                                 <a th:href="@{/portal/technologyTrading/achievement}">技术成果</a>
-	                            </li>
-	                            <li>
-	                                <a th:href="@{/portal/technologyTrading/demand}">技术需求</a>
-	                            </li>
-	                        </ol> -->
+	                        <a th:href="@{/portal/technologyTrading/tradingIndex}">技术转化</a>
                         </div>
-                    </li>  
-                     <li th:class="${subM}=='safeguarding'?active:''" >
-                     	<div>
-                         <a th:href="@{/portal/service/safeguarding}">维权</a>
+                    </li>
+                    <li th:class="${subM}=='trading'?active:''" >
+                   		 <div>
+	                        <a th:href="@{/portal/service/serviceList}">服务配套</a>
                         </div>
-                     </li>                         
-                     <li th:class="${subM}=='special'?active:''" >
+                    </li>   
+                     <li th:class="${subM}=='safeguarding'?active:''" >
                      	<div>
-                         <a th:href="@{/portal/special}">社区</a>
+                         <a th:href="@{/portal/aboutUs}">关于</a>
                         </div>
                      </li>                         
+                             
                 </ul>
             </div>
             <!-- <div class="logo_photo">全国统一服务热线:400-8800-962</div> -->
@@ -309,14 +259,14 @@
 							<p>合作电话:0731-89907207</p>
 							<p>400-8800-962</p>
 						</div>
-						<div class="cont_rightapp">
+						<!-- <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> -->
 						<div class="cont_right">
 							<img th:src="${portalHost+'/img/erweima.jpg'}" alt=""/>
 							<p>微信公众号</p>
@@ -379,7 +329,7 @@
 						<img th:src="${portalHost+'/img/erweima.jpg'}" alt="">
 					</div>
 				</li>
-				<li>
+				<!-- <li>
 					<a>
 						<span class="glyphicon glyphicon-bookmark"></span>
 					</a>
@@ -394,7 +344,7 @@
 							<p>Android版</p>
 						</div>
 					</div>
-				</li>
+				</li> -->
 			</ul>
 		</div>
 	</th:block>

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

@@ -51,14 +51,14 @@
 			<a class="carousel-control right" href="#myCarousel" data-slide="next">&rsaquo;</a>
 		</div>
 		
-		<div class="indexSearch">
-			<!-- <ul class="jumpType">
+	<!-- 	<div class="indexSearch">
+			<ul class="jumpType">
 				<li class="active">成果</li>
 				<li>需求</li>
 				<li>专利</li>
 				<li>政策</li>
 				<li>项目</li>
-			</ul> -->
+			</ul>
 			<div class="search-inp">
 				<div class="input-group searchDiv">
 					<input type="text" class="form-control demandSearch" placeholder="输入你感兴趣的内容">
@@ -84,8 +84,8 @@
 					<a href="/portal/thinkTank/policyList?type=98">知产百科</a>
 				</li>
 			</ul>
-			<!-- <span class="apply head_login">申请会员</span> -->
-		</div>
+			<span class="apply head_login">申请会员</span>
+		</div> -->
 
 	<!-- 主体内容区域 -->
 	<div id="terrace">
@@ -93,6 +93,7 @@
 			
 				<img th:src="${portalHost+'/img/indedImg/inded12.png'}" alt="" />
 			</div>
+			<!-- 
 			<div class="terrace_cont">
 				<div>
 					<img th:src="${portalHost+'/img/indedImg/inded1.png'}" alt="" />
@@ -114,8 +115,8 @@
 						<p>严选数千位专家顾问答疑解惑</p>
 					</div>
 				</div>
-			</div>
-		</div>
+			</div>-->
+		</div> 
 		<div id="apply">
 			<div class="apply">
 				<div class="apply_left">
@@ -139,14 +140,42 @@
 			</div>
 			
 		</div>
-		<div id="wield">
+		<div class="container">
+		<div class="RecommendTitle">
+			<h2>政策资讯</h2>
+			<span></span>
+		</div>
+		<div class="news">
+			<div class="consultation">
+				<h4>资讯
+				 <a th:href="@{/portal/thinkTank/policyList?type=0}"><span class="line"></span><span>></span></a>
+				</h4>
+				<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>
+							<div class="newTxt">
+								<h5 th:text="${#strings.abbreviate(n.title,18)}">加奖金哦违法爱按金额积分经济积分经济积分经济if啊积分经济交往和居委会看看哇卡哇卡...</h5>
+								<p th:text="${#strings.abbreviate(n.summary,65)}">哈哈哈哈海鸥科技打飞机附近的啊我的㘝技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
+							</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 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 标签。
@@ -157,8 +186,8 @@
 				<div class="moreVideo">
 				<a href="/portal/video.html">查看更多视频 >></a>
 			</div>
-		</div>
-		<div class="brands">
+		</div> -->
+		<!-- <div class="brands">
 			<a th:href="@{/portal/service/brandBuild}">
 			<img th:src="${portalHost+'/img/indedImg/inded6.png'}" alt="" />
 			</a>
@@ -187,7 +216,7 @@
 				<img th:src="${portalHost+'/img/indedImg/inded35.jpg'}" alt="" />
 				<img th:src="${portalHost+'/img/indedImg/inded36.jpg'}" alt="" />
 			</div>
-		</div>
+		</div> -->
 		<div id="hotProject">
 			<div class="terrace_title">
 				<img th:src="${portalHost+'/img/indedImg/inded10.png'}" alt="" />
@@ -201,91 +230,8 @@
 				</div>
 			</div>
 		</div>
-	<div class="container">
-		<div class="RecommendTitle">
-			<h2>政策资讯</h2>
-			<span></span>
-		</div>
-		<div class="news">
-			<div class="policy">
-				<h4>政策
-					<a th:href="@{/portal/thinkTank/policyList?type=1}"><span class="line"></span><span>></span></a> 
-					
-				</h4>
-				<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)}">
-							<div class="time">
-								<span th:text="${#dates.format(p.releaseDate,'MM-dd')}">03-12</span>
-								<span th:text="${#dates.format(p.releaseDate,'yyyy')}">2018</span>
-							</div>
-							<div class="newTxt">
-								<h5 th:text="${#strings.abbreviate(p.title,18)}"></h5>
-								<p th:text="${#strings.abbreviate(p.summary,65)}"></p>
-							</div>
-						</a>
-					</li>
-				</ul>
-			</div>
-			<div class="consultation">
-				<h4>资讯
-				 <a th:href="@{/portal/thinkTank/policyList?type=0}"><span class="line"></span><span>></span></a>
-				</h4>
-				<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>
-							<div class="newTxt">
-								<h5 th:text="${#strings.abbreviate(n.title,18)}">加奖金哦违法爱按金额积分经济积分经济积分经济if啊积分经济交往和居委会看看哇卡哇卡...</h5>
-								<p th:text="${#strings.abbreviate(n.summary,65)}">哈哈哈哈海鸥科技打飞机附近的啊我的㘝技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的技打飞机附近的啊我的酒店设计大姐姐 但是大家觉得结算单基督教圣诞节ajd...</p>
-							</div>
-						</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-		<div class="RecommendTitle">
-			<h2>技淘观点精选</h2>
-			<span></span>
-		</div>
-		<!-- <div class="view">
-			<h4>
-				<a th:href="@{/portal/thinkTank/policyList?type=99}"><span class="line"></span><span>></span></a>
-			</h4>
-		</div> -->
-		<div class="publicNumber">
-			<!-- <div class="video" >
-				<iframe frameborder="0" width="565" height="320" th:src="${videoUrl}==null?'https://v.qq.com/iframe/player.html?vid=y0721rsmr4r&tiny=0&auto=0':${videoUrl}" allowfullscreen></iframe>
-			</div> -->
-			<ul>
-				
-				<li th:each="sc:${subscription}">
-					<a th:href="@{/portal/news/newsDetail(id=${sc.id},type=1)}">
-						<div class="time">
-							<span th:text="${#dates.format(sc.releaseDate,'MM-dd')}">03-12</span>
-							<span th:text="${#dates.format(sc.releaseDate,'yyyy')}">2018</span>
-						</div>
-						<p th:text="${#strings.abbreviate(sc.title,18)}"></p>
-					</a>
-				</li>
-			</ul>
-		</div>
-		<a th:href="@{/portal/thinkTank/policyList?type=99}" class="more">MORE
-			<span></span>
-		</a>
-	</div>
-	<div class="initModel">
-		<div>
-			<span class="glyphicon glyphicon-remove"></span>
-			<a th:href="@{/portal/invitation}" class="moreActive">了解活动规则详情 >></a>
-			<a th:href="@{/user/signIn}" class="ljZhuCe">立即注册 >></a>
-		</div>
-	</div>
+	
+		
 	<footer>
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html