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

app/css/app.css

.mui-input-group:after{background: none;}
.mui-table-view:before{ background: none;}
.mui-table-view:after{ background: none;}
/*.mui-table-view-cell:after{right: 0;bottom: 0;left: -10px;background: none;}*/
.mui-table-view-cell:after{right: 0;bottom: 0;left: 80px;}
/*.mui-table-view-cell .mui-media-body{padding-bottom:10px; border-bottom:1px solid #CCCCCC;}*/
.mui-input-group .mui-input-row:last-child:after{ background: none;}
.mui-input-group .mui-input-row:after{left:10px; background-color: #E6E6E6;}/*登录注册等表单的横线*/
.toptit{color: #FFFFFF; font-size: 20px;}
.personhead{color: #FFFFFF;}
/*底部导航栏*/
.footbox{ background: #FFFFFF;}
.footbox{ /*background: #FFFFFF;*/border-top:1px solid #EFEFEF;-webkit-box-shadow: 0px 6px 6px 2px #CCCCCC;box-shadow: 0px 6px 6px 2px #CCCCCC;}
.footbox .mui-tab-item.mui-active{ color: #FF9900;}
.listtit0{font-size: 13px; color: #222222;}
/*****表单公共样式********/
/*input输入相关*/
.frmbox{ width: 100%; margin:2% auto; border-radius: 6px; }
.frmtype{ width: 100%; margin: auto;line-height: 24px;padding: 1% 2%;font-size: 14px;}
.frmtype{ width: 100%; margin: auto;line-height: 30px;padding: 1% 2%;font-size: 14px;}
.frmbtn{margin:4% auto;font-size: 14px;line-height: 24px;padding: 1% 2%;border:1px solid #FF9900; border-radius: 6px; color:#FF9900 ;}
/*.frmbtn:hover{border:1px solid #FF9900; color:#FFFFFF;background-color:#FF9900;}*/
.frmbox{ border:none; width: 90%;height: 100%; } 
.frmbox .frm-input .frmtypel{ height: 0;height: 100%; width: 90%;}
/*logo盒子的相关*/
.logobox{ padding:6%; margin:12% auto 6% ; }
.logolink{display: block;width:40%;margin: auto;}
.logolink{display: block;width:30%;margin: auto;}
.logoimg{ width: 100%; margin: auto; text-align:center;}
/*忘记密码*/
.forgetword{ position: absolute;top: 50%; margin-top:-14px;right: 2%;padding:4px 10px;line-height: 20px; font-size: 13px; background: #f0f0f0;border:1px solid #f0f0f0; color: #AAAAAA; border-radius: 6px;}
.forgetword{ position: absolute;top: 50%; margin-top:-14px;right: 2%;padding:4px 10px;line-height: 20px; font-size: 12px; background: #f0f0f0;border:1px solid #f0f0f0; color: #AAAAAA; border-radius: 6px;}
.forgetword2{ background: #FF9900;border:1px solid #FF9900; color: #FFFFFF;}
.forgetword em{font-size:16px; line-height:16px; margin-left:3px;}
.forgeticon{ background: url(../images/forget.png) center center no-repeat; background-size: 100% 100%;padding:2%; position: absolute; margin-top:-2%;}
/***********************登录注册相关页面*******************/
/***********************首页*******************/
.searchbox {width: 96%;margin: auto;}
.searchbox .mui-placeholder .mui-icon-search{font-size:18px; color: #999999;}
.searchbox {width: 96%;margin:6px auto;background:#FFFFFF;height:32px;text-align: center;}
.searchbox .searchtxt.mui-icon{font-size:16px; color: #999999;}
.searchbox .searchtxt.mui-icon span{font-size:14px;margin-left:4px;line-height:16px;}
.mui-search input[type=search].searchtxt{background: #FFFFFF;}
.mui-search .mui-placeholder{ font-size: 14px; top:2px }
/*热门专家*/
.mui-table-view-cell.prolist:after{/*background:#C0C0C0*//*#c8c7cc*/;}
.protable:before{ background-color:transparent;}
#table .mui-table-view-cell:after{right: 0;bottom: 0;left:0;background: none;}
.mui-media .headimg{max-width:60px; height:60px; margin: 1% 0;overflow:hidden;}
.mui-media .resimg{border-radius:2px; max-width:60px; height:60px; margin: 1% 0;}
/*我的关注*/
.fixbox{ background: #FFFFFF; position:fixed;top:45px;left:0;width:100%; z-index:1;}
.fixbox .fixbtn{ padding:0; margin: 0; overflow: hidden;}
.fixbox .fixbtn li{ list-style: none; float: left; padding:6px 10px; border-bottom:1px solid #F0F0F0;text-align: center;font-size: 14px;height: 32px;}
.fixbox .fixbtn li{ list-style: none; float: left;height:40px;line-height:30px; padding:6px 10px; border-bottom:1px solid #F0F0F0;text-align: center;font-size: 14px;}
.fixbox .fixbtn li:first-child{ border-right:1px solid #F0F0F0;}
.fixbox .fixbtn li.liactive{ color: #FF9900;border-bottom-color: #FF9900;}
.childlist{ display: none;}
.updatebox:hover,.updatebox:active,.updatebox:link{ color: #FF9900;}
.updatebox .updatebtn{font-size:16px;}
.addinfobox{ position: absolute; right:0; top:0; font-size: 13px; line-height:16px;color: #FF9900;}
.addinfobox{ position: absolute;right: 10px;/* top: 0; */ font-size: 13px; line-height:16px;color: #FF9900;}
.addinfobox:hover,.addinfobox:active,.addinfobox:link{ color: #FF9900;}
.addinfobox .addinfobtn{font-size:16px;}
.filterbox{ position: fixed; z-index:2; width: 100%;}
.filterblock{padding:0; margin: 0;background:#FFFFFF;overflow: hidden;}
.filterblock li{list-style:none; float: left; border-right:1px solid #F0F0F0; border-bottom:1px solid #F0F0F0;} 
.filterblock li{list-style:none; float: left;border-right:1px solid #F0F0F0; border-bottom:1px solid #F0F0F0;} 
.filterblock li a.mui-btn{height:40px;line-height:30px; }
.filterblock li a.mui-btn.mui-active,.filterblock li a.mui-btn:enabled:active{background: none;border:none;color:#666666;}
.filterblock li em{ font-size:18px; margin:0 2px;}
.filterlist{ padding:0; margin: 0; border:none; border-radius:0;padding:6px 6px 6px 12px;font-size: 13px;}
/*筛选条件*/
.popoverbox2 .mui-table-view-cell>a:not(.mui-btn).active{background:#FF9900; color: #FFFFFF;border:1px solid #FF9900;}
/*城市选择级联*/
.menublock{ position: relative; }
.menublock .mui-popover-arrow{z-index: 20px;}
.menuposition.mui-popover .mui-scroll-wrapper{ margin: 0; height: 300px; top:0;  bottom:0px; border-radius: 0;}
.menuposition{border-radius:4px; position: absolute; height:300px;width:100%; font-size: 14px;}
.menuposition .mui-popover-arrow{left:50%; margin-left:-12px;}
.menuposition .mui-table-view{border-radius: 0; overflow: auto;}
.menuposition.mui-table-view .mui-table-view-cell:after{left: 8px;background: #BBBBBB;}
.mui-popover.menuposition  .mui-table-view .mui-table-view-cell:first-child,.mui-popover.menuposition  .mui-table-view .mui-table-view-cell:last-child{border-radius: 0; }
.mui-popover.menuposition .mui-table-view .mui-table-view-cell:after{left: 8px;right: 0;bottom: 0;background: #BBBBBB;}
.mui-popover.menuposition .mui-table-view .mui-table-view-cell:first-child,.mui-popover.menuposition  .mui-table-view .mui-table-view-cell:last-child{border-radius: 0; }
.mui-popover.menuposition .mui-table-view-cell:first-child>a:not(.mui-btn),.mui-popover.menuposition .mui-table-view-cell:last-child>a:not(.mui-btn){border-radius: 0;}
.menuposition .mui-table-view-cell>a:not(.mui-btn).active{border-radius:0;background:#FF9900; color: #FFFFFF;border:1px solid #FF9900;}	
/***********************搜索*******************/
.filterbox2{ position: fixed; z-index:2; width: 100%;}
.filterblock2{padding:0; margin: 0; background:#FFFFFF;overflow: hidden;}
.filterblock2 li{list-style:none; position: relative; float: left; border-right:1px solid #F0F0F0;border-bottom:1px solid #F0F0F0;} 
.filterblock2 li{list-style:none; position: relative;float: left; border-right:1px solid #F0F0F0;border-bottom:1px solid #F0F0F0;} 
.filterblock2 li a.mui-btn{height:40px;line-height:30px; }
.filterblock2 li a.mui-btn.mui-active,.filterblock2 li a.mui-btn:enabled:active{background: none;border:none;color:#666666;}
.filterblock2 li select{  margin:0 2px;}
.filterlist2{ padding:0; margin: 0; border:none; border-radius:0;padding:6px;font-size: 13px;}

app/html/index_home.html

	
<!-- 主页面标题 -->
<header class="mui-bar mui-bar-nav toptitbox">
    <div class="mui-input-row mui-search searchbox">
	    <input type="search" class="mui-input-clear searchtxt" placeholder="搜索专家、合作资源" id="search">
    <div class="searchbox bgRadius">
    	<em class="mui-icon mui-icon-search searchtxt" id="search"><span>搜索专家、合作资源</span></em>
	    <!--<input type="search" class="mui-input-clear searchtxt" placeholder="搜索专家、合作资源">-->
	</div>
</header>
 <!-- 主页面内容容器 -->

app/html/login.html

		            <input type="text" class="mui-input-clear frmtype" placeholder="请输入账号" id="username">
		        </div>
		        <div class="mui-input-row frm-input">
					<input id='password' type="password" class="mui-input-clear frmtype" placeholder="请输入密码">
					<input id='password' type="password" class="frmtype" placeholder="请输入密码">
					<span id='forgetPassword' class="forgetword forgetword2">忘记密码<em class="mui-icon mui-icon-help"></em></span>
				</div>
		    </form>

app/html/search.html

	
	<!--学术领域-->
	<div id="middlePopoveracad" class="mui-popover popoverbox2" >
		<div id="wrapper">
			<ul class="mui-table-view xsly"  id="xsly">
				
			</ul>
		<div class="mui-scroll-wrapper" style="height: 200px; top:0;">
			<div class="mui-scroll">
				<ul class="mui-table-view xsly"  id="xsly">
					
				</ul>
			</div>
		</div>
	</div>
   <script src="../js/public/mui.min.js"></script>

app/index.html

    <link href="css/iconfont.css" rel="stylesheet" />
    <link href="css/app.css" rel="stylesheet"/>
</head>
<body>
     
<body>
    <!--主页面底部菜单-->
    <nav class="mui-bar mui-bar-tab footbox">
	    <a class="mui-tab-item mui-active" href="html/index_home.html">
	var subpages = ['html/index_home.html', 'html/consultlist.html', 'html/myaccount.html'];
	var subpage_style = {
		top: '0px',
		bottom: '50px'
		bottom: '51px'
	};
	var aniShow = {};
	//创建子页面，首个选项卡页面显示，其它均隐藏；

app/js/index.js

/*点击搜索按钮*/
search.addEventListener('focus', function() {
search.addEventListener('tap', function() {
	var nwaiting = plus.nativeUI.showWaiting();//显示原生等待框
    webviewShow = plus.webview.create("../html/search-home.html","../html/search-home.html");//后台创建webview并打开show.html
    webviewShow.addEventListener("loaded", function() {