忘记密码

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1128 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/account/user.html

@@ -109,22 +109,28 @@
 				</div>
 				<div class="row line form-group" ng-class="{'has-success': checkSuccess, 'has-error': checkFailed}">
 					<label class="col-md-4 col-sm-4 col text-right">原密码：</label>
-					<div class="col-md-4 col-sm-4 col"><input ng-model="user.password" class="form-control input-sm" type="password" ng-blur="checkPassword(user.password)" required></div>
+					<div class="col-md-4 col-sm-4 col"><input ng-model="user.password" class="form-control input-sm" type="password" ng-blur="checkPassword(user.password)" required placeholder="当前密码"></div>
 					<div class="col-md-4 col-sm-4 col">
 						<span ng-show="checking">验证密码...</span>
 						<i ng-show="checkSuccess" class="fa fa-check" style="color:#339933"></i>
-						<i ng-show="checkFailed" class="fa fa-close" style="color:#CC3333;"></i></div>
+						<i ng-show="checkFailed" class="fa fa-close" style="color:#CC3333;"></i>
+					</div>
 				</div>
 				<div class="row">
 					<label class="col-md-4 col-sm-4 col text-right">新密码：</label>
 					<div class="col-md-4 col-sm-4 col">
-						<input ng-model="user.newPassword" class="form-control input-sm" type="password" required>
-						<div>密码复杂度</div>
+						<input ng-model="user.newPassword" ng-pattern="/^([\w~!@#$%^&\*\(\)-_\+=,.;\[\]{}\<\>]){6,20}$/" class="form-control input-sm" type="password" required  placeholder="6~20位字母、数字、符号">
+						<!-- <div>密码复杂度</div> -->
+					</div>
+					<div class="col-md-4 col-sm-4 col">
+						
 					</div>
 				</div>
 				<div class="row line form-group" ng-class="{'has-success': user.newPassword1 && (user.newPassword1==user.newPassword)}">
 					<label ng-model="user.newPassword1" class="col-md-4 col-sm-4 col text-right">重复新密码：</label>
-					<div class="col-md-4 col-sm-4 col"><input ng-model="user.newPassword1" class="form-control input-sm" type="password" required></div>
+					<div class="col-md-4 col-sm-4 col">
+						<input ng-pattern="/^[\S]{6,}$/" ng-model="user.newPassword1" class="form-control input-sm" type="password" required placeholder="重复新密码">
+					</div>
 				</div>
         	</div>
         	<div class="modal-footer">
@@ -182,17 +188,16 @@
 							ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
 							<input ng-model="newUser.userTel"
 							ng-blur="telValid(newUser.userTel)" required name="newUserTel"
-							class="form-control input-sm" type="text" placeholder="手机号">
+							class="form-control input-sm" ng-parttern="/^[\d-]{8,}$/" type="text" placeholder="手机号">
 						</td>
 						<td class="text-center"
 							ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
-							<input ng-model="newUser.userEmail"
+							<input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
 							ng-blur="emailValid(newUser.userEmail)" required
 							name="newUserEmail" class="form-control input-sm" type="text"
 							placeholder="邮箱">
 						</td>
-						<td colspan="2"><a class="text-inverse"
-							ng-click="editUserRole(newUser)">设置角色</a></td>
+						<td colspan="2"></td>
 					</tr>
 				</tbody>
 				<tbody>

src/main/webapp/resources/tpl/register/step3.html

@@ -51,7 +51,7 @@
 			    	<label for="password" class="col-md-3 col-sm-4 control-label">请输入密码：</label>
 				    <div class="col-md-6 col-sm-6">
 				      	<input required ng-model="password" type="password" class="form-control" name="password" 
-				      		id="password" placeholder="请输入管理员账号的密码" required>
+				      		id="password" placeholder="6~20位字母、数字、符号" ng-pattern="/^([\w~!@#$%^&\*\(\)-_\+=,.;\[\]{}\<\>]){6,20}$/" required>
 				    </div>
 				    <div class="col-md-2 col-sm-2 col-sm-offset-4 col-md-offset-0">
 				    	<span ng-show="!myForm.password.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span></span>
