diff --git a/Application/Mobile/View/User/index - 副本 (2).html b/Application/Mobile/View/User/index - 副本 (2).html
deleted file mode 100644
index c5c461e66..000000000
--- a/Application/Mobile/View/User/index - 副本 (2).html	
+++ /dev/null
@@ -1,83 +0,0 @@
- <extend name="Public/bases" />
-<block name="body" >
-    <link href="__CSS__/user.css" rel="stylesheet" >
-  <body class="user">
-    <header class="header user-index-header">
-      <div class="">
-        <a href="javascript:;" class="hbtn sign"><img src="__IMG__/sign.png"><span class="signing">每日签到</span><span class="signed hidden">已签到</span></a>
-        
-        <a href="userset.html" class="hbtn set">编辑资料</a>
-      </div>
-    </header>
-    <div class="occupy"></div>
-    <section class="trunker">
-      <section class="container">
-        <div class="banner">
-          <div class="wrap">
-            <div class="nologin">
-              <a href="login.html"><img src="__IMG__/portrait_not.png"></a>
-              <p class="nick">点击头像登录账户</p>
-            </div>
-            <div class="login hidden">
-              <img src="__IMG__/fq/head_portrait.png">
-              <p class="nick">海绵奶酪君</p>
-              <p class="money"><i class="iconfont icon-money"></i><span>平台币 <i>5620.00</i></span></p>
-            </div>
-          </div>
-        </div>
-        <div class="t-list user-index-list">
-          <ul class="clearfix">
-            <li><a class="item" href="userbindcoin.html"><img src="__IMG__/user1.png" class="icon"><p class="name">绑币管理</p></a></li>
-            <li><a class="item" href="recharge.html"><img src="__IMG__/user2.png" class="icon"><p class="name">账户充值</p></a></li>
-            <li><a class="item" href="userintegral.html"><img src="__IMG__/user3.png" class="icon"><p class="name">我的积分</p></a></li>
-            <li><a class="item" href="usergame.html"><img src="__IMG__/user4.png" class="icon"><p class="name">我的游戏</p></a></li>
-            <li><a class="item" href="usercollection.html"><img src="__IMG__/user5.png" class="icon"><p class="name">我的收藏</p></a></li>
-            <li><a class="item" href="usergift.html"><img src="__IMG__/user6.png" class="icon"><p class="name">我的礼包</p></a></li>
-            <li><a class="item" href="usercomment.html"><img src="__IMG__/user7.png" class="icon"><p class="name">我的评论</p></a></li>
-            <li><a class="item" href="userinvitation.html"><img src="__IMG__/user8.png" class="icon"><p class="name">我的邀请</p></a></li>
-            <li><a class="item" href="exchangerecord.html"><img src="__IMG__/user9.png" class="icon"><p class="name">兑换记录</p></a></li>
-          </ul>
-        </div>
-      </section>
-    </section>
-    <div class="space"></div>
-    <footer class="footer">
-      <ul class="nav clearfix">
-        <li><a class="item" href="index.html"><i class="iconfont icon-home"></i><span>首页</span></a></li>
-        <li><a class="item" href="gift.html"><i class="iconfont icon-gift"></i><span>礼包</span></a></li>
-        <li><a class="item" href="shop.html"><i class="iconfont icon-shop"></i><span>商城</span></a></li>
-        <li><a class="item" href="news.html"><i class="iconfont icon-news"></i><span>资讯</span></a></li>
-        <li><a class="item active" href="user.html"><i class="iconfont icon-user"></i><span>我的</span></a></li>
-      </ul>
-    </footer>
-    <div class="pop pop-window">
-      <div class="pop-box pop-sign">
-        <div class="pop-wrap"></div>
-      </div>
-    </div>
-    
-    <div class="popmsg pop-dialog"></div>
-    <script src="style/js/pop.lwx.min.js"></script>
-    <script>
-      $(function() {
-        var pmsg = $('.popmsg').pop();
-        $('.sign').click(function() {
-          var html = '<h2 class="pop-sign-title"></h2><div class="pop-sign-list"><ul class="clearfix"><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分1</span></div><p>第1天</p></div></li><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分2</span></div><p>第2天</p></div></li><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分3</span></div><p>第3天</p></div></li><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分4</span></div><p>第4天</p></div></li><li><div class="item"><div class="picbox"><img src="__IMG__/sign_not.png"><span>积分5</span></div><p>第5天</p></div></li><li><div class="item"><div class="picbox"><img src="__IMG__/sign_not.png"><span>积分6</span></div><p>第6天</p></div></li><li><div class="item"><div class="picbox"><img src="__IMG__/sign_not.png"><span>积分10</span></div><p>第7天</p></div></li></ul></div><p class="sign-notice">连续签到天数越多，积分越多，每7天循环一次</p><div class="pop-btnbox"><a href="javascript:;" class="pop-btn pop-confirm pop-signing jsconfirm">确定</a></div>';
-          var pop = $('.pop').pop().open(800,html);
-          
-          $('.jsconfirm').click(function() {
-            // ajax
-            
-            pmsg.msg('签到成功');
-            
-            pop.close();
-            
-            
-          });
-          
-        });
-      });
-    </script>
-  </body>
-
-</block>
diff --git a/Application/Mobile/View/User/index - 副本 (3).html b/Application/Mobile/View/User/index - 副本 (3).html
deleted file mode 100644
index c5c461e66..000000000
--- a/Application/Mobile/View/User/index - 副本 (3).html	
+++ /dev/null
@@ -1,83 +0,0 @@
- <extend name="Public/bases" />
-<block name="body" >
-    <link href="__CSS__/user.css" rel="stylesheet" >
-  <body class="user">
-    <header class="header user-index-header">
-      <div class="">
-        <a href="javascript:;" class="hbtn sign"><img src="__IMG__/sign.png"><span class="signing">每日签到</span><span class="signed hidden">已签到</span></a>
-        
-        <a href="userset.html" class="hbtn set">编辑资料</a>
-      </div>
-    </header>
-    <div class="occupy"></div>
-    <section class="trunker">
-      <section class="container">
-        <div class="banner">
-          <div class="wrap">
-            <div class="nologin">
-              <a href="login.html"><img src="__IMG__/portrait_not.png"></a>
-              <p class="nick">点击头像登录账户</p>
-            </div>
-            <div class="login hidden">
-              <img src="__IMG__/fq/head_portrait.png">
-              <p class="nick">海绵奶酪君</p>
-              <p class="money"><i class="iconfont icon-money"></i><span>平台币 <i>5620.00</i></span></p>
-            </div>
-          </div>
-        </div>
-        <div class="t-list user-index-list">
-          <ul class="clearfix">
-            <li><a class="item" href="userbindcoin.html"><img src="__IMG__/user1.png" class="icon"><p class="name">绑币管理</p></a></li>
-            <li><a class="item" href="recharge.html"><img src="__IMG__/user2.png" class="icon"><p class="name">账户充值</p></a></li>
-            <li><a class="item" href="userintegral.html"><img src="__IMG__/user3.png" class="icon"><p class="name">我的积分</p></a></li>
-            <li><a class="item" href="usergame.html"><img src="__IMG__/user4.png" class="icon"><p class="name">我的游戏</p></a></li>
-            <li><a class="item" href="usercollection.html"><img src="__IMG__/user5.png" class="icon"><p class="name">我的收藏</p></a></li>
-            <li><a class="item" href="usergift.html"><img src="__IMG__/user6.png" class="icon"><p class="name">我的礼包</p></a></li>
-            <li><a class="item" href="usercomment.html"><img src="__IMG__/user7.png" class="icon"><p class="name">我的评论</p></a></li>
-            <li><a class="item" href="userinvitation.html"><img src="__IMG__/user8.png" class="icon"><p class="name">我的邀请</p></a></li>
-            <li><a class="item" href="exchangerecord.html"><img src="__IMG__/user9.png" class="icon"><p class="name">兑换记录</p></a></li>
-          </ul>
-        </div>
-      </section>
-    </section>
-    <div class="space"></div>
-    <footer class="footer">
-      <ul class="nav clearfix">
-        <li><a class="item" href="index.html"><i class="iconfont icon-home"></i><span>首页</span></a></li>
-        <li><a class="item" href="gift.html"><i class="iconfont icon-gift"></i><span>礼包</span></a></li>
-        <li><a class="item" href="shop.html"><i class="iconfont icon-shop"></i><span>商城</span></a></li>
-        <li><a class="item" href="news.html"><i class="iconfont icon-news"></i><span>资讯</span></a></li>
-        <li><a class="item active" href="user.html"><i class="iconfont icon-user"></i><span>我的</span></a></li>
-      </ul>
-    </footer>
-    <div class="pop pop-window">
-      <div class="pop-box pop-sign">
-        <div class="pop-wrap"></div>
-      </div>
-    </div>
-    
-    <div class="popmsg pop-dialog"></div>
-    <script src="style/js/pop.lwx.min.js"></script>
-    <script>
-      $(function() {
-        var pmsg = $('.popmsg').pop();
-        $('.sign').click(function() {
-          var html = '<h2 class="pop-sign-title"></h2><div class="pop-sign-list"><ul class="clearfix"><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分1</span></div><p>第1天</p></div></li><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分2</span></div><p>第2天</p></div></li><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分3</span></div><p>第3天</p></div></li><li><div class="item on"><div class="picbox"><img src="__IMG__/sign_yes.png"><span>积分4</span></div><p>第4天</p></div></li><li><div class="item"><div class="picbox"><img src="__IMG__/sign_not.png"><span>积分5</span></div><p>第5天</p></div></li><li><div class="item"><div class="picbox"><img src="__IMG__/sign_not.png"><span>积分6</span></div><p>第6天</p></div></li><li><div class="item"><div class="picbox"><img src="__IMG__/sign_not.png"><span>积分10</span></div><p>第7天</p></div></li></ul></div><p class="sign-notice">连续签到天数越多，积分越多，每7天循环一次</p><div class="pop-btnbox"><a href="javascript:;" class="pop-btn pop-confirm pop-signing jsconfirm">确定</a></div>';
-          var pop = $('.pop').pop().open(800,html);
-          
-          $('.jsconfirm').click(function() {
-            // ajax
-            
-            pmsg.msg('签到成功');
-            
-            pop.close();
-            
-            
-          });
-          
-        });
-      });
-    </script>
-  </body>
-
-</block>
diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html
index c5eb8b662..047ec0fd5 100644
--- a/Application/Mobile/View/User/login.html
+++ b/Application/Mobile/View/User/login.html
@@ -1,100 +1,53 @@
-<extend name="Public/bases"/>
-<block name="css">
-  <link href="__CSS__/unlr.css" rel="stylesheet" >
-	<script src="__JS__/lwx.js"></script>
-	<style>
-		.username_record_list {position:absolute;top:100%;left:0;right:0;z-index:100;background:#FFF;width:100%;border:1px solid #cdcdcd;border-radius:3px;padding:0.6rem 0;}
-		.username_record_list li {padding:0.6rem 0.9rem 0.6rem 5.5%;position:relative;}
-		.username_record_list li .name {display:inline-block;width:80%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
-		.username_record_list li .delete_btn {float:right;background:url(__IMG__/trade1/icon_normal_shan.png) center center no-repeat;background-size:100% 100%;width:2rem;height:2rem;}
-		#mobile:focus~.username_record_list {display:block;}
-		.login-form .input-group .txt {border:none;padding:.4rem 1% .4rem 0;}
-		.login-form .input-group .txt::-webkit-input-placeholder { 
-				color:    #999;
-		}
-		.login-form .input-group .txt:-moz-placeholder { 
-				color:    #999;
-		}
-		.login-form .input-group .txt::-moz-placeholder { 
-				color:    #999;
-		}
-		.login-form .input-group .txt:-ms-input-placeholder {
-				color:    #999;
-		}
-	</style>
-  <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
-</block>
-
-<block name="body">
-
-  <!--<script type="text/javascript" src="__JS__/getRem.js"></script>-->
-  <body class="unlr">
-    <header class="header login-header">
-      <div class="">
-        <if condition="I('get.pid') gt 0">
-          <a href="javascript:;history.back(-1)" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-          <else/>
-          <if condition="I('get.back') neq ''">
-            <a href="javascript:;history.go('{:I('get.back')}')" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-            <else/>
-            <a href="{:U('user')}" class="hbtn back"><i class="iconfont icon-drop-left"></i></a>
-          </if>
-        </if>
-        <h1 class="caption">用户登录</h1>
-      </div>
-    </header>
-    <div class="occupy"></div>
-    <section class="trunker">
-      <section class="container">
-        <div class="banner login-banner">
-          <div class="wrap">
-            <div class="imgbox">
-              <img src="__IMG__/head_men.png">
-            </div>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>我的</title>
+    <script src="__JS__/jquery-1.11.3.min.js"></script>
+    <script type="text/javascript" src="__JS__/getRem.js"></script>
+    <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
+    <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
+    <link rel="stylesheet" type="text/css" href="__CSS__/my.css">
+    <link href="__CSS__/common-cz.css" rel="stylesheet" >
+</head>
+<body>
+  <div class="my">
+    <div class="register">
+      <div class="logo"><img src="__IMG__/user/logo2.png" alt=""></div>
+      <form id="login_form" autocomplete="off" data-url="{$url}">
+          <div class="account">
+              <img class="img-one" src="__IMG__/user/people.png" alt="">
+              <input id="mobile"  type="text" placeholder="请输入账号/手机号" value=''>
+              <img class="img-close empty" style="padding: 0px;" src="__IMG__/user/close.png" alt="">
+          </div>
+          <div class="passsword">
+              <img class="img-one" src="__IMG__/user/suo.png" alt="">
+              <input type="password" id="password" placeholder="请输入密码">
+              <img class="img-close create_img" src="__IMG__/user/show.png" alt="">
           </div>
-        </div>
-        <div class="t-form login-form">
-          <form class="login-box" id="login_form" autocomplete="off" data-url="{$url}">
-            <div class="form-group clearfix">
-              <div class="input-group clearfix" id="url_list">
-                <span class="input-fix input-prefix"><i class="iconfont icon-mobile"></i></span>
-                <!-- <span class="input-fix input-suffix jsdel" style="right:8.5%;"><i class="iconfont icon-error3"></i></span>
-                 -->
-								<span class="input-fix input-suffix jsdrop"><i class="iconfont icon-drop-down"></i></span>
-								<input type="text" name="" id="mobile" autocomplete="off" class="txt jsinput" placeholder="请输入账号/手机号">
-								
-              </div>
-              <div class="input-group clearfix">
-                <span class="input-fix input-prefix"><i class="iconfont icon-lock"></i></span>
-                <input type="password" name="" id="password" autocomplete="off" class="txt jsinput" placeholder="请输入密码">
-								
-              </div>
-            </div>
-            <p class="agree"><!-- 注册账号表示您同意<a href="">最终用户协议</a> --></p>
-            <div class="btn-group">
-              <input type="button" class="submit" value="登录">
-            </div>
-            <div class="link-group clearfix">
-              <if condition="I('get.pid') gt 0">
-                <a href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>" class="register-btn">账号注册 <font class="line">|</font> </a>
-                <a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>" class="register-btn">&nbsp;手机注册</a>
-                <else/>
-                <a href="{:U('User/step1')}" class="register-btn">账号注册 <font class="line">|</font> </a><a href="{:U('User/step')}" class="register-btn">&nbsp;手机注册</a>
-              </if>
-              <a href="{:U('User/forget')}" class="forget-btn" style="color: #333">忘记密码</a>
-            </div>
-          </form>
-        </div>
-      </section>
-    </section>
+          <div class="forget"><a href="{:U('User/forget')}">忘记密码？</a></div>
+          <button class="enter submit">登录</button>
+     </form>
+     <if condition="I('get.pid') gt 0">
+         <div class="promptly">还没有账号？<a style="margin-left: 10px;"  href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 账号注册 </a>|<a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>"> 手机注册 </a></div>
+      <else/>
+        <div class="promptly">还没有账号？<a style="margin-left: 10px;" href="{:U('User/step1')}"> 账号注册 </a>|<a href="{:U('User/step')}"> 手机注册 </a></div>
+     </if>
+  </div>
+  </div>
     <div class="pop pop-window">
       <div class="pop-box pop-sign">
         <div class="pop-wrap"></div>
       </div>
     </div>
     
-    <div class="popmsg pop-dialog"></div>
+    <div class="popmsg pop-dialog" style="font-size: .28rem"></div>
+  </body>
     <script src="__JS__/pop.lwx.min.js"></script>
+    <script src="__JS__/lwx.js"></script>
+    <script src="__JS__/common.js"></script>
     <script>
 
         $(document).ready(function(){
@@ -105,61 +58,22 @@
           $('.submit').click(); 
         }  
       });
+
+      $('.empty').click(function(){
+          $('.account>input').val("");
+      });
+
+
+      $('.create_img').click(function(){
+          if($(this).attr('src')=='__IMG__/user/show.png'){
+              $(this).attr('src','__IMG__/user/hide.png');
+              $(this).siblings("input").attr('type','text');
+          }else{
+              $(this).attr('src','__IMG__/user/show.png');
+              $(this).siblings("input").attr('type','password');
+          }   
+      });
 			
-			function delete_url(e,str,i) {
-				var arr = str.split(',');
-				var index = arr.indexOf(i);
-				if(index>-1)
-					arr.splice(index,1);
-				lwx.setItem('username',arr.join(','));
-				$(e).closest('li').remove();
-				if($('#url_list #username_record_list li').length<1) {
-					$('#url_list #username_record_list').remove();
-				}
-			}
-			
-			function input_name(e,i) {
-				$('#mobile').val(i);
-				$(e).closest('#username_record_list').hide();
-			}
-			
-			var username = lwx.getItem('username');
-			if(username) {
-				var uname = username.split(',');
-				var html = '<ul class="username_record_list" id="username_record_list" style="display:none;">';
-				for(var i=0,len=uname.length;i<len;i++) {
-					html += '<li><span class="name" onclick="input_name(this,&#39;'+uname[i]+'&#39;)">'+uname[i]+'</span><a class="delete_btn" onclick="delete_url(this,&#39;'+username+'&#39;,&#39;'+uname[i]+'&#39;)" href="javascript:;"></a></li>';				
-				}
-				html += '</ul>';
-				$('#url_list').append(html);
-			}
-			
-			$('#mobile').focus(function() {
-				
-				if($('#url_list #username_record_list').length>0) {
-					//$('#url_list #username_record_list').show();
-				}
-				
-				return false;
-			});
-			
-			$('.jsdrop').on('click',function() {
-				var url = $('#url_list #username_record_list');
-				if(url.is(':visible')) {
-					url.hide();$(this).find('i').removeClass('icon-drop-up').addClass('icon-drop-down');
-				} else {
-					url.show();$(this).find('i').removeClass('icon-drop-down').addClass('icon-drop-up');
-				}
-				return false;
-			});
-			
-			$('body').click(function(event) {
-				var e = event || window.event;
-				var target = $(e.target);
-				if(target.closest('#url_list').length<1 && target.attr('id')!='url_list') {
-					$('#url_list #username_record_list').hide();
-				}
-			});
 			
       var pmsg = $('.popmsg').pop();  
       $('.submit').click(function(event) {
@@ -235,5 +149,4 @@
 
 
     </script>
-  </body>
 </block>
\ No newline at end of file
diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html
index 4f0a7c18a..c675f5836 100644
--- a/Application/Mobile/View/User/userset.html
+++ b/Application/Mobile/View/User/userset.html
@@ -79,6 +79,10 @@
         </div>
       </div>
     </div>
+    
+  </div>
+  <div class="btnbox user-set-btnbox">
+    <a href="javascript:;" class="btn jsquit">退出登录</a>
   </div>
 
   <div class="pop pop-window">
diff --git a/Public/Mobile/images/user/close.png b/Public/Mobile/images/user/close.png
new file mode 100644
index 000000000..36e7e3a93
Binary files /dev/null and b/Public/Mobile/images/user/close.png differ
diff --git a/Public/Mobile/images/user/hide.png b/Public/Mobile/images/user/hide.png
new file mode 100644
index 000000000..5ce9141cb
Binary files /dev/null and b/Public/Mobile/images/user/hide.png differ
diff --git a/Public/Mobile/images/user/logo2.png b/Public/Mobile/images/user/logo2.png
new file mode 100644
index 000000000..2cabb01a0
Binary files /dev/null and b/Public/Mobile/images/user/logo2.png differ
diff --git a/Public/Mobile/images/user/people.png b/Public/Mobile/images/user/people.png
new file mode 100644
index 000000000..a224d7368
Binary files /dev/null and b/Public/Mobile/images/user/people.png differ
diff --git a/Public/Mobile/images/user/show.png b/Public/Mobile/images/user/show.png
new file mode 100644
index 000000000..3b944c8ec
Binary files /dev/null and b/Public/Mobile/images/user/show.png differ
