Startseite Erkunden Hilfe
Registrieren Anmelden
jiapeng
/
portal-front
Beobachten 3
Favorit hinzufügen 0
Fork 0
Code Issues 0 Pull-Requests 0 Commits 1489 Releases 0 Wiki
Quellcode durchsuchen

解决冲突1

lyn7568 vor 5 Jahren
Ursprung
a1d7d7077b 80da7a4008
Commit
6bf4836be8
2 geänderte Dateien mit 522 neuen und 154 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 313 154
      e/search.html
  2. 209 0
      searchNew.html

+ 313 - 154
e/search.html
Datei anzeigen 

@ -1,155 +1,314 @@
1 
<!DOCTYPE html>
2 
<html style="max-width: 640px;margin: auto;">
3 
<head>
4 
<meta charset="UTF-8">
5 
<title>搜索-科袖网</title>
6 
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 
<link rel="stylesheet" href="../css/bootstrap.min.css" />
8 
<link rel="stylesheet" href="../css/reset.css" />
9 
<link rel="stylesheet" href="../css/common.css" />
10 
<link rel="stylesheet" href="../css/swiper.min.css" />
11 
<link rel="stylesheet" href="../css/mmenu.css" />
12 
<link rel="stylesheet" href="../css/share.css" />
13 
<script type="text/javascript" src="../js/jquery-1.11.1.js"></script>
14 
<script type="text/javascript" src="../js/public/swiper.min.js"></script>
15 
<script type="text/javascript" src="../js/public/jquery.mmenu.js"></script>
16 
<script type="text/javascript"src="../js/public/swiper.min.js"></script>
17 
	$(function() {
18 
		$("nav#menu").mmenu();
19 
		var myscrollFil;
20 
	    function loaded(){
21 
	        setTimeout(function(){
22 
	            myscrollFil=new iScroll("wrapper",{
23 
	            	mouseWheel: true,
24 
					onScrollMove:function(){
25 
						myscrollFil.refresh()
26 
					}
27 
	            });
28
29 
	        },100 );
30 
	    }
31 
	    window.addEventListener("load",loaded,false);
32 
		document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
33 
	});
34
35 
</script>
36
37 
</head>
38 
<body>
39 
<div class="bomb-box"></div>
40 
<div class="contentBody2" id="page">
41 
	<div class="fixedBlock">
42 
		<div class="searchBox">
43 
			<form action="" onsubmit="return false;" id="searB" class="searchboxNewT">
44 
	      		<input type="search" class="form-control" placeholder="请输入关键词" id="searchval" />
45 
	      	</form>
46 
	        <a href="#menu" class="rightnav" id="sele">
47 
				<div class="serchicon icon-filter"><span class="badge" id="seler"></span></div>筛选
48 
			</a>
49 
	    </div>
50 
	    <div class="tabBox">
51 
			<div class="swiper-container-tab">
52 
				<div class="swiper-wrapper swiper-wrapper-tab tr">
53 
					<div class="swiper-slide swiper-slide-tab active-tab" data-tab="1">找专家</div>
54 
					<div class="swiper-slide swiper-slide-tab" data-tab="7">找服务</div>
55 
					<div class="swiper-slide swiper-slide-tab" data-tab="2">找资源</div>
56 
					<div class="swiper-slide swiper-slide-tab" data-tab="4">找专利</div>
57 
					<div class="swiper-slide swiper-slide-tab" data-tab="5">找论文</div>
58 
					<!-- <div class="swiper-slide swiper-slide-tab" data-tab="3">找文章</div> -->
59 
					<div class="swiper-slide swiper-slide-tab" data-tab="6">找企业</div>
60 
				</div>
61 
			</div>
62 
		</div>
63 
	</div>
64 
	<div class="swiper-container madiaBlock swiper-container-main">
65 
		<!--<div class="refreshtip">下拉可以刷新</div>-->
66 
		<div class="swiper-wrapper swiper-wrapper-main w">
67 
			<div class="swiper-slide d">
68 
				<!--<div class="init-loading list-group-item" style="display: none;">下拉可以刷新</div>-->
69 
				<div class="swiper-container2">
70 
					<div class="swiper-wrapper">