@@ -62,7 +62,7 @@
 				    <label for="password2" class="col-md-3 col-sm-4 control-label">请确认密码：</label>
 				    <div class="col-md-6 col-sm-6">
 				      	<input required ng-model="password2" type="password" class="form-control" name="password2" 
-				      		id="password2" placeholder="请确认管理员账号的密码" required>
+				      		id="password2" placeholder="重复密码" required>
 				    </div>
 				    <div class="col-md-2 col-sm-2">
 				    	<span ng-show="!myForm.password2.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span></span>

src/main/webapp/resources/tpl/serve/home.html

@@ -19,7 +19,7 @@
 					<li><a href=""> <span class="icon-circle"> <i
 								class="fa fa-warning"></i>
 						</span> <span class="title"> 账号无法登录 </span></a></li>
-					<li><a href=""> <span class="icon-circle"> <i
+					<li><a href="#/self/forget_pwd1"> <span class="icon-circle"> <i
 								class="fa fa-key"></i>
 						</span> <span class="title"> 忘记密码 </span></a></li>
 					<li><a href=""> <span class="icon-circle"> <i

src/main/webapp/resources/tpl/serve/self.html

@@ -0,0 +1,34 @@
+<div class="left-wrap block">
+	<div class="left-nav">
+		<div class="nav-label">
+			<i></i>自助服务
+		</div>
+		<ul class="list-unstyled">
+			<li ui-sref-active="active"><a ui-sref="sale">注册进度查询</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale">找回登录账号</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale">账号无法登录</a></li>
+			<li ui-sref-active="active"><a ui-sref="self.forget_pwd1">忘记密码</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale">修改密码</a></li>
+		</ul>
+	</div>
+	<div class="left-nav">
+		<div class="nav-label">
+			<i></i>更多
+		</div>
+		<ul class="list-unstyled">
+			<li ui-sref-active="active"><a ui-sref="sale">添加用户</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale">注销用户</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale">绑定多个企业</a></li>
+			<li ui-sref-active="active"><a ui-sref="sale">移动客户端</a></li>
+		</ul>
+	</div>
+	<div class="left-nav">
+		<div class="nav-label">
+			<i></i>移动客户端
+		</div>
+		<ul class="list-unstyled">
+			<li ui-sref-active="active"><a ui-sref="sale">移动客户端</a></li>
+		</ul>
+	</div>
+</div>
+<div class="right-wrap block" ui-view></div>

src/main/webapp/resources/tpl/serve/self/forget_pwd1.html

@@ -0,0 +1,62 @@
+<style>
+.type-info {
+	font-size: 14px;
+  	line-height: 25px;
+  	margin: 10px 0px;
+}
+
+</style>
+<div class="loading" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="row f14">
+	<div class="col-xs-12">
+		<div class="headerline">
+			<div class="content">忘记密码</div>
+		</div>
+		<div style="min-height: 500px;">
+			<ul>
+				<li>
+					<div class="type-info">请输入您的 个人登录账号（个人UU号 或 手机号 或 邮箱地址）</div>
+					<div class="row form-inline">
+						<div class="form-group col-xs-6 col-xs-offset-1">
+							<input type="search" class="form-control input-sm" ng-model="userName" style="width: 260px;" ng-search="getUserInfo()" placeholder="个人UU号或手机号或邮箱地址">
+							<button class="btn btn-info btn-sm" ng-disabled="!userName" ng-click="getUserInfo()">确认</button>
+						</div>
+					</div>
+					<div class="row text-inverse" ng-if="userInfoError">
+						<div class="col-xs-10 col-xs-offset-1">
+							错误：{{::userInfoError}}，请重新输入
+						</div>
+					</div>
+					<div class="row" ng-if="userInfo">
+						<div class="col-xs-10 col-xs-offset-1">
+							<br>
+							<div>请确认您的用户信息：</div>
+							<div><label>企业名称：</label>{{userInfo.enName}}</div>
+							<div><label>个人姓名：</label>{{userInfo.userName}}</div>
+							<div>如确定这是您的账号，请点击发送验证邮件。</div>
+							<div class="row" style="margin: 12px 0;">
+								<a ng-disabled="sendSuccess" class="btn btn-success btn-xs col-xs-5 col-xs-offset-1" ng-click="sendEmail()">发送验证邮件<br>
+									<span class="f12">({{::userInfo.userEmail}})</span>
+								</a>
+								<div class="col-xs-5">
+									<label ng-if="sendSuccess" class="text-success">已发送成功，请注意查收邮件</label>
+			      					<label ng-if="sendFaild" class="text-danger">发送失败</label>
+								</div>
+							</div>
+							<div class="row">
+								<div class="col-xs-10 text-muted">
+									如您自己的邮箱无法接收邮件，也可以
+									 <a ng-disabled="sendSuccess" class="btn btn-default btn-xs" ng-click="sendEmail('admin')">发送验证邮件到管理员邮箱</a> 
+									 ({{::userInfo.adminEmail}})
+								</div>
+							</div>
+							<div>我们将会发送验证链接到您的邮箱，点击邮件中的验证链接即可重设密码。</div>
+						</div>
+					</div>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>

