Parcourir la Source

更换普通用户的连接页面,去掉身份判断

luyanan 7 ans auparavant
Parent
commit
b614e20b2c

+ 1 - 1
app/css/app.css

@ -1173,7 +1173,7 @@ ul.tagList>li .h2Font{color: #666; -webkit-user-select:text;}
1173 1173
.cardInfo .h1Font{font-size:16px;}
1174 1174
.cardInfo .h2Font{font-size:14px;color: #666;}
1175 1175
.cardInfo .h3Font{font-size:13px;line-height: 16px;color: #666;}
1176
.cardInfo .icon-address{position:relative;top:-3px;}
1176
.cardInfo .icon-address{position:relative;top:-4px;}
1177 1177

1178 1178
/*反馈意见以及投诉*/
1179 1179
.mui-input-row.textBox{position: relative;background:#fff;}

+ 1 - 1
app/js/consultSure.js

@ -97,7 +97,7 @@ mui.plusReady(function(){
97 97
			
98 98
			gouser.addEventListener("tap",function(){
99 99
				plus.nativeUI.showWaiting();//显示原生等待框
100
				plus.webview.create("../html/proinforbrow.html",'proinforbrow.html',{},{proid:$info.id});
100
				plus.webview.create("../html/userInforShow.html",'userInforShow.html',{},{proid:$info.id});
101 101
			})
102 102
			
103 103
		},

+ 1 - 1
app/js/consultapply.js

@ -239,7 +239,7 @@ function personalInformation($person) {
239 239
//					mui.fire(ziyuaninfo,'backziyuaninfo'); 
240 240
	   	   		}else if(flag == 'professor'){
241 241
	   	   			/*返回专家信息*/
242
					var proinfo = plus.webview.getWebviewById('proinforbrow.html');
242
					var proinfo = plus.webview.getWebviewById('userInforShow.html');
243 243
					proinfo.show();
244 244
					mui.fire(proinfo,'backproinfo',{proId:proId}); 
245 245
	   	   		}

+ 2 - 2
app/js/discover.js

@ -70,8 +70,8 @@ mui('#discoverBox').on('tap', '.gouserurl', function() {
70 70
	//alert(datatype)
71 71
	if(datatype == 1 || datatype == 3) {
72 72
		mui.openWindow({
73
			url: '../html/proinforbrow.html',
74
			id: 'html/proinforbrow.html',
73
			url: '../html/userInforShow.html',
74
			id: 'html/userInforShow.html',
75 75
			show: {
76 76
				autoShow: false,
77 77
				aniShow: "slide-in-right",

+ 12 - 52
app/js/inviteFriends.js

@ -243,58 +243,18 @@ mui.ready(function() {
243 243
			var oProfessorId=this.getAttribute("id");
244 244
			var  oAuthType=this.getAttribute("authType");
245 245
			var oAuthentication=this.getAttribute("authentication");
246
			if(oAuthType==1) {
247
						mui.openWindow({
248
								url: '../html/proinforbrow.html',
249
								id: 'proinforbrow.html',
250
								show: {
251
									autoShow: false,
252
									aniShow: "slide-in-left"
253
								},
254
								extras: {
255
									proid: oProfessorId
256
								},
257
							});
258
			
259
			}else {
260
				if(oAuthentication==1){
261
					mui.openWindow({
262
								url: '../html/researcherProw.html',
263
								id: 'researcherProw.html',
264
								show: {
265
									autoShow: false,
266
									aniShow: "slide-in-left"
267
								},
268
								extras: {
269
									proid: oProfessorId
270
								},
271
							});
272
				}else if(oAuthentication==2||oAuthentication==0){
273
					mui.openWindow({
274
								url: '../html/companybrowse.html',
275
								id: 'html/companybrowse.html',
276
								show: {
277
									autoShow: false,
278
									aniShow: "slide-in-left"
279
								},
280
								extras: {
281
									proid: oProfessorId
282
								},
283
							});
284
				}else if(oAuthentication==3) {
285
					mui.openWindow({
286
								url: '../html/studentbrowse.html',
287
								id: 'html/studentbrowse.html',
288
								show: {
289
									autoShow: false,
290
									aniShow: "slide-in-left"
291
								},
292
								extras: {
293
									proid: oProfessorId
294
								},
295
							});
296
				}
297
			}
246
			mui.openWindow({
247
				url: '../html/userInforShow.html',
248
				id: 'userInforShow.html',
249
				show: {
250
					autoShow: false,
251
					aniShow: "slide-in-left"
252
				},
253
				extras: {
254
					proid: oProfessorId
255
				},
256
			});
257

298 258
		})
299 259
		var invite = document.getElementById("invite");
300 260
		/*微信及微信朋友圈分享专家*/

+ 1 - 18
app/js/needSure.js

@ -155,26 +155,9 @@ mui.ready(function() {
155 155
		}
156 156
		document.getElementById("person").addEventListener("tap",function(){
157 157
			plus.nativeUI.showWaiting();
158
				if(authType == 1) {
159
			//plus.webview.close("proinforbrow.html");
160
			plus.webview.create("../html/proinforbrow.html", 'proinforbrow.html', {}, {
158
			plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
161 159
				proid: conId
162 160
			});
163
		} else {
164
			if(authentication == 1) {
165
				plus.webview.create("../html/researcherProw.html", 'researcherProw.html', {}, {
166
					proid: professId
167
				});
168
			} else if(authentication == 2|| authentication == 0) {
169
				plus.webview.create("../html/companybrowse.html", 'companybrowse.html', {}, {
170
					proid: conId
171
				});
172
			} else if(authentication == 3) {
173
				plus.webview.create("../html/studentbrowse.html", 'studentbrowse.html', {}, {
174
					proid: conId
175
				});
176
			}
177
		}	
178 161
		})
179 162
		
180 163
	})

+ 1 - 1
app/js/professorArticle.js

@ -40,7 +40,7 @@ mui.plusReady(function() {
40 40
		personMess();
41 41
		document.getElementById("proInfor").addEventListener("tap", function() {
42 42
			plus.nativeUI.showWaiting(); //显示原生等待框
43
			webviewShow = plus.webview.create("../html/proinforbrow.html", 'proinforbrow.html', {}, {
43
			webviewShow = plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
44 44
				proid: ownerid
45 45
			}); //后台创建webview并打开show.html
46 46
		})

+ 3 - 20
app/js/researchArea.js

@ -26,26 +26,9 @@ mui.plusReady(function() {
26 26
		var authType = this.getAttribute("authType");
27 27
		console.log(authentication)
28 28
		plus.nativeUI.showWaiting();
29
		if(authType == 1) {
30
			//plus.webview.close("proinforbrow.html");
31
			plus.webview.create("../html/proinforbrow.html", 'proinforbrow.html', {}, {
32
				proid: professId
33
			});
34
		} else {
35
			if(authentication == 1) {
36
				plus.webview.create("../html/researcherProw.html", 'researcherProw.html', {}, {
37
					proid: professId
38
				});
39
			} else if(authentication == 2||authentication == 0) {
40
				plus.webview.create("../html/companybrowse.html", 'companybrowse.html', {}, {
41
					proid: professId
42
				});
43
			} else if(authentication == 3) {
44
				plus.webview.create("../html/studentbrowse.html", 'studentbrowse.html', {}, {
45
					proid: professId
46
				});
47
			}
48
		}
29
		plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
30
			proid: professId
31
		});
49 32

50 33
	});
51 34
});

+ 11 - 11
app/js/userInforShow.js

@ -53,20 +53,20 @@ mui.plusReady(function() {
53 53
				if($photos.length < 4) {
54 54
					for(var j = 0; j < $photos.length; ++j) {
55 55
						if($photos[j].img) {
56
							showDiv += "<span class='likepeople headRadius'><img class='like-h' src='" + baseUrl + "/images/head/" + $photos[j].id + "_m.jpg'></span>";
56
							showDiv += "<span class='likepeople userRadius'><img class='like-h' src='" + baseUrl + "/images/head/" + $photos[j].id + "_m.jpg'></span>";
57 57
						} else {
58
							showDiv += "<span class='likepeople headRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
58
							showDiv += "<span class='likepeople userRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
59 59
						}
60 60
					}
61 61
				} else {
62 62
					for(var j = $photos.length - 2; j < $photos.length; ++j) {
63 63
						if($photos[j].img) {
64
							showDiv += "<span class='likepeople headRadius'><img class='like-h' src='" + baseUrl + "/images/head/" + $photos[j].id + "_m.jpg'></span>";
64
							showDiv += "<span class='likepeople userRadius'><img class='like-h' src='" + baseUrl + "/images/head/" + $photos[j].id + "_m.jpg'></span>";
65 65
						} else {
66
							showDiv += "<span class='likepeople headRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
66
							showDiv += "<span class='likepeople userRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
67 67
						}
68 68
					}
69
					showDiv += "<span class='mui-icon iconfont icon-more likepeople likemore headRadius'></span>";
69
					showDiv += "<span class='mui-icon iconfont icon-more likepeople likemore userRadius'></span>";
70 70
				}
71 71
				showDiv += "</div></div></div>";
72 72
				html.push(showDiv);
@ -124,7 +124,7 @@ mui.plusReady(function() {
124 124
				}
125 125

126 126
				if($data.address) {
127
					document.getElementById("address").innerHTML = '<em class="mui-icon iconfontNew icon-address"></em> ' + $data.address;
127
					document.getElementById("address").innerHTML = '<em class="mui-icon iconfontnew icon-address"></em> ' + $data.address;
128 128
				}
129 129

130 130
				//学术领域
@ -291,7 +291,7 @@ mui.plusReady(function() {
291 291
							li.setAttribute("data-id", obj[i].id);
292 292
							li.className = "mui-table-view-cell";
293 293
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
294
								'<div class="madiaHead artHead"></div>' +
294
								'<div class="madiaHead paperHead"></div>' +
295 295
								'<div class="madiaInfo OmadiaInfo">' +
296 296
								'<p class="mui-ellipsis h1Font">' + obj[i].name + '</p>' +
297 297
								'<p class="mui-ellipsis h2Font">' + obj[i].authors.substring(0, obj[i].authors.length - 1) + '</p>' +
@ -531,27 +531,27 @@ mui.plusReady(function() {
531 531
	document.getElementById("seeMoreResource").addEventListener("tap", function() {
532 532
		console.log(proId)
533 533
		plus.nativeUI.showWaiting(); //显示原生等待框
534
		var webviewShow = plus.webview.create("../html/resourceList.html", 'resourceList.html', {}, {
534
		var webviewShow = plus.webview.create("../html/userresourceList.html", 'userresourceList.html', {}, {
535 535
			proid: proId
536 536
		})
537 537
	})
538 538
	document.getElementById("seeMorePatent").addEventListener("tap", function() {
539 539
		plus.nativeUI.showWaiting(); //显示原生等待框
540
		var webviewShow = plus.webview.create("../html/patentList.html", 'patentList.html', {}, {
540
		var webviewShow = plus.webview.create("../html/userpatentList.html", 'userpatentList.html', {}, {
541 541
			proid: proId,
542 542
			authName: authName
543 543
		})
544 544
	})
545 545
	document.getElementById("seeMorePaper").addEventListener("tap", function() {
546 546
		plus.nativeUI.showWaiting(); //显示原生等待框
547
		var webviewShow = plus.webview.create("../html/paperList.html", 'paperList.html', {}, {
547
		var webviewShow = plus.webview.create("../html/userpaperList.html", 'userpaperList.html', {}, {
548 548
			proid: proId,
549 549
			authName: authName
550 550
		})
551 551
	})
552 552
	document.getElementById("seeMoreArtical").addEventListener("tap", function() {
553 553
		plus.nativeUI.showWaiting(); //显示原生等待框
554
		var webviewShow = plus.webview.create("../html/aiticleList.html", 'aiticleList.html', {}, {
554
		var webviewShow = plus.webview.create("../html/useraiticleList.html", 'useraiticleList.html', {}, {
555 555
			proid: proId
556 556
		})
557 557
	})

+ 1 - 1
app/js/userpaperList.js

@ -31,7 +31,7 @@ mui.plusReady(function() {
31 31
							li.setAttribute("data-id", obj[i].id);
32 32
							li.className = "mui-table-view-cell";
33 33
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
34
								'<div class="madiaHead artHead"></div>' +
34
								'<div class="madiaHead paperHead"></div>' +
35 35
								'<div class="madiaInfo OmadiaInfo">' +
36 36
								'<p class="mui-ellipsis h1Font">' + obj[i].name + '</p>' +
37 37
								'<p class="mui-ellipsis h2Font">' + obj[i].authors.substring(0, obj[i].authors.length - 1) + '</p>' +