71 
						<div class="swiper-slide list-group">
72 
							<ul class="mui-table-view" id="proList">
73
74 
							</ul>
75 
						</div>
76 
						<div class="swiper-slide list-group">
77 
							<ul class="mui-table-view" id="serviceList">
78
79 
							</ul>
80 
						</div>
81 
						<div class="swiper-slide list-group">
82 
							<ul class="mui-table-view" id="resourceList">
83
84 
							</ul>
85 
						</div>
86 
						<div class="swiper-slide list-group">
87 
							<ul class="mui-table-view" id="patentList">
88
89 
							</ul>
90 
						</div>
91 
						<div class="swiper-slide list-group">
92 
							<ul class="mui-table-view" id="paperList">
93
94 
							</ul>
95 
						</div>
96 
						<!-- <div class="swiper-slide list-group">
97 
							<ul class="mui-table-view" id="articleList">
98
99 
							</ul>
100 
						</div> -->
101 
						<div class="swiper-slide list-group">
102 
							<ul class="mui-table-view" id="companyList">
103
104 
							</ul>
105 
						</div>
106 
					</div>
107 
				</div>
108 
			</div>
109 
		</div>
110 
		<div class="loadtip">上拉加载更多</div>
111 
		<div class="swiper-scrollbar"></div>
112 
	</div>
113 
	<nav id="menu">
114 
		<div class="filterCon">
115 
			<h1 class="toptit">“找专家”</h1>
116 
			<div id="wrapper">
117 
				<div class="midCon" id="scroller">
118 
					<div class="filterListNew">
119 
						<div class="rightbtn">所在城市<span class="spantext">不限</span><em class="foldtr"></em></div>
120 
						<ul class="filterUl fourUl" id="address">
121
122 
				       	</ul>
123 
					</div>
124 
					<div class="filterListNew">
125 
						<div class="rightbtn">学术领域<span class="spantext">不限</span><em class="foldtr"></em></div>
126 
						<ul class="filterUl threeUl" id="subject">
127
128 
				       	</ul>
129 
					</div>
130 
					<div class="filterListNew">
131 
						<div class="rightbtn">行业领域<span class="spantext">不限</span><em class="foldtr"></em></div>
132 
						<ul class="filterUl threeUl" id="industry">
133
134 
				       	</ul>
135 
					</div>
136 
				</div>
137 
			</div>
138 
			<div class="submitBtn clearfix">
139 
				<span class="floatL topWord" id="oRes">重置</span>
140 
				<span class="floatR topWord" id="com">完成</span>
141 
			</divclass="submitBtn clearfix">
142 
		</div>
143 
	</nav>
144 
</div>
145
146
147 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
148 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
149 
<script type="text/javascript" src="../js/public/cacheUtil.js"></script>
150 
<script type="text/javascript" src="../js/public/iscroll.js"></script>
151 
<script src="../js/search_h5.js" type="text/javascript" charset="utf-8"></script>
152
153 
</body>
154
1
2 
<!DOCTYPE html>
3 
<html style="max-width: 640px;margin: auto;">
4
5 
<head>
6 
<meta charset="UTF-8">
7 
<title>搜索-科袖网</title>
8 
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
9 
<link rel="stylesheet" href="../css/bootstrap.min.css" />
10 
<link rel="stylesheet" href="../css/reset.css" />
11 
<link rel="stylesheet" href="../css/common.css" />
12 
<link rel="stylesheet" href="../css/swiper.min.css" />
13 
<link rel="stylesheet" href="../css/mmenu.css" />
14 
<link rel="stylesheet" href="../css/share.css" />
15 
<script type="text/javascript" src="../js/jquery-1.11.1.js"></script>
16 
<script type="text/javascript" src="../js/public/swiper.min.js"></scriptsrc="../js/public/swiper.min.js"></script>
17 
<script type="text/javascript" src="../js/public/jquery.mmenu.js"></script>
18 
<script type="text/javascript">
19 
	$(function() {
20 
		$("nav#menu").mmenu();
21 
		var myscrollFil;
22 
	    function loaded(){
23 
	        setTimeout(function(){
24 
	            myscrollFil=new iScroll("wrapper",{
25 
	            	mouseWheel: true,
26 
					onScrollMove:function(){
27 
						myscrollFil.refresh()
28 
					}
29 
	            });
30
31 
	        },100 );
32 
	    }
33 
	    window.addEventListener("load",loaded,false);
34 
		document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
35 
	});