src/main/webapp/resources/tpl/serve/self/forget_pwd2.html

@@ -0,0 +1,71 @@
+<style>
+.type-info {
+	font-size: 14px;
+  	line-height: 25px;
+  	margin: 10px 0px;
+}
+
+</style>
+<div class="loading" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="row f14">
+	<div class="col-xs-12">
+		<div class="headerline">
+			<div class="content">重设密码</div>
+		</div>
+		<div style="min-height: 500px;">
+			<ul>
+				<li>
+					<div class="type-info">邮箱验证并重设密码</div>
+					<div class="row">
+						<div class="col-xs-10 col-xs-offset-1">
+							<i class="fa fa-spinner" ng-class="{'fa-spin': checking, 'text-success': checking}"></i> 正在验证，请稍候。
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-xs-10 col-xs-offset-1" ng-if="checkSuccess">
+							<br>
+					  		<div>验证通过，请立即设置新密码：</div>
+					  		<form name="myForm">
+						  		<div class="form-group row">
+							    	<label for="password" class="col-xs-3 control-label text-right">请输入密码：</label>
+								    <div class="col-xs-4">
+								      	<input required ng-model="all.password" type="password" class="form-control" name="password" 
+								      		placeholder="6~20位字母、数字、符号" ng-pattern="/^([\w~!@#$%^&\*\(\)-_\+=,.;\[\]{}\<\>]){6,20}$/">
+								    </div>
+								    <div class="col-xs-5">
+								    	<i ng-if="all.password" class="fa fa-check-circle-o text-success"></i>
+							    	</div>
+							    </div>
+							    <div class="form-group row">
+								    <label for="password2" class="col-xs-3 control-label text-right">请确认密码：</label>
+								    <div class="col-xs-4">
+								      	<input required ng-model="all.password2" type="password" class="form-control" name="password2" 
+								      		placeholder="重复密码">
+								    </div>
+								    <div class="col-xs-5">
+								    	<i ng-show="all.password2 && all.password2 == all.password" class="fa fa-check-circle-o text-success"></i>
+							    	</div>
+								</div>
+								<div class="form-group">
+							    	<div class="col-xs-3 col-xs-offset-3">
+							      		<button ng-disabled="!all.password || all.password2 != all.password" ng-click="reset()" class="btn btn-success btn-sm btn-block">确定
+							      		</button>
+							    	</div>
+							    	<div class="col-xs-4">
+							    		<label ng-show="resetSuccess" class="text-success">设置成功，正在跳转至登陆界面...</label>
+							      		<label ng-show="resetError" class="text-danger">设置失败</label>
+							    	</div>
+						  		</div>
+						  	</form>
+					  	</div>
+					  	<div class="col-xs-10 col-xs-offset-1" ng-if="checkError">
+					  		验证不通过 {{errorInfo}}，请重新 <a class="alert-link text-bold" href="#/self/forget_pwd1">找回密码</a>。
+					  	</div>
+					</div>
+				</li>
+			</ul>
+		</div>
+	</div>
+</div>