按照要求修改六大浏览页面

app/css/app.css

@@ -1085,15 +1085,15 @@ ul.tagList{padding:0;margin:18px 0 8px;overflow: hidden;}
ul.tagList>li{list-style:none;float: left;margin-right:10px;margin-bottom:10px;padding:4px 12px;color: #666;background:#EFEFEF;}
ul.tagList>li .h2Font{color: #666; -webkit-user-select:text;}
.madiaBlock{clear:both;}.madiaBlock:before,.madiaBlock:after{display:table;content:""}.madiaBlock:after{clear: both;}
.madiaBlock ul{margin:6px -15px;}
.madiaBlock ul{margin:0 -15px;}
.madiaBlock ul.infoBlock{margin:0 -15px;}
.madiaBlock ul.infoBlock .mui-table-view-cell:after{background: transparent;}
.madiaBlock ul.infoBlock .madiaInfo .authicon{bottom:auto;}
.madiaBlock ul.infoBlock .madiaInfo .authicon{bottom:4px;}
.madiaBlock ul.mui-table-view .mui-table-view-cell:after{left:15px;}
.madiaBlock .madiaTit{position:relative;font-size:16px;color:#666;padding-left:10px;margin-top:15px;padding-bottom: 10px;}
.madiaBlock .madiaTit:before{display:inline-block;content:"";width:4px;height: 16px;position:absolute;top:1px;left:0;background: #ff9900;}
.madiaBlock .madiaTit:after{position: absolute;bottom: 0;content:"";height: 1px;background: #E5E5E5;right: -15px;left:-15px;}
.madiaBlock .madiaHead{width:90px;height:60px;margin-top:-30px;position:absolute;border:1px solid #E5E5E5;top:50%;background-position: center;background-size: cover;}
.madiaBlock .madiaHead{width:90px;height:60px;margin-top:-30px;position:absolute;/*border:1px solid #E5E5E5;*/top:50%;background-position: center;background-size: cover;}
.madiaBlock .madiaHead.useHead{width: 50px;height:50px;margin-top:-25px;background-image: url(../images/default-photo.jpg);border-radius: 50%;}
.madiaBlock .madiaHead.resouseHead{background-image: url(../images/default-resource.jpg);}
.madiaBlock .madiaHead.artHead{background-image: url(../images/default-artical.jpg);}
@@ -1104,7 +1104,7 @@ ul.tagList>li .h2Font{color: #666; -webkit-user-select:text;}
.madiaBlock .madiaHead.paperHead{background-image: url(../images/default-paper.jpg);}
.madiaBlock .madiaHead.patentHead{background-image: url(../images/default-patent.jpg);}
.madiaBlock .madiaInfo{padding-left:62px; width: 100%;padding-right:6px;}
.madiaBlock .madiaInfo span.h1Font{display: inline-block;max-width:86%;}
/*.madiaBlock .madiaInfo span.h1Font{display: inline-block;max-width:86%;}*/
.madiaBlock .madiaInfo.OmadiaInfo{padding-left: 102px;}
.madiaBlock .flexCenter{min-height:54px;}
.madiaBlock .flexCenter.OflexCenter{min-height:70px;}

app/html/resourceShow.html

@@ -62,7 +62,7 @@
									<p class="h3Font mui-ellipsis" id="thisOther"></p>
								</div>
				            </div>
				            <span class="mui-icon attenSpan" id="attenSpan"></span>
				            <span class="mui-icon attenSpan" id="attenSpan" style="display:inline-block">关注</span>
				        </li>
				    </ul>
	    		</div>

app/js/articleShow.js

@@ -311,15 +311,17 @@ mui.plusReady(function() {
					userType.sty = "e"
				}
			}
			var rImg = baseUrl + "/data/resource/" + $data.images[0].imageSrc;
			var rImg = "../images/default-resource.jpg";
			if($data.images.length>0){
				rImg = baseUrl + "/data/resource/" + $data.images[0].imageSrc;
			}
			var li = document.createElement("li");
			li.setAttribute("data-id", $data.resourceId);
			li.className = "mui-table-view-cell";
			li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
				' <div class="madiaHead resouseHead" style="background-image:url(' + rImg + ')"></div>' +
				'<div class="madiaInfo OmadiaInfo">' +
				'<p class="mui-ellipsis h1Font">' + $data.resourceName + '</p>' +
				'<p class="mui-ellipsis h2Font">用途：' + $data.supportedServices + '</p>' +
				'<p class="mui-ellipsis-2 h1Font">' + $data.resourceName + '</p>' +
				'<p><span class="h2Font">' + namepo + '</span><em class="authicon ' + userType.sty + '" title="科袖认证专家"></em></p>' +
				'</div>' +
				'</div>'
@@ -379,7 +381,7 @@ mui.plusReady(function() {
								'<div class="madiaHead artHead" style="background-image:url(' + arImg + ')"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis-2 h1Font">' + title + '</p>' +
								'<p><span class="h2Font">' + namepo + '</span><em class="authicon ' + userType.sty + '" title="科袖认证专家"></em></p>' +
								'<p><span class="h2Font" style="margin-right:10px">'+namepo+'</span><span class="time">'+commenTime($data[i].publishTime)+'</span></p>'+
								'</div>' +
								'</div>'
							document.getElementById("articleList").appendChild(li);

app/js/cmpInforShow.js

@@ -25,13 +25,14 @@ mui.ready(function() {
			}
		});
		//点击收藏按钮
		ifcollectionAbout(orgId,6);
		var oifAttend=document.getElementById("ifAttend")
		ifcollectionAbout(orgId,oifAttend,6);
		document.getElementById("collectBtn").addEventListener('tap', function() {
			if(userid && userid != null && userid != "null") {
				if(document.getElementById("ifAttend").className=='mui-icon iconfontnew icon-yishoucang'){
					cancelCollectionAbout(orgId,6)
				if(oifAttend.className=='mui-icon iconfontnew icon-yishoucang'){
					cancelCollectionAbout(orgId,oifAttend,6)
				} else {
					collectionAbout(orgId,6);
					collectionAbout(orgId,oifAttend,6);
				}
			}else{
				isLogin();
@@ -214,7 +215,7 @@ mui.ready(function() {
								} else {
									oString += '<div class="madiaHead resouseHead"></div>'
								}
								oString += '<div class="madiaInfo OmadiaInfo"><p class="mui-ellipsis h1Font">' + obj[i].resourceName + '</p><p class="h2Font mui-ellipsis">用途：' + obj[i].supportedServices + '</p>'
								oString += '<div class="madiaInfo OmadiaInfo"><p class="mui-ellipsis h1Font">' + obj[i].resourceName + '</p><p class="h2Font mui-ellipsis-2">用途：' + obj[i].supportedServices + '</p>'
								oString += '</div></div>'
								liItem.innerHTML = oString;
								document.getElementById("resourceShow").appendChild(liItem);
@@ -263,6 +264,7 @@ mui.ready(function() {
									oString += '<div class="madiaHead artHead"></div>'
								}
								oString += '<div class="madiaInfo OmadiaInfo"><p class="mui-ellipsis-2 h1Font">' + obj[i].articleTitle + '</p>'
								oString += '<p class="h2Font mui-ellipsis"><span class="time">'+commenTime(obj[i].publishTime)+'</span></p>'
								oString += '</div></div>'
								liItem.innerHTML = oString;
								document.getElementById("articelShow").appendChild(liItem);
@@ -326,24 +328,17 @@ mui.ready(function() {
												thisName=data.data.name;
											}
											if(StrData[n].articleType==1) {
												userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
												thisTitle = userType.title;
												thisAuth = userType.sty;
												add.setAttribute("owner-id", data.data.id);
												add.setAttribute("data-type", 1);
											}else {
												add.setAttribute("owner-id", data.data.id);
												add.setAttribute("data-type", 2);
												if(data.data.authStatus==3) {
													thisTitle = "科袖认证企业";
													thisAuth = "authicon-com-ok";
												}
											}
											
											var itemlist = '<div class="flexCenter OflexCenter mui-clearfix"><div class="madiaHead artHead" style="background-image:url('+imgL+')"></div>';
												itemlist += '<div class="madiaInfo OmadiaInfo">';
												itemlist += '<p class="mui-ellipsis h2Font" id="usertitle">'+StrData[n].articleTitle+'</p>';
												itemlist += '<p><span class="h1Font">'+thisName+'</span><em class="authicon '+thisAuth+'" title="'+thisTitle+'"></em></p>';
												itemlist += '<p class="mui-ellipsis-2 h1Font" id="usertitle">'+StrData[n].articleTitle+'</p>';
												itemlist += '<p><span class="h2Font" style="margin-right:10px">'+thisName+'</span><span class="time">'+commenTime(StrData[n].publishTime)+'</span></p>';
												itemlist += '</div></div>';
												
											add.innerHTML=itemlist;
@@ -425,7 +420,7 @@ mui.ready(function() {
						}
						var itemlist = '<div class="flexCenter OflexCenter mui-clearfix"><div class="madiaHead cmpHead"><div class="boxBlock"><img class="boxBlockimg" src="'+imgL+'" /></div></div>';
							itemlist += '<div class="madiaInfo OmadiaInfo">';
							itemlist += '<p><span class="h1Font">'+thisName+'</span><em class="authicon '+thisAuth+'" title="'+thisTitle+'"></em></p>';
							itemlist += '<p class="mui-ellipsis"><span class="h1Font">'+thisName+'</span><em class="authicon '+thisAuth+'" title="'+thisTitle+'"></em></p>';
							itemlist += '<p class="mui-ellipsis h2Font">'+otherI+'</p>';
							itemlist += '</div></div>';
						add.innerHTML=itemlist;

app/js/paperShow.js

@@ -18,13 +18,14 @@ mui.plusReady(function() {
		});
	})
	//点击收藏按钮
	ifcollectionAbout(paperId, 5);
	var oifCollect=document.getElementById("ifCollect")
	ifcollectionAbout(paperId,oifCollect, 5);
	ocollectBtn.addEventListener('tap', function() {
		if(userid && userid != null && userid != "null") {
			if(document.getElementById("ifCollect").className == 'mui-icon iconfontnew icon-yishoucang') {
				cancelCollectionAbout(paperId, 5)
			if(oifCollect.className == 'mui-icon iconfontnew icon-yishoucang') {
				cancelCollectionAbout(paperId,oifCollect, 5)
			} else {
				collectionAbout(paperId, 5);
				collectionAbout(paperId,oifCollect, 5);
			}
		} else {
			isLogin();
@@ -200,7 +201,7 @@ mui.plusReady(function() {
											liItem.innerHTML = oString;
											document.getElementById("aboutAuthors").appendChild(liItem);
											if(userid){
											ifcollectionAbout1.call(liItem.getElementsByClassName("attenSpan")[0],showPro.id,1);}
											ifcollectionAbout1.call(liItem.getElementsByClassName("attenSpan")[0],showPro.id,1,1);}
										}
									}
								})
@@ -253,7 +254,7 @@ mui.plusReady(function() {
		userName = plus.storage.getItem('name');
		userid = plus.storage.getItem('userid');
		getRecourceMe();
		ifcollectionAbout(paperId, 5);
		ifcollectionAbout(paperId,oifCollect, 5);
	});
	function leadIn(sel) {
@@ -307,118 +308,54 @@ mui.plusReady(function() {
			if(isLogin()) {
				return;
			}
					collectionAbout1(this.getAttribute("data-id"), '1',this);
					collectionAbout(this.getAttribute("data-id"),this, 1,1);
					
		} else if(this.innerHTML === "已关注") {
			if(isLogin()) {
				return;
			}
			cancelCollectionAbout1(this.getAttribute("data-id"), '1',this);
			cancelCollectionAbout(this.getAttribute("data-id"),this,1,1);
		}
		
	})
	
	/*判断是否收藏资源文章或者是否关注专家*/
	function ifcollectionAbout1(watchObject,num) {
		var that=this;
		mui.ajax(baseUrl + '/ajax/watch/hasWatch', {
			data: {
				"professorId": userid,
				"watchObject": watchObject
			},
			dataType: 'json', //数据格式类型
			type: 'get', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success && data.data != null) {
					if(num=="1"){//已关注专家
						that.classList.add("attenedSpan");
						that.innerText="已关注";
					}else{//已收藏资源或文章
						document.getElementById("ifCollect").classList.remove("icon-shoucang");
						document.getElementById("ifCollect").classList.add("icon-yishoucang");
					}
				} else {
					if(num=="1"){//关注专家
						that.classList.remove("attenedSpan");
						that.innerText="关注";
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.add("icon-shoucang");
						document.getElementById("ifCollect").classList.remove("icon-yishoucang");
					}
				}
			},
			error: function() {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	/*收藏资源、文章或者关注专家*/
	function collectionAbout1(watchObject, num,sel) {
		mui.ajax(baseUrl + '/ajax/watch', {
			data: {
				"professorId": userid,
				"watchObject": watchObject,
				"watchType": num
			},
			dataType: 'json', //数据格式类型
			type: 'POST', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success) {
					if(num=="1"){//关注专家
						sel.classList.add("attenedSpan");
						sel.innerText="已关注";
						plus.nativeUI.toast("关注成功", toastStyle);
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.remove("icon-shoucang");
						document.getElementById("ifCollect").classList.add("icon-yishoucang");
						plus.nativeUI.toast("收藏成功", toastStyle);
					}
				}
			},
			error: function() {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	function ifcollectionAbout1(watchObject,num) {
		var that=this;
		mui.ajax(baseUrl + '/ajax/watch/hasWatch', {
			data: {
				"professorId": userid,
				"watchObject": watchObject
			},
			dataType: 'json', //数据格式类型
			type: 'get', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success && data.data != null) {
					if(num=="1"){//已关注专家
						that.classList.add("attenedSpan");
						that.innerText="已关注";
					}else{//已收藏资源或文章
						document.getElementById("ifCollect").classList.remove("icon-shoucang");
						document.getElementById("ifCollect").classList.add("icon-yishoucang");
					}
				} else {
					if(num=="1"){//关注专家
						that.classList.remove("attenedSpan");
						that.innerText="关注";
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.add("icon-shoucang");
						document.getElementById("ifCollect").classList.remove("icon-yishoucang");
					}
				}
			},
			error: function() {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	/*取消收藏资源、文章或者取消关注专家*/
	function cancelCollectionAbout1(watchObject, num,sel) {
		mui.ajax({
			url: baseUrl + '/ajax/watch/delete',
			data: {
				professorId: userid,
				watchObject: watchObject
			},
			dataType: 'json', //数据格式类型
			type: 'post', //http请求类型
			timeout: 10000,
			async: true,
			success: function(data) {
				console.log(data.success)
				if(data.success) {
					if(num=="1"){//关注专家
						sel.classList.remove("attenedSpan");
						sel.innerText="关注";
						plus.nativeUI.toast("已取消关注", toastStyle);
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.add("icon-shoucang");
						document.getElementById("ifCollect").classList.remove("icon-yishoucang");
						plus.nativeUI.toast("已取消收藏", toastStyle);
					}
					
				}
			},
			error: function(data) {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	var r64 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "-", "_"];
		var d64 = {
			"0": 0,
@@ -916,7 +853,7 @@ mui('.commentBlock').on('tap', '.useHead,.h1Font', function() {
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
								'<div class="madiaHead paperHead"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis-2 h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis h2Font">' + $data[i].authors.substring(0, $data[i].authors.length - 1) + '</p>' +
								'</div>' +
								'</div>'
@@ -952,7 +889,7 @@ mui('.commentBlock').on('tap', '.useHead,.h1Font', function() {
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
								'<div class="madiaHead patentHead"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis-2 h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis h2Font">作者:' + $data[i].authors.substring(0, $data[i].authors.length - 1) + '</p>' +
								'</div>' +
								'</div>'

app/js/patentShow.js

@@ -16,14 +16,15 @@ mui.plusReady(function() {
			qiFlag: 4
		}); 
	})
	var oifCollect=document.getElementById("ifCollect")
	//点击收藏按钮
	ifcollectionAbout(patentId,4);
	ifcollectionAbout(patentId,oifCollect,4);
	ocollectBtn.addEventListener('tap', function() {
		if(userid && userid != null && userid != "null") {
			if(document.getElementById("ifCollect").className=='mui-icon iconfontnew icon-yishoucang'){
				cancelCollectionAbout(patentId,4)
			if(oifCollect.className=='mui-icon iconfontnew icon-yishoucang'){
				cancelCollectionAbout(patentId,oifCollect,4)
			} else {
				collectionAbout(patentId,4);
				collectionAbout(patentId,oifCollect,4);
			}
		}else{
			isLogin();
@@ -198,8 +199,9 @@ mui.plusReady(function() {
											oString += '</div></div><span class="mui-icon attenSpan"  style="display:' + odis + ';" data-id="'+showPro.id+'">关注</span>'
											liItem.innerHTML = oString;
											document.getElementById("aboutAuthors").appendChild(liItem);
											if(userid){
											ifcollectionAbout1.call(liItem.getElementsByClassName("attenSpan")[0],showPro.id,1);}
											if(userid){
												ifcollectionAbout1.call(liItem.getElementsByClassName("attenSpan")[0],showPro.id,1,1);
											}
										}
									}
								})
@@ -249,7 +251,7 @@ mui.plusReady(function() {
		userName = plus.storage.getItem('name');
		userid = plus.storage.getItem('userid');
		getRecourceMe();
		ifcollectionAbout(patentId,4);
		ifcollectionAbout(patentId,oifCollect,4);
		isAgree();
	});
	function leadIn(sel) {
@@ -304,12 +306,12 @@ mui.plusReady(function() {
			if(isLogin()) {
				return;
			}
					collectionAbout1(this.getAttribute("data-id"), '1',this);
					collectionAbout(this.getAttribute("data-id"),this, 1,1);
		} else if(this.innerHTML === "已关注") {
			if(isLogin()) {
				return;
			}
			cancelCollectionAbout1(this.getAttribute("data-id"), '1',this);
			cancelCollectionAbout(this.getAttribute("data-id"),this, 1,1);
		}
	})
	/*判断是否收藏资源文章或者是否关注专家*/
@@ -349,70 +351,6 @@ mui.plusReady(function() {
		});
	}
	/*收藏资源、文章或者关注专家*/
	function collectionAbout1(watchObject, num,sel) {
		mui.ajax(baseUrl + '/ajax/watch', {
			data: {
				"professorId": userid,
				"watchObject": watchObject,
				"watchType": num
			},
			dataType: 'json', //数据格式类型
			type: 'POST', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success) {
					if(num=="1"){//关注专家
						sel.classList.add("attenedSpan");
						sel.innerText="已关注";
						plus.nativeUI.toast("关注成功", toastStyle);
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.remove("icon-shoucang");
						document.getElementById("ifCollect").classList.add("icon-yishoucang");
						plus.nativeUI.toast("收藏成功", toastStyle);
					}
				}
			},
			error: function() {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	/*取消收藏资源、文章或者取消关注专家*/
	function cancelCollectionAbout1(watchObject, num,sel) {
		mui.ajax({
			url: baseUrl + '/ajax/watch/delete',
			data: {
				professorId: userid,
				watchObject: watchObject
			},
			dataType: 'json', //数据格式类型
			type: 'post', //http请求类型
			timeout: 10000,
			async: true,
			success: function(data) {
				console.log(data.success)
				if(data.success) {
					if(num=="1"){//关注专家
						sel.classList.remove("attenedSpan");
						sel.innerText="关注";
						plus.nativeUI.toast("已取消关注", toastStyle);
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.add("icon-shoucang");
						document.getElementById("ifCollect").classList.remove("icon-yishoucang");
						plus.nativeUI.toast("已取消收藏", toastStyle);
					}
					
				}
			},
			error: function(data) {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	var r64 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "-", "_"];
		var d64 = {
			"0": 0,
@@ -892,7 +830,7 @@ mui('.commentBlock').on('tap', '.useHead,.h1Font', function() {
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
								'<div class="madiaHead patentHead"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis-2 h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis h2Font">作者:' + $data[i].authors.substring(0, $data[i].authors.length - 1) + '</p>' +
								'</div>' +
								'</div>'
@@ -929,7 +867,7 @@ mui('.commentBlock').on('tap', '.useHead,.h1Font', function() {
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
								'<div class="madiaHead paperHead"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis-2 h1Font">' + $data[i].name + '</p>' +
								'<p class="mui-ellipsis h2Font">' + $data[i].authors.substring(0, $data[i].authors.length - 1) + '</p>' +
								'</div>' +
								'</div>'

app/js/public/base.js

@@ -1,8 +1,8 @@
//公共文件
mui.init();
//var baseUrl = "http://www.ekexiu.com",
var baseUrl = "http://192.168.3.233:81",
//var baseUrl = "http:192.168.3.85:80",    
var baseUrl = "http://192.168.3.233",
//var baseUrl = "http:192.168.3.233:81",    
	toastStyle = {
		'verticalAlign': 'top',
	}
@@ -248,7 +248,9 @@ var eduDegree = {
}
/*判断是否收藏资源文章或者是否关注专家*/
function ifcollectionAbout(watchObject,num) {
function ifcollectionAbout(watchObject,sel, num,flag) {
	var that=sel;
	console.log(JSON.stringify(that))
	mui.ajax(baseUrl + '/ajax/watch/hasWatch', {
		data: {
			"professorId": plus.storage.getItem('userid'),
@@ -262,19 +264,29 @@ function ifcollectionAbout(watchObject,num) {
			console.log(JSON.stringify(data))
			if(data.success && data.data != null) {
				if(num=="1" || num == "6"){//已关注专家
					document.getElementById("ifAttend").classList.remove("icon-shoucang");
					document.getElementById("ifAttend").classList.add("icon-yishoucang");
					if(flag==1){
						that.classList.add("attenedSpan");
						that.innerText="已关注";
					}else{
						that.classList.remove("icon-shoucang");
						that.classList.add("icon-yishoucang");
					}
				}else{//已收藏资源或文章
					document.getElementById("ifCollect").classList.remove("icon-shoucang");
					document.getElementById("ifCollect").classList.add("icon-yishoucang");
					that.classList.remove("icon-shoucang");
					that.classList.add("icon-yishoucang");
				}
			} else {
				if(num=="1" || num == "6"){//关注专家
					document.getElementById("ifAttend").classList.add("icon-shoucang");
					document.getElementById("ifAttend").classList.remove("icon-yishoucang");
					if(flag==1){
						that.classList.remove("attenedSpan");
						that.innerText="关注";
					}else{
						that.classList.add("icon-shoucang");
						that.classList.remove("icon-yishoucang");
					}
				}else{//收藏资源或文章
					document.getElementById("ifCollect").classList.add("icon-shoucang");
					document.getElementById("ifCollect").classList.remove("icon-yishoucang");
					that.classList.add("icon-shoucang");
					that.classList.remove("icon-yishoucang");
				}
			}
		},
@@ -285,7 +297,8 @@ function ifcollectionAbout(watchObject,num) {
}
/*收藏资源、文章或者关注专家*/
function collectionAbout(watchObject, num) {
function collectionAbout(watchObject,sel, num,flag) {
	var that=sel;
	mui.ajax(baseUrl + '/ajax/watch', {
		data: {
			"professorId": plus.storage.getItem('userid'),
@@ -300,12 +313,17 @@ function collectionAbout(watchObject, num) {
			console.log(JSON.stringify(data))
			if(data.success) {
				if(num=="1" || num == "6"){//关注专家
					document.getElementById("ifAttend").classList.remove("icon-shoucang");
					document.getElementById("ifAttend").classList.add("icon-yishoucang");
					if(flag==1){
						that.classList.add("attenedSpan");
						that.innerText="已关注";
					}else{
						that.classList.remove("icon-shoucang");
						that.classList.add("icon-yishoucang");
					}
					plus.nativeUI.toast("关注成功", toastStyle);
				}else{//收藏资源或文章
					document.getElementById("ifCollect").classList.remove("icon-shoucang");
					document.getElementById("ifCollect").classList.add("icon-yishoucang");
					that.classList.remove("icon-shoucang");
					that.classList.add("icon-yishoucang");
					plus.nativeUI.toast("收藏成功", toastStyle);
				}
			}
@@ -317,7 +335,8 @@ function collectionAbout(watchObject, num) {
}
/*取消收藏资源、文章或者取消关注专家*/
function cancelCollectionAbout(watchObject, num) {
function cancelCollectionAbout(watchObject,sel, num,flag) {
	var that=sel;
	mui.ajax({
		url: baseUrl + '/ajax/watch/delete',
		data: {
@@ -332,12 +351,17 @@ function cancelCollectionAbout(watchObject, num) {
			console.log(JSON.stringify(data))
			if(data.success) {
				if(num=="1" || num == "6"){//关注专家
					document.getElementById("ifAttend").classList.add("icon-shoucang");
					document.getElementById("ifAttend").classList.remove("icon-yishoucang");
					if(flag==1){
						that.classList.remove("attenedSpan");
						that.innerText="关注";
					}else{
						that.classList.add("icon-shoucang");
						that.classList.remove("icon-yishoucang");
					}
					plus.nativeUI.toast("已取消关注", toastStyle);
				}else{//收藏资源或文章
					document.getElementById("ifCollect").classList.add("icon-shoucang");
					document.getElementById("ifCollect").classList.remove("icon-yishoucang");
					that.classList.add("icon-shoucang");
					that.classList.remove("icon-yishoucang");
					plus.nativeUI.toast("已取消收藏", toastStyle);
				}
				
@@ -348,4 +372,4 @@ function cancelCollectionAbout(watchObject, num) {
		}
	});
}
}

app/js/resourceShow.js

@@ -19,6 +19,7 @@ var odetailDescp = document.getElementById("detailDescp"); //详细描述
var oconsultBtn = document.getElementById("consultBtn"); //咨询按钮
var ocollectBtn = document.getElementById("collectBtn"); //收藏按钮
var oattenSpan = document.getElementById("attenSpan"); //关注用户按钮
var oifCollect = document.getElementById("ifCollect")//星星
var professorId;
var orgId;
@@ -65,9 +66,9 @@ mui.plusReady(function() {
							othisInfo.setAttribute("data-type",mydata.resourceType);
							professorId = othisInfo.getAttribute("data-id");
							if(userid != professorId) {
								ifcollectionAbout(professorId, 1)
								oattenSpan.style.display="block";
								ifcollectionAbout(professorId,oattenSpan, 1,1);
							}else{
								oattenSpan.style.display="none";
								document.getElementsByClassName('footbox')[0].style.display = "none";
							}
							if(mydata.orgName) { //所属机构
@@ -102,11 +103,15 @@ mui.plusReady(function() {
							othisInfo.setAttribute("data-id",mydata.organization.id);
							othisInfo.setAttribute("data-status",mydata.organization.authStatus);
							othisInfo.setAttribute("data-type",mydata.resourceType);
							orgId = othisInfo.getAttribute("data-id");
							if(mydata.organization.forShort){
								othisName.innerHTML = mydata.organization.forShort;
							}else{
								othisName.innerHTML = mydata.organization.name;
							}
							if(userid) {
								ifcollectionAbout(orgId,oattenSpan, 6,1)
							}
							if(mydata.organization.subject) {
								othisOther.innerHTML = (mydata.organization.subject).replace(/,/, " | ");
							}
@@ -237,17 +242,9 @@ mui.plusReady(function() {
										
										var comName="";
										if($html[n].articleType==1) {
											var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
											comName=data.data.name;
											likeRli.setAttribute("data-type", 1);
										}else {
											var stl={};
											stl.sty="";
											stl.title="";
											if(data.data.authStatus==3) {
												stl.sty="authicon-com-ok";
												stl.title="认证企业";
											}
											if(data.data.forShort){
												comName=data.data.forShort;
											}else{
@@ -265,7 +262,10 @@ mui.plusReady(function() {
										}
										str += '<div class="madiaInfo OmadiaInfo">'
										str += '<p class="mui-ellipsis-2 h1Font">' + $html[n].articleTitle + '</p>'
										str += '<p><span class="h2Font">' + comName + '</span><em class="authicon ' + stl.sty + '" title="' + stl.title + '"></em></p>'
										str += '<p class="h2Font mui-ellipsis">'
										str +='<span class="nameSpan" style="margin-right:10px">' + comName + '</span>'
										str +='<span class="time">'+commenTime($html[n].publishTime)+'</span>'
										str +='</p>'
										str += '</div></div>'
										likeRli.innerHTML = str;
										likeRUl.appendChild(likeRli,likeRUl.lastChild);
@@ -345,8 +345,8 @@ mui.plusReady(function() {
										add.setAttribute("data-id",$respond[n].resourceId);
										var itemlist = '<div class="flexCenter OflexCenter"><div class="madiaHead resourceHead" style="background-image:url('+imgL+')"></div>';
											itemlist += '<div class="madiaInfo OmadiaInfo">';
											itemlist += '<p class="mui-ellipsis h2Font" id="usertitle">'+$respond[n].resourceName+'</p>';
											itemlist += '<p><span class="h1Font">'+thisName+'</span><em class="authicon '+thisAuth+'" title="'+thisTitle+'"></em></p>';
											itemlist += '<p class="mui-ellipsis h1Font" id="usertitle">'+$respond[n].resourceName+'</p>';
											itemlist += '<p><span class="h2Font">'+thisName+'</span><em class="authicon '+thisAuth+'" title="'+thisTitle+'"></em></p>';
											itemlist += '</div></div>';
											
										add.innerHTML=itemlist;
@@ -492,129 +492,41 @@ mui.plusReady(function() {
	//点击关注专家按钮
	oattenSpan.addEventListener('tap', function() {
		var typeNum=othisInfo.getAttribute("data-type");
		var thisId=othisInfo.getAttribute("data-id");
		if(userid && userid != null && userid != "null") {
			if(this.className=='mui-icon attenSpan attenedSpan') {
				cancelCollectionAbout(professorId, 1)
			} else {
				collectionAbout(professorId, 1);
			if(typeNum==1){
				if(this.className=='mui-icon attenSpan attenedSpan') {
					cancelCollectionAbout(thisId,this, 1,1)
				} else {
					collectionAbout(thisId,this, 1,1);
				}
			}else{
				if(this.className=='mui-icon attenSpan attenedSpan') {
					cancelCollectionAbout(thisId,this, 6,1)
				} else {
					collectionAbout(thisId,this, 6,1);
				}
			}
		}else{
			isLogin();
		}
					
		}else{
			isLogin();
		}
	});
	//点击收藏按钮
	ifcollectionAbout(resourceId,2);
	ifcollectionAbout(resourceId,oifCollect,2);
	ocollectBtn.addEventListener('tap', function() {
		if(userid && userid != null && userid != "null") {
			if(document.getElementById("ifCollect").className=='mui-icon iconfontnew icon-yishoucang'){
				cancelCollectionAbout(resourceId, 2)
			if(oifCollect.className=='mui-icon iconfontnew icon-yishoucang'){
				cancelCollectionAbout(resourceId,oifCollect,2);
			} else {
				collectionAbout(resourceId, 2);
				collectionAbout(resourceId,oifCollect,2);
			}
		}else{
			isLogin();
		}
	});
	/*判断是否收藏资源文章或者是否关注专家*/
	function ifcollectionAbout(watchObject,num) {
		mui.ajax(baseUrl + '/ajax/watch/hasWatch', {
			data: {
				"professorId": userid,
				"watchObject": watchObject
			},
			dataType: 'json', //数据格式类型
			type: 'get', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success && data.data != null) {
					if(num=="1"){//已关注专家
						oattenSpan.classList.add("attenedSpan");
						oattenSpan.innerText="已关注";
					}else{//已收藏资源或文章
						document.getElementById("ifCollect").classList.remove("icon-shoucang");
						document.getElementById("ifCollect").classList.add("icon-yishoucang");
					}
				} else {
					if(num=="1"){//关注专家
						oattenSpan.classList.remove("attenedSpan");
						oattenSpan.innerText="关注";
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.add("icon-shoucang");
						document.getElementById("ifCollect").classList.remove("icon-yishoucang");
					}
				}
			},
			error: function() {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	/*收藏资源、文章或者关注专家*/
	function collectionAbout(watchObject, num) {
		mui.ajax(baseUrl + '/ajax/watch', {
			data: {
				"professorId": userid,
				"watchObject": watchObject,
				"watchType": num
			},
			dataType: 'json', //数据格式类型
			type: 'POST', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success) {
					if(num=="1"){//关注专家
						oattenSpan.classList.add("attenedSpan");
						oattenSpan.innerText="已关注";
						plus.nativeUI.toast("关注成功", toastStyle);
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.remove("icon-shoucang");
						document.getElementById("ifCollect").classList.add("icon-yishoucang");
						plus.nativeUI.toast("收藏成功", toastStyle);
					}
				}
			},
			error: function() {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	/*取消收藏资源、文章或者取消关注专家*/
	function cancelCollectionAbout(watchObject, num) {
		mui.ajax({
			url: baseUrl + '/ajax/watch/delete',
			data: {
				professorId: userid,
				watchObject: watchObject
			},
			dataType: 'json', //数据格式类型
			type: 'post', //http请求类型
			timeout: 10000,
			async: true,
			success: function(data) {
				console.log(data.success)
				if(data.success) {
					if(num=="1"){//关注专家
						oattenSpan.classList.remove("attenedSpan");
						oattenSpan.innerText="关注";
						plus.nativeUI.toast("已取消关注", toastStyle);
					}else{//收藏资源或文章
						document.getElementById("ifCollect").classList.add("icon-shoucang");
						document.getElementById("ifCollect").classList.remove("icon-yishoucang");
						plus.nativeUI.toast("已取消收藏", toastStyle);
					}
					
				}
			},
			error: function(data) {
				plus.nativeUI.toast("服务器链接超时", toastStyle);
			}
		});
	}
	
   /*微信及微信朋友圈分享专家*/
	var auths, shares;
	plus.oauth.getServices(function(services) {

app/js/searchListNew2.js

@@ -168,7 +168,7 @@ for(var n=0;n<6;n++) {
						for(var n = 0; n < data.data[i].researchAreas.length; n++) {
							arr[n] = data.data[i].researchAreas[n].caption;
						}
						oSub = "研究方向：" + arr.join(",");
						oSub = "研究方向：" + arr.join("；");
					}
					li.setAttribute("data-id", data.data[i].id);
					li.setAttribute("data-flag", 1);

app/js/userInforShow.js

@@ -209,7 +209,7 @@ mui.plusReady(function() {
							} else {
								oString += '<div class="madiaHead resouseHead"></div>'
							}
							oString += '<div class="madiaInfo OmadiaInfo"><p class="mui-ellipsis h1Font">' + obj[i].resourceName + '</p><p class="h2Font mui-ellipsis">用途：' + obj[i].supportedServices + '</p>'
							oString += '<div class="madiaInfo OmadiaInfo"><p class="mui-ellipsis h1Font">' + obj[i].resourceName + '</p><p class="h2Font mui-ellipsis-2">用途：' + obj[i].supportedServices + '</p>'
							oString += '</div></div>'
							liItem.innerHTML = oString;
							document.getElementById("resourceShow").appendChild(liItem);
@@ -255,6 +255,7 @@ mui.plusReady(function() {
								oString += '<div class="madiaHead artHead"></div>'
							}
							oString += '<div class="madiaInfo OmadiaInfo"><p class="mui-ellipsis-2 h1Font">' + obj[i].articleTitle + '</p>'
							oString += '<p class="h2Font mui-ellipsis"><span class="time">'+commenTime(obj[i].publishTime)+'</span></p>'
							oString += '</div></div>'
							liItem.innerHTML = oString;
							document.getElementById("articelShow").appendChild(liItem);
@@ -295,7 +296,7 @@ mui.plusReady(function() {
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
								'<div class="madiaHead paperHead"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis h1Font">' + obj[i].name + '</p>' +
								'<p class="mui-ellipsis-2 h1Font">' + obj[i].name + '</p>' +
								'<p class="mui-ellipsis h2Font">' + obj[i].authors.substring(0, obj[i].authors.length - 1) + '</p>' +
								'</div>' +
								'</div>'
@@ -336,7 +337,7 @@ mui.plusReady(function() {
							li.innerHTML = '<div class="flexCenter OflexCenter mui-clearfix">' +
								'<div class="madiaHead patentHead"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis h1Font">' + obj[i].name + '</p>' +
								'<p class="mui-ellipsis-2 h1Font">' + obj[i].name + '</p>' +
								'<p class="mui-ellipsis h2Font">' + obj[i].authors.substring(0, obj[i].authors.length - 1) + '</p>' +
								'</div>' +
								'</div>'
@@ -437,7 +438,10 @@ mui.plusReady(function() {
						var ExpId = data.data[i].professorId;
						var paperN=data.data[i].paperCount;
						var patentN=data.data[i].patentCount;
						relExpertsList(ExpId,paperN,patentN);
						var liItem=document.createElement("li");
						liItem.className="mui-table-view-cell flexCenter";
						document.getElementById("relatePro").appendChild(liItem);
						relExpertsList(ExpId,paperN,patentN,liItem);
					}
					
				}
@@ -448,7 +452,7 @@ mui.plusReady(function() {
			}
		});
	}
	function relExpertsList(Id,numL,numZ){
	function relExpertsList(Id,numL,numZ,liItem){
		mui.ajax(baseUrl + "/ajax/professor/info/"+Id, {
			"type" :  "GET" ,
			"dataType" : "json",
@@ -495,17 +499,14 @@ mui.plusReady(function() {
						}
					}
					var userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
					var add = document.createElement("li");
					add.className = "mui-table-view-cell flexCenter";
					add.setAttribute("data-id",data.data.id)
					var itemlist = '<div class="madiaHead useHead" style="background-image:url('+thisImg+')"></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<p><span class="h1Font" id="userName">'+data.data.name+'</span><em class="authicon '+userType.sty+'" title="'+userType.title+'"></em></p>';
						itemlist += '<p class="mui-ellipsis h2Font">'+thisTit+'</p>';
						itemlist += '<p class="h2Font mui-ellipsis">'+copNum+'</p>';
						itemlist += '</div>';
					add.innerHTML = itemlist
					document.getElementById("relatePro").appendChild(add);
					liItem.innerHTML = itemlist
					liItem.setAttribute("data-id",data.data.id)
				}
			},
			error: function() {
@@ -558,24 +559,14 @@ mui.plusReady(function() {
										}else{
											thisName=data.data.name;
										}
										if(StrData[n].articleType==1) {
											userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
											thisTitle = userType.title;
											thisAuth = userType.sty;
										}else {
											if(data.data.authStatus==3) {
												thisTitle = "科袖认证企业";
												thisAuth = "authicon-com-ok";
											}
										}
										var add = document.createElement("li");
										add.className = "mui-table-view-cell"; 
										add.setAttribute("data-id",StrData[n].articleId);
										add.setAttribute("owner-id", StrData[n].professorId);
										var itemlist = '<div class="flexCenter OflexCenter"><div class="madiaHead artHead" style="background-image:url('+imgL+')"></div>';
											itemlist += '<div class="madiaInfo OmadiaInfo">';
											itemlist += '<p class="mui-ellipsis h2Font" id="usertitle">'+StrData[n].articleTitle+'</p>';
											itemlist += '<p><span class="h1Font">'+thisName+'</span><em class="authicon '+thisAuth+'" title="'+thisTitle+'"></em></p>';
											itemlist += '<p class="mui-ellipsis-2 h2Font" id="usertitle">'+StrData[n].articleTitle+'</p>';
											itemlist += '<p><span class="h2Font" style="margin-right:10px">'+thisName+'</span><span class="time">'+commenTime(StrData[n].publishTime)+'</span></p>';
											itemlist += '</div></div>';
											
										add.innerHTML=itemlist;
@@ -664,7 +655,7 @@ mui.plusReady(function() {
					}
					var itemlist = '<div class="madiaHead useHead" style="background-image:url('+imgL+')"></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<p><span class="h1Font">'+data.data.name+'</span><em class="authicon '+userType.sty+'" title="'+userType.title+'"></em></p>';
						itemlist += '<p class="mui-ellipsis"><span class="h1Font">'+data.data.name+'</span><em class="authicon '+userType.sty+'" title="'+userType.title+'"></em></p>';
						itemlist += '<p class="mui-ellipsis h2Font">'+otherI+'</p>';
						itemlist += '</div>';
					add.innerHTML=itemlist;
@@ -798,7 +789,8 @@ mui.plusReady(function() {
	ozixun.addEventListener('tap', function() {
		isLogin();
	});
	ifcollectionAbout(proId, '1');
	var oifAttend=document.getElementById("ifAttend")
	ifcollectionAbout(proId,oifAttend,1);
	document.getElementById('ifAttend').addEventListener("tap", function() {
		if(!userid) {
			mui.openWindow({
@@ -814,9 +806,9 @@ mui.plusReady(function() {
			return;
		}
		if(this.className == "mui-icon iconfontnew icon-yishoucang") {
			cancelCollectionAbout(proId, '1');
			cancelCollectionAbout(proId,this, 1);
		} else {
			collectionAbout(proId, '1');
			collectionAbout(proId,this,1);
		}
	})