36
37 
</script>
38
39 
</head>
40
41 
<body>
42 
<div class="bomb-box"></div>
43 
<div class="contentBody2" id="page">
44 
	<div class="fixedBlock">
45 
		<div class="searchBox">
46 
			<form action="" onsubmit="return false;" id="searB" class="searchboxNewT">
47 
	      		<input type="search" class="form-control" placeholder="请输入关键词" id="searchval" />
48 
	      	</form>
49 
	        <a href="#menu" class="rightnav" id="sele">
50 
				<div class="serchicon icon-filter"><span class="badge" id="seler"></span></div>筛选
51 
			</a>
52 
	    </div>
53 
	    <div class="tabBox">
54 
			<div class="swiper-container-tab">
55 
				<div class="swiper-wrapper swiper-wrapper-tab tr">
56 
					<div class="swiper-slide swiper-slide-tab active-tab" data-tab="1">找专家</div>
57 
					<div class="swiper-slide swiper-slide-tab" data-tab="7">找服务</div>
58 
					<div class="swiper-slide swiper-slide-tab" data-tab="2">找资源</div>
59 
					<div class="swiper-slide swiper-slide-tab" data-tab="4">找专利</div>
60 
					<div class="swiper-slide swiper-slide-tab" data-tab="5">找论文</div>
61 
					<!-- <div class="swiper-slide swiper-slide-tab" data-tab="3">找文章</div> -->
62 
					<div class="swiper-slide swiper-slide-tab" data-tab="6">找企业</div>
63 
				</div>
64 
			</div>
65 
		</div>
66 
	</div>
67 
	<div class="swiper-container madiaBlock swiper-container-main">
68 
		<!--<div class="refreshtip">下拉可以刷新</div>-->
69 
		<div class="swiper-wrapper swiper-wrapper-main w">
70 
			<div class="swiper-slide d">
71 
				<!--<div class="init-loading list-group-item" style="display: none;">下拉可以刷新</div>-->
72 
				<div class="swiper-container2">
73 
					<div class="swiper-wrapper">
74 
						<div class="swiper-slide list-group">
75 
							<ul class="mui-table-view" id="proList">
76
77 
							</ul>
78 
						</div>
79 
						<div class="swiper-slide list-group">
80 
							<ul class="mui-table-view" id="serviceList">
81
82 
							</ul>
83 
						</div>
84 
						<div class="swiper-slide list-group">
85 
							<ul class="mui-table-view" id="resourceList">
86
87 
							</ul>
88 
						</div>
89 
						<div class="swiper-slide list-group">
90 
							<ul class="mui-table-view" id="patentList">
91
92 
							</ul>
93 
						</div>
94 
						<div class="swiper-slide list-group">
95 
							<ul class="mui-table-view" id="paperList">
96
97 
							</ul>
98 
						</div>
99 
						<!-- <div class="swiper-slide list-group">
100 
							<ul class="mui-table-view" id="articleList">
101
102 
							</ul>
103 
						</div> -->
104 
						<div class="swiper-slide list-group">
105 
							<ul class="mui-table-view" id="companyList">
106
107 
							</ul>
108 
						</div>
109 
					</div>
110 
				</div>
111 
			</div>
112 
		</div>
113 
		<div class="loadtip">上拉加载更多</div>
114 
		<div class="swiper-scrollbar"></div>
115 
	</div>
116 
	<nav id="menu">
117 
		<div class="filterCon">
118 
			<h1 class="toptit">“找专家”</h1>
119 
			<div id="wrapper">
120 
				<div class="midCon" id="scroller">
121 
					<div class="filterListNew">
122 
						<div class="rightbtn">所在城市<span class="spantext">不限</span><em class="foldtr"></em></div>
123 
						<ul class="filterUl fourUl" id="address">
124
125 
				       	</ul>
126 
					</div>
127 
					<div class="filterListNew">
