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

app/html/myaccount.html

@@ -17,7 +17,7 @@
		<div class="mui-content" id="loginYes">
			<!-- 主界面具体展示内容 -->
    		<div class="mui-input-group marginbox setblock">
				<div class="maincon personinfo2" style="padding:4% 0 4% 2%;">
				<div class="maincon personinfo2" style="padding:4% 0 0 2%;">
					<div class="headbox2 mui-navigate-right amend" style="margin-left:2%;">
					    <a class="mui-pull-left proinfor">
		                    <div class="mui-pull-left" style="width:24%;min-height:60px;">

app/js/myaccount.js

@@ -26,14 +26,14 @@ mui.ready(function() {
		userInformation();
		/*登录按钮*/
		goLogin.addEventListener('tap', function() {
		loginNo.addEventListener('tap', function() {
			goLoginFun();
		})
		/*注册按钮*/
		goReg.addEventListener('tap', function() {
		/*goReg.addEventListener('tap', function() {
			goRegFun();
		})
		})*/
		/*退出登录刷新页面*/
		window.addEventListener('closeUser', function(event) {