Home Explore Help
Register Sign In
jiapeng
/
portal-front
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 761 Releases 0 Wiki
Browse Source

发现冲突

biwasai 7 years ago
parent
eedb27c286
commit
83365fb6d6
1 changed files with 80 additions and 11 deletions
Split View Show Diff Stats
  1. 80 11
      discover.html

+ 80 - 11
discover.html
View File 

@ -1,4 +1,4 @@
1 
 <!DOCTYPE html>
1 
 <!DOCTYPE html>
2 2 
<html>
3 3 
<head>
4 4 
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

@ -10,9 +10,8 @@
10 10 
<link type="text/css" href="css/common.css" rel="stylesheet">
11 11 
<link type="text/css" href="css/genindex.css" rel="stylesheet">
12 12 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
13
13 
<script type="text/javascript" src="js/public/swiper.min.js"></script>
14 14 
</head>
15
16 15 
<body>
17 16 
<header id="header">
18 17 
	<script src="js/header.js"></script>

@ -20,14 +19,85 @@
20 19 
<div id="container">
21 20 
	<div class="containerCon">
22 21 
		<div class="contentCon clearfix">
23 
			<div class="leftconBox floatL">
24 
				<ul class="table-item" id="table-item" style="position: relative;min-height:500px;"></ul>
25 
				<div class="tcdPageCode"></div>
22 
			<div class="leftconBox floatL" style="background: #f4f6f8;">
23 
				<div class="slide-box clearfix">
24
25 
				</div>
26 
				<div class="table-box">
27 
					<div class="table-tab">
28 
						<ul class="table-tab-item clearfix">
29 
							<li class="table-tab-slide table-tab-slide-active">最新文章</li>
30 
							<li class="table-tab-slide">前沿动态</li>
31 
							<li class="table-tab-slide">学术经验</li>
32 
							<li class="table-tab-slide">分析检测</li>
33 
							<li class="table-tab-slide">会议培训</li>
34 
							<li class="rightbtn"><span>更多栏目</span><em class="foldtr"></em>
35 
								<ul class="table-drop">
36 
									<li class="table-tab-slide">科袖访谈</li>
37 
									<li class="table-tab-slide">招聘招生</li>
38 
								</ul>
39 
							</li>
40
41 
						</ul>
42 
					</div>
43 
					<div class="table-body">
44 
					    <div class="haveData">
45 
					    	<div class="table-item-list">
46 
					    		<ul class="listitemdiv listmorediv" id="table-item-0"></ul>
47 
								<div class="tcdPageCode"></div>
48 
					    	</div>
49 
					    	<div class="table-item-list">
50 
					    		<ul class="listitemdiv listmorediv" id="table-item-1"></ul>
51 
								<div class="tcdPageCode"></div>
52 
					    	</div>
53 
					    	<div class="table-item-list">
54 
					    		<ul class="listitemdiv listmorediv" id="table-item-2"></ul>
55 
								<div class="tcdPageCode"></div>
56 
					    	</div>
57 
					    	<div class="table-item-list">
58 
					    		<ul class="listitemdiv listmorediv" id="table-item-3"></ul>
59 
								<div class="tcdPageCode"></div>
60 
					    	</div>
61 
					    	<div class="table-item-list">
62 
					    		<ul class="listitemdiv listmorediv" id="table-item-4"></ul>
63 
								<div class="tcdPageCode"></div>
64 
					    	</div>
65 
					    	<div class="table-item-list">
66 
					    		<ul class="listitemdiv listmorediv" id="table-item-5"></ul>
67 
								<div class="tcdPageCode"></div>
68 
					    	</div>
69 
					    	<div class="table-item-list">
70 
					    		<ul class="listitemdiv listmorediv" id="table-item-6"></ul>
71 
								<div class="tcdPageCode"></div>
72 
					    	</div>
73 
					    </div>
74 
					</div>
75 
				</div>
26 76 
			</div>
27 
			<div class="advertBox floatR">
28 
				<ul class="advertItem">
29 
					<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
30 
				</ul>
77 
			<div class="rightconBox floatR">
78 
				<div class="conItem conBlock displayNone">
79 
					<div class="form-item otherBlock">
80 
						<div class="aboutTit">重大新闻</div>
81 
						<div class="form-result currentArt currentArt2">
82 
							<ul id="importNews">
83 
							</ul>
84 
						</div>
85 
					</div>
86 
				</div>
87 
				<div class="conItem advertBox">
88 
					<ul class="advertItem">
89 
						<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
90 
					</ul>
91 
				</div>
92 
				<div class="conItem conBlock displayNone">
93 
					<div class="form-item otherBlock">
94 
						<div class="aboutTit">热门文章</div>
95 
						<div class="form-result currentArt currentArt2">
96 
							<ol class="hotList" id="hotNews">
97 
							</ol>
98 
						</div>
99 
					</div>
100 
				</div>
31 101 
			</div>
32 102 
		</div>
33 103 
	</div>

@ -41,6 +111,5 @@
41 111 
<script type="text/javascript" src="js/jquery.page.js"></script>
42 112 
<script type="text/javascript" src="js/common.js"></script>
43 113 
<script type="text/javascript" src="js/discover.js"></script>
44
45 114 
</body>
46 115 
</html>