128 
						<div class="rightbtn">学术领域<span class="spantext">不限</span><em class="foldtr"></em></div>
129 
						<ul class="filterUl threeUl" id="subject">
130
131 
				       	</ul>
132 
					</div>
133 
					<div class="filterListNew">
134 
						<div class="rightbtn">行业领域<span class="spantext">不限</span><em class="foldtr"></em></div>
135 
						<ul class="filterUl threeUl" id="industry">
136
137 
				       	</ul>
138 
					</div>
139 
				</div>
140 
			</div>
141 
			<div class="submitBtn clearfix"class="submitBtn clearfix">
142 
				<span class="floatL topWord" id="oRes">重置</span>
143 
				<span class="floatR topWord" id="com">完成</span>
144 
			</div>
145 
		</div>
146 
	</nav>
147 
</div>
148
149
150 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
151 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
152 
<script type="text/javascript" src="../js/public/cacheUtil.js"></script>
153 
<script type="text/javascript" src="../js/public/iscroll.js"></script>
154 
<script src="../js/search_h5.js" type="text/javascript" charset="utf-8"></script>
155
156 
</body>
157
158
159 
<!DOCTYPE html>
160 
<html style="max-width: 640px;margin: auto;">
161 
<head>
162 
<meta charset="UTF-8">
163 
<title>搜索-科袖网</title>
164 
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
165 
<link rel="stylesheet" href="../css/bootstrap.min.css" />
166 
<link rel="stylesheet" href="../css/reset.css" />
167 
<link rel="stylesheet" href="../css/common.css" />
168 
<link rel="stylesheet" href="../css/swiper.min.css" />
169 
<link rel="stylesheet" href="../css/mmenu.css" />
170 
<link rel="stylesheet" href="../css/share.css" />
171 
<script type="text/javascript" src="../js/jquery-1.11.1.js"></script>
172 
<script type="text/javascript" src="../js/public/swiper.min.js"></script>
173 
<script type="text/javascript" src="../js/public/jquery.mmenu.js"></script>
174 
<script type="text/javascript">
175 
	$(function() {
176 
		$("nav#menu").mmenu();
177 
		var myscrollFil;
178 
	    function loaded(){
179 
	        setTimeout(function(){
180 
	            myscrollFil=new iScroll("wrapper",{
181 
	            	mouseWheel: true,
182 
					onScrollMove:function(){
183 
						myscrollFil.refresh()
184 
					}
185 
	            });
186
187 
	        },100 );
188 
	    }
189 
	    window.addEventListener("load",loaded,false);
190 
		document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
191 
	});
192
193 
</script>
194
195 
</head>
196 
<body>
197 
<div class="bomb-box"></div>
198 
<div class="contentBody2" id="page">
199 
	<div class="fixedBlock">
200 
		<div class="searchBox">
201 
			<form action="" onsubmit="return false;" id="searB" class="searchboxNewT">
202 
	      		<input type="search" class="form-control" placeholder="请输入关键词" id="searchval" />
203 
	      	</form>
204 
	        <a href="#menu" class="rightnav" id="sele">
205 
				<div class="serchicon icon-filter"><span class="badge" id="seler"></span></div>筛选
206 
			</a>
207 
	    </div>
208 
	    <div class="tabBox">
209 
			<div class="swiper-container-tab">
210 
				<div class="swiper-wrapper swiper-wrapper-tab tr">
211 
					<div class="swiper-slide swiper-slide-tab active-tab" data-tab="1">找专家</div>
212 
					<div class="swiper-slide swiper-slide-tab" data-tab="7">找服务</div>
213 
					<div class="swiper-slide swiper-slide-tab" data-tab="2">找资源</div>
214 
					<div class="swiper-slide swiper-slide-tab" data-tab="4">找专利</div>
215 
					<div class="swiper-slide swiper-slide-tab" data-tab="5">找论文</div>
216 
					<!-- <div class="swiper-slide swiper-slide-tab" data-tab="3">找文章</div> -->
217 
					<div class="swiper-slide swiper-slide-tab" data-tab="6">找企业</div>
218 
				</div>
219 
			</div>
220 
		</div>
221 
	</div>
