注册页面

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

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

@@ -19,7 +19,7 @@
     		<li class="ui-step-start">
 				<div class="ui-step-text">
 					<span class="ui-step-texttitle">第 3 步</span><br>
-					<span class="ui-step-textdetail">注册成功</span>
+					<span class="ui-step-textdetail">验证激活</span>
 				</div>
     		</li>
 		</ol>
@@ -37,7 +37,7 @@
 <div class="row" ng-controller="Step1Ctrl">
 	<!-- enterprise form start -->
 	<div class="col-md-9">
-		<form name="myForm" class="form-horizontal" role="form" ng-submit="register(enterprise)">
+		<form name="myForm" class="form-horizontal" role="form" ng-submit="register(enterprise)" style="min-height: 353px;">
 		  	<div class="form-group">
 		    	<label for="enName" class="col-md-3 col-sm-4 control-label">企业名称：</label>
 			    <div class="col-md-5 col-sm-6">
@@ -147,7 +147,7 @@
 	<!-- remark start -->
 	<div class="col-md-3 well">
 		说明资料
-		<p>1....</p>
+		<p>1 优软SAAS服务依托优软UAS管理系统的</p>
 		<p>2....</p>
 	</div>
 	<!-- remark end -->

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

@@ -19,7 +19,7 @@
     		<li class="ui-step-start">
 				<div class="ui-step-text">
 					<span class="ui-step-texttitle">第 3 步</span><br>
-					<span class="ui-step-textdetail">注册成功</span>
+					<span class="ui-step-textdetail">验证激活</span>
 				</div>
     		</li>
 		</ol>
@@ -35,7 +35,7 @@
 <div class="row">
 	<!-- enterprise form start -->
 	<div class="col-md-9">
-		<form name="myForm" class="form-horizontal" role="form" ng-submit="register(enterprise)">
+		<form name="myForm" class="form-horizontal" role="form" ng-submit="register(enterprise)" style="min-height: 353px;">
 		  	
 		</form>
 	</div>

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

@@ -19,7 +19,7 @@
     		<li class="ui-step-start">
 				<div class="ui-step-text ui-step-text-active">
 					<span class="ui-step-texttitle">第 3 步</span><br>
-					<span class="ui-step-textdetail">注册成功</span>
+					<span class="ui-step-textdetail">验证激活</span>
 				</div>
     		</li>
 		</ol>
@@ -33,9 +33,72 @@
 <!-- alert end -->
 <div class="row">
 	<!-- enterprise form start -->
-	<div class="col-md-9">
-		<form name="myForm" class="form-horizontal" role="form" ng-submit="register(enterprise)">
-		  	
+	<div class="col-md-9" ng-controller="Step3Ctrl">
+		<form name="myForm" class="form-horizontal" role="form" ng-submit="register(enterprise)" style="min-height: 353px;">
+		  	<div class="col-md-8 col-md-offset-1">
+		  		UU号：<label>{{uu}}</label><br>
+		  		验证码：<label>{{checkcode}}</label><br>
+		  		正在验证......
+		  	</div>
+		  	<div class="col-md-8 col-md-offset-1" ng-show="activateResult">
+		  		验证结果：<label>{{checkResult}}</label>
+		  	</div>
+		  	<div class="col-md-8 col-md-offset-1" ng-show="activateSuccess">
+		  		验证通过，请立即设置管理员密码：<br><br>
+		  		<div class="form-group">
+			    	<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>
+				    </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>
+				    	<span ng-show="myForm.password.$invalid && password" class="text-danger"><span class="glyphicon glyphicon-remove-circle"></span></span>
+			    	</div>
+			    </div>
+			    <div class="form-group">
+				    <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>
+				    </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>
+				    	<span ng-show="myForm.password2.$invalid && password2" class="text-danger"><span class="glyphicon glyphicon-remove-circle"></span></span>
+			    	</div>
+				</div>
+				<div class="form-group">
+			    	<div class="col-md-offset-3 col-md-4 col-sm-offset-4 col-sm-4">
+			      		<button ng-disabled="myForm.password2.$invalid" ng-click="setAdminPassword(uu, password)" class="btn btn-success btn-block">确定
+			      			<div class="spinner" ng-show="loadingShow">
+							  	<div class="bounce1"></div>
+							  	<div class="bounce2"></div>
+							  	<div class="bounce3"></div>
+							</div>
+			      		</button>
+			    	</div>
+			    	<div class="col-md-4 col-sm-4">
+			    		<label ng-show="setSuccess" class="text-success">设置成功</label>
+			      		<label ng-show="setFaild" class="text-danger">设置失败</label>
+			    	</div>
+		  		</div>
+		  	</div>
+		  	<div class="col-md-8 col-md-offset-1" ng-show="activateSendAgain">
+		  		验证码过期，请重新发送激活邮件：<br><br>
+				<div class="form-group">
+			    	<div class="col-md-offset-3 col-md-6 col-sm-offset-3 col-sm-6">
+			      		<button ng-click="sendEmailAgain(uu)" ng-disabled="emailDisabled" class="btn btn-success btn-block">重新发送激活邮件
+			      			<div class="spinner" ng-show="loadingShow">
+							  	<div class="bounce1"></div>
+							  	<div class="bounce2"></div>
+							  	<div class="bounce3"></div>
+							</div>
+			      		</button>
+			    	</div>
+			    	<label ng-show="sendSuccess" class="text-success">已发送成功</label>
+			      	<label ng-show="sendFaild" class="text-danger">发送失败</label>
+		  		</div>
+		  	</div>
 		</form>
 	</div>
 	<!-- enterprise form end  -->