首頁 探索 說明
註冊 登入
bulomakaka
/
ekexiu.app
關註 2
讚好 1
派生 0
代碼 問題管理 0 合併請求 0 提交歷史 194 版本發佈 0 Wiki
瀏覽代碼

Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.app.git

wangaidan 8 年之前
父節點
18e5f529af 8df9772ba6
當前提交
78027cf8e1
共有 7 個文件被更改，包括 231 次插入 和 171 次删除
分割檢視 顯示文件統計
  1. 2 2
      app/css/app.css
  2. 139 0
      app/html/index_centen.html
  3. 50 152
      app/html/index_home.html
  4. 9 0
      app/html/search.html
  5. 13 10
      app/js/index.js
  6. 5 0
      app/js/proinfobrow-more.js
  7. 13 7
      app/js/searchhome.js

+ 2 - 2
app/css/app.css
查看文件 

@ -362,8 +362,8 @@ ul.boxnav li.set span:before{
362 362 
.generalinfo span{letter-spacing:normal;}
363 363 
.generalinfo .letspace{font-style:normal;letter-spacing: 2em;}
364 364
365 
.updatebox{ position: absolute; right:1%; top:20px; font-size: 13px; line-height:16px;color: #FF9900;}
366 
.updatebox2{right:7%; }
365 
.updatebox{ position: absolute; right:1%;font-size: 13px; line-height:16px;color: #FF9900;}
366 
.updatebox2{right:7%; top:20px; }
367 367 
.updatebox:hover,.updatebox:active,.updatebox:link{ color: #FF9900;}
368 368 
.updatebox .updatebtn{font-size:20px;margin-top:-4px;}
369 369

+ 139 - 0
app/html/index_centen.html
查看文件 

@ -0,0 +1,139 @@
1 
<!doctype html>
2 
<html>
3
4 
	<head>
5 
		<meta charset="UTF-8">
6 
		<title></title>
7 
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/app.css" rel="stylesheet" />
10 
		<link href="../css/iconfont.css" rel="stylesheet" />
11 
	</head>
12
13 
	<body>
14
15 
		<!-- 主页面内容容器 -->
16 
		<div class="mui-content mui-scroll-wrapper" id="pullrefresh" >
17 
			<div class="mui-scroll">
18 
				<!-- 主界面具体展示内容 -->
19 
				<!--图片轮播-->
20 
				<div id="slider" class="mui-slider">
21 
					<div class="mui-slider-group mui-slider-loop">
22 
						<!-- 额外增加的一个节点(循环轮播：第一个节点是最后一张轮播) -->
23 
						<div class="mui-slider-item mui-slider-item-duplicate">
24 
							<a>
25 
								<img src="../images/banner/4.jpg">
26 
							</a>
27 
						</div>
28 
						<!-- 第一张 -->
29 
						<div class="mui-slider-item">
30 
							<a>
31 
								<img src="../images/banner/1.jpg">
32 
							</a>
33 
						</div>
34 
						<!-- 第二张 -->
35 
						<div class="mui-slider-item">
36 
							<a>
37 
								<img src="../images/banner/2.jpg">
38 
							</a>
39 
						</div>
40 
						<!-- 第三张 -->
41 
						<div class="mui-slider-item">
42 
							<a>
43 
								<img src="../images/banner/3.jpg">
44 
							</a>
45 
						</div>
46 
						<!-- 第四张 -->
47 
						<div class="mui-slider-item">
48 
							<a>
49 
								<img src="../images/banner/4.jpg">
50 
							</a>
51 
						</div>
52 
						<!-- 额外增加的一个节点(循环轮播：最后一个节点是第一张轮播) -->
53 
						<div class="mui-slider-item mui-slider-item-duplicate">
54 
							<a>
55 
								<img src="../images/banner/1.jpg">
56 
							</a>
57 
						</div>
58 
					</div>
59 
					<div class="mui-slider-indicator">
60 
						<div class="mui-indicator mui-active"></div>
61 
						<div class="mui-indicator"></div>
62 
						<div class="mui-indicator"></div>
63 
						<div class="mui-indicator"></div>
64 
					</div>
65 
				</div>
66 
				<!-- 九宫格排版-->
67 
				<div class="mui-card-content conblock">
68 
					<div class="maintitbox">
69 
						<div class="maintit">热门领域</div>
70 
					</div>
71 
					<ul class="mui-table-view mui-grid-view mui-grid-9 gridbg">
72 
						<li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="材料失效与保护">
73 
							<a>
74 
								<div class="fieldicon">
75 
									<img src="../images/field_icon/field05.png" />
76 
								</div>
77 
								<div class="mui-media-body">材料失效与保护</div>
78 
							</a>
79 
						</li>
80 
						<li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="材料表面与界面">
81 
							<a>
82 
								<div class="fieldicon">
83 
									<img src="../images/field_icon/field02.png" />
84 
								</div>
85 
								<div class="mui-media-body">材料表面与界面</div>
86 
							</a>
87 
						</li>
88 
						<li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="黑色金属及其合金">
89 
							<a>
90 
								<div class="fieldicon">
91 
									<img src="../images/field_icon/field07.png" />
92 
								</div>
93 
								<div class="mui-media-body">黑色金属及其合金</div>
94 
							</a>
95 
						</li>
96 
						<li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="金属材料">
97 
							<a>
98 
								<div class="fieldicon">
99 
									<img src="../images/field_icon/field18.png" />
100 
								</div>
101 
								<div class="mui-media-body">金属材料</div>
102 
							</a>
103 
						</li>
104 
						<li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="有色金属及其合金">
105 
							<a>
106 
								<div class="fieldicon">
107 
									<img src="../images/field_icon/field04.png" />
108 
								</div>
109 
								<div class="mui-media-body">有色金属及其合金</div>
110 
							</a>
111 
						</li>
112 
						<li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="材料检测与分析技术">
113 
							<a>
114 
								<div class="fieldicon">
115 
									<img src="../images/field_icon/field16.png" />
116 
								</div>
117 
								<div class="mui-media-body">材料检测与分析技术</div>
118 
							</a>
119 
						</li>
120 
					</ul>
121 
				</div>
122 
				<!--图文列表-->
123 
				<div class="mui-card-content conblock">
124 
					<div class="maintitbox">
125 
						<div class="maintit">热门专家</div>
126 
					</div>
127 
					<!--数据列表-->
128 
					<ul class="mui-table-view mui-table-view-chevron list">
129
130 
					</ul>
131 
				</div>
132 
			</div>
133 
		</div>
134 
		<script src="../js/public/mui.min.js"></script>
135 
		<script src="../js/public/base.js"></script>
136 
		<script src="../js/index.js"></script>
137 
	</body>
138
139 
</html>

+ 50 - 152
app/html/index_home.html
查看文件 

@ -1,152 +1,50 @@
1 
<!doctype html>
2 
<html>
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 href="../css/mui.min.css" rel="stylesheet" />
8 
<link href="../css/app.css" rel="stylesheet" />
9 
<link href="../css/iconfont.css" rel="stylesheet" />
10 
</head>
11 
<body>
12
13 
<!-- 主页面标题 -->
14 
<header class="mui-bar mui-bar-nav toptitbox">
15 
    <div class="searchbox bgRadius" id="search">
16 
    	<em class="mui-icon mui-icon-search searchtxt" ><span>搜索专家、研发资源</span></em>
17 
	    <!--<input type="search" class="mui-input-clear searchtxt" placeholder="搜索专家、合作资源">-->
18 
	</div>
19 
</header>
20 
 <!-- 主页面内容容器 -->
21 
    <div class="mui-content">
22 
    	<!-- 主界面具体展示内容 -->
23 
    	<!--图片轮播-->
24 
        <div id="slider" class="mui-slider" >
25 
          <div class="mui-slider-group mui-slider-loop">
26 
            <!-- 额外增加的一个节点(循环轮播：第一个节点是最后一张轮播) -->
27 
            <div class="mui-slider-item mui-slider-item-duplicate">
28 
              <a >
29 
                 <img src="../images/banner/4.jpg">
30 
              </a>
31 
            </div>
32 
            <!-- 第一张 -->
33 
            <div class="mui-slider-item">
34 
              <a >
35 
                 <img src="../images/banner/1.jpg">
36 
              </a>
37 
            </div>
38 
            <!-- 第二张 -->
39 
            <div class="mui-slider-item">
40 
              <a >
41 
                 <img src="../images/banner/2.jpg">
42 
              </a>
43 
            </div>
44 
            <!-- 第三张 -->
45 
            <div class="mui-slider-item">
46 
              <a >
47 
                 <img src="../images/banner/3.jpg">
48 
              </a>
49 
            </div>
50 
            <!-- 第四张 -->
51 
            <div class="mui-slider-item">
52 
              <a >
53 
                 <img src="../images/banner/4.jpg">
54 
              </a>
55 
            </div>
56 
            <!-- 额外增加的一个节点(循环轮播：最后一个节点是第一张轮播) -->
57 
            <div class="mui-slider-item mui-slider-item-duplicate">
58 
              <a >
59 
                 <img src="../images/banner/1.jpg">
60 
              </a>
61 
            </div>
62 
          </div>
63 
          <div class="mui-slider-indicator">
64 
            <div class="mui-indicator mui-active"></div>
65 
            <div class="mui-indicator"></div>
66 
            <div class="mui-indicator"></div>
67 
            <div class="mui-indicator"></div>
68 
          </div>
69 
        </div>
70 
        <!-- 九宫格排版-->
71 
        <div class="mui-card-content conblock">
72 
        	<div class="maintitbox">
73 
        		<div class="maintit">热门领域</div>
74 
        	</div>
75 
	        <ul class="mui-table-view mui-grid-view mui-grid-9 gridbg">
76 
		        <li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="材料失效与保护">
77 
		            <a >
78 
		                <div class="fieldicon">
79 
		                	<img src="../images/field_icon/field05.png"/>
80 
		                </div>
81 
		                <div class="mui-media-body">材料失效与保护</div>
82 
		            </a>
83 
		        </li>
84 
		        <li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="材料表面与界面">
85 
		            <a >
86 
		                <div class="fieldicon">
87 
		                	<img src="../images/field_icon/field02.png"/>
88 
		                </div>
89 
		                <div class="mui-media-body">材料表面与界面</div>
90 
		            </a>
91 
		        </li>
92 
		        <li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="黑色金属及其合金">
93 
		            <a >
94 
		                <div class="fieldicon">
95 
		                	<img src="../images/field_icon/field07.png"/>
96 
		                </div>
97 
		                <div class="mui-media-body">黑色金属及其合金</div>
98 
		            </a>
99 
		        </li>
100 
		        <li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="金属材料">
101 
		            <a >
102 
		                <div class="fieldicon">
103 
		                	<img src="../images/field_icon/field18.png"/>
104 
		                </div>
105 
		                <div class="mui-media-body">金属材料</div>
106 
		            </a>
107 
		        </li>
108 
		        <li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="有色金属及其合金">
109 
		            <a >
110 
		                <div class="fieldicon">
111 
		                	<img src="../images/field_icon/field04.png"/>
112 
		                </div>
113 
		                <div class="mui-media-body">有色金属及其合金</div>
114 
		            </a>
115 
		        </li>
116 
		        <li class="mui-table-view-cell mui-media mui-col-xs-4" data-title="材料检测与分析技术">
117 
		            <a >
118 
		                <div class="fieldicon">
119 
		                	<img src="../images/field_icon/field16.png"/>
120 
		                </div>
121 
		                <div class="mui-media-body">材料检测与分析技术</div>
122 
		            </a>
123 
		        </li>
124 
            </ul>
125 
        </div>
126 
        <!--图文列表-->
127 
        <div class="mui-card-content conblock">
128 
        	<div class="maintitbox">
129 
        		<div class="maintit">热门专家</div>
130 
        	</div>
131
132 
			<div id="pullrefresh"  class="mui-scroll-wrapper" >
133
134 
				<div class="mui-scroll" >
135 
					<!--数据列表-->
136 
					<ul class="mui-table-view mui-table-view-chevron list">
137
138 
					</ul>
139 
				</div>
140
141 
			</div>
142
143
144 
		</div>
145
146 
    </div>
147 
    <script src="../js/public/mui.min.js"></script>
148 
	<script src="../js/public/base.js"></script>
149 
	<script src="../js/index.js"></script>
150
151 
</body>
152 
</html>
1 
<!doctype html>
2 
<html>
3
4 
	<head>
5 
		<meta charset="UTF-8">
6 
		<title></title>
7 
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/app.css" rel="stylesheet" />
10 
		<link href="../css/iconfont.css" rel="stylesheet" />
11 
	</head>
12
13 
	<body>
14 
		<!-- 主页面标题 -->
15 
		<header class="mui-bar mui-bar-nav toptitbox">
16 
			<div class="searchbox bgRadius" id="search">
17 
				<em class="mui-icon mui-icon-search searchtxt"><span>搜索专家、研发资源</span></em>
18 
				<!--<input type="search" class="mui-input-clear searchtxt" placeholder="搜索专家、合作资源">-->
19 
			</div>
20 
		</header>
21 
		<div class="mui-content">	</div>
22 
		<script src="../js/public/mui.min.js"></script>
23 
		<script src="../js/public/base.js"></script>
24 
		<script>
25 
		/*点击搜索按钮*/
26 
		mui.plusReady(function(){
27 
			search.addEventListener('tap', function() {
28 
				var nwaiting = plus.nativeUI.showWaiting();//显示原生等待框
29 
			    webviewShow = plus.webview.create("../html/search-home.html","../html/search-home.html");//后台创建webview并打开show.html
30 
			    webviewShow.addEventListener("loaded", function() {
31 
			        nwaiting.close(); //新webview的载入完毕后关闭等待框
32 
			        webviewShow.show("slide-in-right",150); //把新webview窗体显示出来，显示动画效果为速度150毫秒的右侧移入动画
33 
			    }, false);
34 
			});
35 
		})
36
37 
		mui.init({
38 
		    subpages:[{
39 
				url:'index_centen.html',
40 
				id:'index_centen.html',
41 
				styles:{
42 
					top: '45px',
43 
					bottom: '0px',
44 
				}
45 
			}]
46 
		  });
47 
		</script>
48 
	</body>
49
50 
</html>

+ 9 - 0
app/html/search.html
查看文件 

@ -51,6 +51,15 @@
51 51 
				<ul class="mui-table-view mui-table-view-chevron list">
52 52
53 53 
				</ul>
54 
				<div class="nodatabox" style="display:none; background: #efeff4;" id="nodatabox">
55 
			        <div class="nodata">
56 
			            <div class="picbox"><span class="defpic"></span></div>
57 
			            <div class="txtbox">
58 
			            	<p class="currword">抱歉！没找到相关匹配的内容。</p>
59 
			                <p class="currtip">请重新修改搜索关键字、或筛选条件后再进行搜索</p>
60 
			            </div>
61 
			        </div>
62 
			    </div>
54 63 
			</div>
55 64 
		</div>
56 65

+ 13 - 10
app/js/index.js
查看文件 

@ -17,15 +17,7 @@ mui('.list').on('tap','a',function(){
17 17 
})
18 18
19 19
20 
/*点击搜索按钮*/
21 
search.addEventListener('tap', function() {
22 
	var nwaiting = plus.nativeUI.showWaiting();//显示原生等待框
23 
    webviewShow = plus.webview.create("../html/search-home.html","../html/search-home.html");//后台创建webview并打开show.html
24 
    webviewShow.addEventListener("loaded", function() {
25 
        nwaiting.close(); //新webview的载入完毕后关闭等待框
26 
        webviewShow.show("slide-in-right",150); //把新webview窗体显示出来，显示动画效果为速度150毫秒的右侧移入动画
27 
    }, false);
28 
});
20
29 21
30 22 
/*点击热门领域*/
31 23 
mui('.gridbg').on('tap','li',function(){

@ -41,9 +33,13 @@ getOnePase();
41 33 
mui.init({
42 34 
	pullRefresh: {
43 35 
		container: '#pullrefresh',
36 
        down: {
37 
				callback: pulldownRefresh
38 
			  },
44 39 
		up: {
45 40 
			contentrefresh: '正在加载...',
46 
			auto:true,
41 
			//auto:true,
42 
			//height:100,
47 43 
			callback: pullupRefresh
48 44 
		}
49 45 
	}

@ -56,6 +52,13 @@ function pullupRefresh() {
56 52 
	}, 1000);
57 53 
}
58 54
55 
function pulldownRefresh() {
56 
	setTimeout(function() {
57 
		getOnePase();
58 
		mui('#pullrefresh').pullRefresh().endPulldownToRefresh();
59 
	}, 1000);
60 
}
61
59 62 
if(mui.os.plus) {
60 63 
	mui.plusReady(function() {
61 64 
		setTimeout(function() {

+ 5 - 0
app/js/proinfobrow-more.js
查看文件 

@ -53,6 +53,11 @@ mui.ready(function() {
53 53 
						}
54 54 
						string += '</div>'
55 55 
						string += '<p class="listtit3">'
56 
						if(data[i].department) {
57 
							string += data[i].department;
58 
						}
59 
						string += '</p>'
60 
						string += '<p class="listtit3">'
56 61 
						if(data[i].title) {
57 62 
							string += data[i].title;
58 63 
						}

+ 13 - 7
app/js/searchhome.js
查看文件 

@ -20,7 +20,7 @@ var provinceVal = document.getElementById("provinceval");
20 20 
var addressVal = document.getElementById("addressval");
21 21 
var subjectid = document.getElementById("subjectid");
22 22 
var industryid = document.getElementById("industryid");
23
23 
var nodatabox = document.getElementById("nodatabox");
24 24
25 25 
mui.init({
26 26 
		pullRefresh: {

@ -99,8 +99,6 @@ mui.plusReady(function(){
99 99 
/*搜专家搜资源的下拉选择框*/
100 100 
selectblock.addEventListener('tap', function() {
101 101 
	showblock.style.display = 'block';
102 
//	console.log(selectblock.style.width);
103 
//	console.log(showblock.style.width);
104 102 
});
105 103
106 104 
mui("#li_show").on('tap', 'li', function() {

@ -275,6 +273,7 @@ function expert(key, subject, industry, province, address, authentication, pageS
275 273 
				   }, 1000);
276 274 
				}
277 275 
				if(data.success && data.data.data != '') {
276 
					nodatabox.style.display = 'none';
278 277 
					var datalist = data.data.data;
279 278 
					console.log(data.data.total)
280 279 
					datalistEach(datalist);

@ -284,7 +283,8 @@ function expert(key, subject, industry, province, address, authentication, pageS
284 283 
	                	mui('#pullrefresh3').pullRefresh().disablePullupToRefresh(); //没有数据禁止上拉刷新
285 284 
	                }
286 285 
				} else {
287 
					plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
286 
					//plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
287 
					nodatabox.style.display = 'block';
288 288 
					mui('#pullrefresh3').pullRefresh().disablePullupToRefresh(); //没有数据禁止上拉刷新
289 289 
				}
290 290 
				

@ -319,6 +319,7 @@ function expert(key, subject, industry, province, address, authentication, pageS
319 319 
				   }, 1000);
320 320 
				}
321 321 
				if(data.success && data.data.data != '') {
322 
					nodatabox.style.display = 'none';
322 323 
					var datalist = data.data.data;
323 324 
					resourcesEach(datalist);
324 325 
					mui('#pullrefresh3').pullRefresh().refresh(true);

@ -327,7 +328,8 @@ function expert(key, subject, industry, province, address, authentication, pageS
327 328 
	                	mui('#pullrefresh3').pullRefresh().disablePullupToRefresh(); //没有数据禁止上拉刷新
328 329 
	                }
329 330 
				} else {
330 
					plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
331 
					//plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
332 
					nodatabox.style.display = 'block';
331 333 
					mui('#pullrefresh3').pullRefresh().disablePullupToRefresh(); //没有数据禁止上拉刷新
332 334 
				}
333 335 
			},

@ -364,6 +366,7 @@ function expert2(key, subject, industry, province, address, authentication, page
364 366 
			success: function(data) {
365 367 
				plus.nativeUI.closeWaiting();
366 368 
				if(data.success && data.data.data != '') {
369 
					nodatabox.style.display = 'none';
367 370 
					mui('#pullrefresh3').pullRefresh().enablePullupToRefresh(); //启用上拉刷新
368 371 
					var datalist = data.data.data;
369 372 
					var dice1 = data.data.total; //总条数

@ -387,7 +390,8 @@ function expert2(key, subject, industry, province, address, authentication, page
387 390 
				} else {
388 391 
					mui('#pullrefresh3').pullRefresh().disablePullupToRefresh(); //没有数据禁止上拉刷新
389 392 
					table.innerHTML = '';
390 
					plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
393 
					//plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
394 
					nodatabox.style.display = 'block';
391 395 
				}
392 396 
			},
393 397 
			error: function() {

@ -413,6 +417,7 @@ function expert2(key, subject, industry, province, address, authentication, page
413 417 
			success: function(data) {
414 418 
				plus.nativeUI.closeWaiting();
415 419 
				if(data.success && data.data.data != '') {
420 
					nodatabox.style.display = 'none';
416 421 
					mui('#pullrefresh3').pullRefresh().enablePullupToRefresh(); //启用上拉刷新
417 422 
					var datalist = data.data.data;
418 423 
					var dice1 = data.data.total; //总条数

@ -433,7 +438,8 @@ function expert2(key, subject, industry, province, address, authentication, page
433 438 
				} else {
434 439 
					mui('#pullrefresh3').pullRefresh().disablePullupToRefresh(); //没有数据禁止上拉刷新
435 440 
					table.innerHTML = '';
436 
					plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
441 
					//plus.nativeUI.toast("抱歉，没有找到对应的搜索", toastStyle);
442 
					nodatabox.style.display = 'block';
437 443 
				}
438 444 
			},
439 445 
			error: function() {