222 
	<div class="swiper-container madiaBlock swiper-container-main">
223 
		<!--<div class="refreshtip">下拉可以刷新</div>-->
224 
		<div class="swiper-wrapper swiper-wrapper-main w">
225 
			<div class="swiper-slide d">
226 
				<!--<div class="init-loading list-group-item" style="display: none;">下拉可以刷新</div>-->
227 
				<div class="swiper-container2">
228 
					<div class="swiper-wrapper">
229 
						<div class="swiper-slide list-group">
230 
							<ul class="mui-table-view" id="proList">
231
232 
							</ul>
233 
						</div>
234 
						<div class="swiper-slide list-group">
235 
							<ul class="mui-table-view" id="serviceList">
236
237 
							</ul>
238 
						</div>
239 
						<div class="swiper-slide list-group">
240 
							<ul class="mui-table-view" id="resourceList">
241
242 
							</ul>
243 
						</div>
244 
						<div class="swiper-slide list-group">
245 
							<ul class="mui-table-view" id="patentList">
246
247 
							</ul>
248 
						</div>
249 
						<div class="swiper-slide list-group">
250 
							<ul class="mui-table-view" id="paperList">
251
252 
							</ul>
253 
						</div>
254 
						<!-- <div class="swiper-slide list-group">
255 
							<ul class="mui-table-view" id="articleList">
256
257 
							</ul>
258 
						</div> -->
259 
						<div class="swiper-slide list-group">
260 
							<ul class="mui-table-view" id="companyList">
261
262 
							</ul>
263 
						</div>
264 
					</div>
265 
				</div>
266 
			</div>
267 
		</div>
268 
		<div class="loadtip">上拉加载更多</div>
269 
		<div class="swiper-scrollbar"></div>
270 
	</div>
271 
	<nav id="menu">
272 
		<div class="filterCon">
273 
			<h1 class="toptit">“找专家”</h1>
274 
			<div id="wrapper">
275 
				<div class="midCon" id="scroller">
276 
					<div class="filterListNew">
277 
						<div class="rightbtn">所在城市<span class="spantext">不限</span><em class="foldtr"></em></div>
278 
						<ul class="filterUl fourUl" id="address">
279
280 
				       	</ul>
281 
					</div>
282 
					<div class="filterListNew">
283 
						<div class="rightbtn">学术领域<span class="spantext">不限</span><em class="foldtr"></em></div>
284 
						<ul class="filterUl threeUl" id="subject">
285
286 
				       	</ul>
287 
					</div>
288 
					<div class="filterListNew">
289 
						<div class="rightbtn">行业领域<span class="spantext">不限</span><em class="foldtr"></em></div>
290 
						<ul class="filterUl threeUl" id="industry">
291
292 
				       	</ul>
293 
					</div>
294 
				</div>
295 
			</div>
296 
			<div class="submitBtn clearfix">
297 
				<span class="floatL topWord" id="oRes">重置</span>
298 
				<span class="floatR topWord" id="com">完成</span>
299 
			</div>
300 
		</div>
301 
	</nav>
302 
</div>
303
304
305 
<script type="text/javascript" src="../js/public/baseUtil.js"></script>
306 
<script type="text/javascript" src="../js/public/shareCom.js"></script>
307 
<script type="text/javascript" src="../js/public/cacheUtil.js"></script>
308 
<script type="text/javascript" src="../js/public/iscroll.js"></script>
309 
<script src="../js/search_h5.js" type="text/javascript" charset="utf-8"></script>
310
311 
</body>
312
313
155 314 
</html>

+ 209 - 0
searchNew.html
Datei anzeigen 

@ -1,3 +1,211 @@
1 
<<<<<<< HEAD
2 
 <!DOCTYPE html>
3 
<html>
4 
<head>
5 
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6 
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7 
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8 
<title>搜索-科袖网</title>
9 
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
10 
<link href="css/bootstrap.min.css" rel="stylesheet">
11 
<link type="text/css" href="css/common.css" rel="stylesheet">
12 
<link type="text/css" href="css/genindex.css" rel="stylesheet">
13 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
14 
<script>
15 
	var _hmt = _hmt || [];
