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

app/css/app.css

@@ -275,15 +275,15 @@ ul.boxnav li.set span:before{
.levelbox .icon-favorfill{ color:#F4C600;}
/*专家相关信息*/
.infocontit{font-size:14px; position: relative;}
.infocon{padding:6px 10px; /*text-align: justify;*/ font-size: 13px; color:#888888;}
.infocon{padding:6px 10px; /*text-align: justify;*/ font-size: 13px;line-height:27px ; color:#888888;}
.infocon ul{ padding:0; margin: 0; overflow: hidden;}
.infosubject li{ list-style: none; padding:4px 10px; padding-right:20px; margin:4px; border:1px solid #BBBBBB; border-radius: 6px; float: left;}
.infosubject li{ list-style: none; padding:4px 10px; margin:4px; border:1px solid #BBBBBB; border-radius: 6px; float: left;}
.listbox{ margin:5px 0;max-width:100%; overflow:hidden;}
.listbrowse{border: 1px solid #FF9900; border-radius: 0 6px 6px 0; text-align:center;font-size:13px;line-height:26px; float:left;padding-right: 8px; max-width:60%; overflow:hidden;}
.listbrowse{border: 1px solid #FF9900; border-radius: 0 6px 6px 0; text-align:center;font-size:13px;line-height:27px; float:left;padding-right: 8px; max-width:60%; overflow:hidden;}
.plusbtn{ font-size:20px; line-height: 22px; color:#999999;margin-left:4px; margin-top:2px;  }
.plusbtn.icon-appreciatefill{color:#FF9900;}
.like {display: block;float: left;width: 28px;font-size:12px;background: #FF9900; color: #fff; line-height: 26px;margin-right: 5px;}
.like {display: block;float: left;width: 28px;font-size:12px;background: #FF9900; color: #fff; line-height: 27px;margin-right: 5px;}
.likenum{ float:right;max-width:130px;overflow:hidden; }
.likenum .mui-icon{ font-size:24px; color:#CCCCCC;}
.likepeople{ width:26px; height:26px; float:left; overflow:hidden; margin-right:5px; }
@@ -549,7 +549,7 @@ ul.boxnav li.set span:before{
/***********************缺省页面*******************/
.nodatabox{width:100%;height: 100%; margin:50px auto;text-align: center;}
.nodatabox .picbox{width: 40%;margin: auto;}
.nodatabox .picbox .defpic{display:block;margin:auto;width:160px; height: 160px;background: url(../images/nodata.png);}
.nodatabox .picbox .defpic{display:block;margin:auto;width:160px; height: 160px;background: url(../images/nodata.png) -6px 0 no-repeat;}
.nodatabox .picbox .defpic.consult-pic{background-position: -232px -1320px;}/*咨询页面未登录*/
.nodatabox .txtbox { margin:40px 0 10px 0;}

app/html/attentions-list.html

@@ -17,12 +17,11 @@
		      	<ul class="mui-table-view protable list">
			           
			    </ul>
			    <div class="nodatabox" style="display:none; background: #efeff4;margin: 0; " id="nodatabox1">
			    <div class="nodatabox" style="display:none;background: #efeff4;margin: 0; " id="nodatabox1">
			        <div class="nodata">
			            <div class="picbox"><span class="defpic"></span></div>
			            <div class="picbox"><span class="defpic" style="background-position: -230px -1120px;"></span></div>
			            <div class="txtbox">
			            	<p class="currword">抱歉！您还未关注过专家</p>
			                <p class="currtip">请重新修改搜索关键字、或筛选条件后再进行搜索</p>
			            	<p class="currword">抱歉！您还未关注过任何专家</p>
			            </div>
			        </div>
			    </div>

app/html/attentions-list2.html

@@ -19,10 +19,10 @@
			    </ul>
			    <div class="nodatabox" style="display:none; background: #efeff4;margin: 0; " id="nodatabox1">
			        <div class="nodata">
			            <div class="picbox"><span class="defpic"></span></div>
			            <div class="picbox"><span class="defpic" style="background-position:-6px 0"></span></div>
			            <div class="txtbox">
			            	<p class="currword">抱歉！您还未关注过资源</p>
			                <p class="currtip">请重新修改搜索关键字、或筛选条件后再进行搜索</p>
			            	<p class="currword">抱歉！您还未关注过任何资源</p>
			                
			            </div>
			        </div>
			    </div>

app/html/chat-assess.html

@@ -20,8 +20,7 @@
			#textbox #question {
				padding: 0;
				border: none;
				overflow: hidden;
				height: 20px;
				height: 40px;
				border-bottom:1px solid #F0F0F0
			}
			
@@ -52,12 +51,12 @@
					<div class="mui-inline">评价留言</div>
				</div>
				<div class="row mui-input-row" id="textbox">
					<!--<div id='question' class="mui-input-clear question textareabox" contenteditable="true"></div>-->
					<!--<div id='question' class="mui-input-clear question textareabox" contenteditable="true" style="-webkit-user-select:text;"></div>-->
					
						<textarea id="question"class="mui-input-clear question textareabox"> </textarea>
					<textarea id="question"class="mui-input-clear question textareabox"> </textarea>
					
					<div class="text_count"><span><span id="text-count">300</span>字</span></div>
					
					<div class="text_count"><span><span id="text-count">0</span>/300字</span></div>
					<input type="text" value="0" style="display: none;" id="inp"/>
				</div>
				
			</div>

app/html/search-home.html

@@ -71,7 +71,7 @@
		 var selectblock = document.getElementById("div_select");
		 var searchVal = document.getElementById("searchval");
		 var key,bigClass=1;
		 searchVal.focus();
		 //searchVal.focus();
	    /*搜专家搜资源的下拉选择框*/
		selectblock.addEventListener('tap', function() {
			showblock.style.display = 'block';
@@ -92,10 +92,22 @@
		
		/*点击热门搜索*/
		mui(".hotsearch").on('tap', 'li', function() {
			plus.nativeUI.showWaiting();
		
			key = this.innerHTML;
			plus.nativeUI.showWaiting();//显示原生等待框
            plus.webview.create("../html/search.html",'search.html',{},{key:key,bigClass:bigClass});
			//plus.nativeUI.showWaiting();//显示原生等待框
           // plus.webview.create("../html/search.html",'search.html',{},{key:key,bigClass:bigClass});
            mui.openWindow({
					url: '../html/search.html',
					id: '../html/search.html',
					show:{
				      //autoShow:false,
				      aniShow:"slide-in-right",
				    },
					extras:{
				      key:key,
				      bigClass:bigClass
				    }
				});
		});
		/*按键字搜索*/
		searchval.addEventListener("keyup", function() {

app/html/search.html

@@ -54,7 +54,7 @@
				</ul>
				<div class="nodatabox" style="display:none; background: #efeff4;" id="nodatabox">
			        <div class="nodata">
			            <div class="picbox"><span class="defpic"></span></div>
			            <div class="picbox"><span class="defpic" style="background-position: -6px -780px;"></span></div>
			            <div class="txtbox">
			            	<p class="currword">抱歉！没找到相关匹配的内容。</p>
			                <p class="currtip">请重新修改搜索关键字、或筛选条件后再进行搜索</p>
@@ -97,6 +97,7 @@
			}
			if(isiOS){
				box.style.top="90px";
				box.style.paddingTop="0px";
			}
		</script>
	</body>

app/js/attentions.js

@@ -11,7 +11,7 @@ mui.init({
		up: {
			contentrefresh: '正在加载...',
			callback: pullupRefresh,
		    //auto:true
		    auto:true
		}
	}
});

app/js/attentions2.js

@@ -11,7 +11,7 @@ mui.init({
		up: {
			contentrefresh: '正在加载...',
			callback: pullupRefresh,
		    //auto:true
		    auto:true
		}
	}
});

app/js/chat-assess.js

@@ -4,7 +4,7 @@ mui.ready(function(){
	
	var oplaceholder =document.getElementById("placeholder");//
	var otextNum = document.getElementById("text-count");//字数
	var oinp = document.getElementById("inp");//用来放评价字数的隐藏于
	
	var oassesscontent = document.getElementById("question");//评价内容
	var ostarContainer = document.getElementById("starContainer");//星星容器
@@ -40,7 +40,7 @@ mui.ready(function(){
	};
	//点击评价区域，placeholder效果，字数限制效果、
	oassesscontent.addEventListener('keyup',function(){
		limitTextCountFn();
		checkLen(oassesscontent);
	});
	//评价字数限制
	//字数限制函数
@@ -55,6 +55,23 @@ mui.ready(function(){
			
		} 
	};
	
	/*字数限制*/
	function checkLen(obj) {  
		var maxChars = 300;//最多字符数  
		
		if (obj.value.length > maxChars) {
			
			obj.value = obj.value.substring(0,maxChars); 
		}
		
		var curr = maxChars - obj.value.length;  
		
		document.getElementById("text-count").innerHTML = curr.toString(); 	
	};
	
	
	mui.plusReady(function(){
		var userid = plus.storage.getItem('userid');

app/js/chats.js

@@ -295,7 +295,7 @@
									sender: 'self',
									type: 'text',
									content: myData[i]["tidingsContant"],
									imgurl:baseUrl + "/images/head/" + myData[i]["professor"].id + "_m.jpg"
									imgurl:baseUrl + "/images/head/" + myData[i]["professor"].id + "_l.jpg"
								});
								
							}else {

app/js/consult.js

@@ -38,13 +38,9 @@ window.addEventListener('logined', function(event) {
	content1.style.display = 'block';
	content2.style.display = 'none';
	console.log('点击登录ID=='+userId)
	table.innerHTML = '';
	initData();
	
	if(plus.nativeUI.showWaiting()){
		
		plus.nativeUI.closeWaiting();//关闭等待框
		mui('#zixunpullrefresh').scroll().scrollTo(0,0,100);//100毫秒滚动到顶
	}
});
mui.plusReady(function() {
@@ -167,11 +163,11 @@ function initData(){
			type:'get',
			timeout:10000,
			success:function(data){
				if (data.success && data.data.data != '') {
				if (data.success) {
                		table.innerHTML = '';//下拉刷新，清空数据
                		var datalist = data.data.data;
					eachData(userid,datalist);
					mui('#zixunpullrefresh').pullRefresh().refresh(true);//重置下拉加载
//					mui('#zixunpullrefresh').pullRefresh().refresh(true);//重置下拉加载
					plus.nativeUI.closeWaiting();//关闭原生等待框
					mui('#zixunpullrefresh').pullRefresh().scrollTo(0,0,100)//回到顶部
@@ -492,16 +488,20 @@ function eachData(userid,datalist) {
	            		+ '<span class="listtit">'+item["professor"]["name"]+'<em id="nameli" class="mui-icon iconfont '+proModify+'">'+modifyaddEle+'</em><span class="thistime">'+lastReplyTime+'</span></span>';
	        str += '<p class="listtit2">';
	        if(item["professor"]["title"]){
	        	str += '<span>'+item["professor"]["title"]+'</span>, ';
	        		str += '<span>'+item["professor"]["title"]+'</span>, ';
	        };
	        if(item["professor"]["office"]){
	        	str += '<span>'+item["professor"]["office"]+'</span>, ';
	        		if(item["professor"]["orgName"]){
	        			str += '<span>'+item["professor"]["office"]+'</span>, ';
	        		}else {
	        			str += '<span>'+item["professor"]["office"]+'</span>';
	        		}
	        };
	        if(item["professor"]["orgName"]){
	        	str += '<span>'+item["professor"]["orgName"]+'</span>';
	        		str += '<span>'+item["professor"]["orgName"]+'</span>';
	        };
	        if(item["professor"]["address"]){
	        	str += '<span>  | '+item["professor"]["address"]+'</span>';
	        		str += '<span>  | '+item["professor"]["address"]+'</span>';
	        };
	        
	        str +='</p><p class="listtit3 onlyone">'+lastReplyCon+'</p></div></a>';

app/js/index.js

@@ -22,8 +22,20 @@ mui('.list').on('tap','a',function(){
/*点击热门领域*/
mui('.gridbg').on('tap','li',function(){
	var subject = this.getAttribute("data-title");
	plus.nativeUI.showWaiting();//显示原生等待框
    webviewShow = plus.webview.create("../html/search.html",'search.html',{},{subject:subject,bigClass:1});//后台创建webview并打开show.html
	//plus.nativeUI.showWaiting();//显示原生等待框
    //webviewShow = plus.webview.create("../html/search.html",'search.html',{},{subject:subject,bigClass:1});//后台创建webview并打开show.html
    mui.openWindow({
		url: '../html/search.html',
		id: '../html/search.html',
		show:{
	      //autoShow:false,
	      aniShow:"slide-in-right",
	    },
		extras:{
	      subject:subject,
	      bigClass:1
	    }
	});
})

app/js/proinfobrow.js

@@ -350,7 +350,8 @@ mui.plusReady(function() {
				}
			})
		} else {
			plus.nativeUI.toast("请先登录");
//			plus.nativeUI.toast("请先登录");
			isLogin();
		}
	})
@@ -378,7 +379,8 @@ mui.plusReady(function() {
		if(userid && userid != null && userid != "null") {
			collectionExpert($this);
		} else {
			plus.nativeUI.toast("请先登录");
//			plus.nativeUI.toast("请先登录");
			isLogin();
		}
	});

app/js/resinforbrow.js

@@ -260,7 +260,8 @@ mui.plusReady(function() {
		if(userid && userid != null && userid != "null") {
			collectionExpert($this);
		} else {
			plus.nativeUI.toast("请先登录");
//			plus.nativeUI.toast("请先登录");
			isLogin();
		}
	});

app/js/searchhome.js

@@ -28,7 +28,7 @@ mui.init({
			up: {
				contentrefresh: '正在加载...',
				callback: pullupRefresh,
				//auto:true
				auto:true
			}
		}
});