16 
	(function() {
17 
	  var hm = document.createElement("script");
18 
	  hm.src = "https://hm.baidu.com/hm.js?d3db502c8cee2d618c01fe7aa6518602";
19 
	  var s = document.getElementsByTagName("script")[0];
20 
	  s.parentNode.insertBefore(hm, s);
21 
	})();
22 
</script>
23 
<style>
24 
.steptit{
25 
	background: #ffffff;
26 
	padding-left: 20px;
27 
	margin-bottom: 10px;
28 
}
29 
.steptit>a{
30 
	display: inline-block;
31 
	font-size: 14px;
32 
	margin-right:20px;
33 
	line-height: 40px;
34 
	cursor: pointer;
35 
}
36 
.steptit>a.active{
37 
	color: #ff9900;
38 
    border-bottom: 2px solid #ff9900;
39 
}
40 
</style>
41 
</head>
42
43 
<body>
44 
<header id="header">
45 
	<script src="js/header.js"></script>
46 
</header>
47 
<div id="container">
48 
	<div class="containerCon">
49 
		<div class="contentCon clearfix">
50 
			<div class="leftconBox searchWon floatL" style="background: none;margin-bottom: 0;">
51 
				<div class="searchdiv">
52 
					<input type="search" name="searchsome" class="searchsome col-w-12" placeholder="请输入专家姓名、机构、研究方向或相关关键词" />
53 
					<span class="searchgo">搜索</span>
54 
				</div>
55 
				<ul class="choosediv clearfix filterdiv">
56 
					<li id="tabUser" rel="itemUser" class="liactive" data-id="1">找专家</li>
57 
					<!-- <li id="tabTeam" rel="itemTeam" data-id="8">找团队</li> -->
58 
					<li id="tabSer" rel="itemSer" data-id="7">找服务</li>
59 
					<li id="tabRes" rel="itemRes" data-id="2">找资源</li>
60 
					<li id="tabPat" rel="itemPat" data-id="5">找成果</li>
61 
					<li id="tabPar" rel="itemPar" data-id="6">找论文</li>
62 
					<!-- <li id="tabArt" rel="itemArt" data-id="3">找文章</li> -->
63 
					<li id="tabCmp" rel="itemCmp" data-id="4">找企业</li>
64 
				</ul>
65 
				<div class="listdiv">
66 
					<!--找人-->
67 
					<div class="listbox" id="itemUser">
68 
						<ul class="filterListNew clearfix">
69 
							<li>
70 
								<span class="leftsort">学术领域：</span>
71 
								<ul class="filterUl academicField" id="academicField1">
72
73 
									</ul>
74 
									<span class="rightbtn">全部<em class="foldtr"></em></span>
75 
								</li>
76 
								<li>
77 
								<span class="leftsort">行业领域：</span>
78 
								<ul class="filterUl applicationIndustry" id="applicationIndustry1">
79
80 
									</ul>
81 
									<span class="rightbtn">全部<em class="foldtr"></em></span>
82 
								</li>
83 
								<li>
84 
								<span class="leftsort">所在城市：</span>
85 
								<ul class="filterUl cityList" id="cityList1">
86
87 
								</ul>
88 
								<span class="rightbtn">全部<em class="foldtr"></em></span>
89 
							</li>
90 
						</ul>
91 
						<div class="searchCon">
92 
							<ul class="listitemdiv" id="expertList"></ul>
93 
							<button class="js-load-more"></button>
94 
					    </div>
95 
					</div>
96 
					<!--找团队-->
97 
					<div class="listbox" id="itemTeam">
98 
						<ul class="filterListNew clearfix">
99 
							<li>
100 
								<span class="leftsort">学术领域：</span>
101 
								<ul class="filterUl academicField" id="academicField2">
102
103 
									</ul>
104 
									<span class="rightbtn">全部<em class="foldtr"></em></span>
105 
								</li>
106 
								<li>
107 
								<span class="leftsort">行业领域：</span>
108 
								<ul class="filterUl applicationIndustry" id="applicationIndustry2">
109
110 
									</ul>
111 
									<span class="rightbtn">全部<em class="foldtr"></em></span>
112 
								</li>
113 
								<li>
114 
								<span class="leftsort">所在城市：</span>
115 
								<ul class="filterUl cityList" id="cityList2">
116
117 
								</ul>
118 
								<span class="rightbtn">全部<em class="foldtr"></em></span>
119 
							</li>
120 
						</ul>
121 
						<div class="searchCon">
122 
							<ul class="listitemdiv" id="teamList"></ul>
123 
							<button class="js-load-more"></button>
124 
						</div>
125 
					</div>
126 
					<!--找企业-->
127 
					<div class="listbox" id="itemCmp">
128 
						<div class="searchCon">
129 
							<ul class="listitemdiv listmorediv" id="companyList"></ul>
130 
							<button class="js-load-more"></button>
131 
					    </div>
132 
					</div>
133 
					<!--找资源-->
134 
					<div class="listbox" id="itemRes">
135 
						<div class="searchCon">
136 
							<ul class="listitemdiv listmorediv" id="resourceList"></ul>
137 
							<button class="js-load-more"></button>
138 
					    </div>
139 
					</div>
140 
					<!--找专利-->
141 
					<div class="listbox" id="itemPat">
142 
						<div class="steptit">
143 
							<a data-index='0' class="active">非专利</a>
144 
							<a data-index='1'>专利</a>
145 
						</div>
146 
						<div class="searchCon">
147 
							<ul class="listitemdiv listmorediv" id="unpatentList"></ul>
148 
							<button class="js-load-more"></button>
149 
						</div>
150 
						<div class="searchCon displayNone">
151 
							<ul class="listitemdiv listmorediv" id="patentList"></ul>
152 
							<button class="js-load-more"></button>
153 
					    </div>
154 
					</div>
155 
					<!--找论文-->
156 
					<div class="listbox" id="itemPar">
157 
						<div class="searchCon">
158 
							<ul class="listitemdiv listmorediv" id="paperList"></ul>
159 
							<button class="js-load-more"></button>
160 
					    </div>
161 
					</div>
162 
					<!--找文章-->
163 
					<!-- <div class="listbox" id="itemArt">
164 
						<div class="searchCon">
165 
							<ul class="listitemdiv listmorediv" id="articalList"></ul>
166 
							<button class="js-load-more"></button>
167 
					  	</div>
168 
					</div> -->
169 
					<!--找服务-->
170 
					<div class="listbox" id="itemSer">
171 
						<div class="searchCon">
172 
							<ul class="listitemdiv listmorediv" id="serviceList"></ul>
173 
							<button class="js-load-more"></button>
174 
					    </div>
175 
					</div>
176 
				</div>
177 
			</div>
178 
			<div class="rightconBox floatR">
179 
				<div id="scroll-fixed-ad">
180 
					<div class="conItem advertBox advertItem advertItem-A"></div>
181 
					<div class="conItem advertBox advertItem advertItem-B"></div>
182 
				</div>
183 
			</div>
184 
		</div>
185 
	</div>
186 
</div>
187 
<script type="text/javascript" src="js/correctBack.js"></script>
188 
<footer>
189 
	<script type="text/javascript" src="js/footer.js"></script>
190 
</footer>
191
192 
<script type="text/javascript" src="js/tabCom.js"></script>
193 
<script type="text/javascript" src="js/jquery.cookie.js"></script>
194 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
195 
<script type="text/javascript" src="js/public/baseUtil.js"></script>
196 
<script type="text/javascript" src="js/public/genCom.js"></script>
197 
<script type="text/javascript" src="js/public/cacheUtil.js"></script>
198 
<script type="text/javascript" src="js/scrollfix.js"></script>
199 
<script type="text/javascript" src="js/searchNew.js"></script>
200 
<script type="text/javascript">
201 
$(function () {
202 
	addscript("ad_search_a");
203 
	addscript("ad_search_b");
204 
});
205 
</script>
206 
</body>
207 
</html>
208 
=======
1 209 
 <!DOCTYPE html>
2 210 
<html>
3 211 
<head>

@ -204,3 +412,4 @@ $(function () {
204 412 
</script>
205 413 
</body>
206 414 
</html>
415 
>>>>>>> 81b6af0036f1c4830d171b3b878a3e3b91c2eac6