企业激活中断处理

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

src/main/webapp/resources/js/register/registerApp.js

@@ -173,14 +173,21 @@ define([ 'toaster', 'services' ,'ui.router', 'file-upload', 'file-upload-shim'],
 		setTimeout(function() {//延迟5秒执行
 			$http.post('signup/activate?uu=' + $scope.uu + '&checkcode=' + $scope.checkcode)
 			.success(function(data){
-				$scope.checkResult = '成功';
-				$scope.activateResult = true;
-				$scope.activateSuccess = true;
+				if(data.result == "SUCCESS") {
+					$scope.checkResult = '成功';
+					$scope.activateResult = true;
+					$scope.activateSuccess = true;
+				} else {
+					$scope.activateSendAgain = true;
+					$scope.againInfo = "企业激活过程中断，需重新激活";
+				}
+				
 			}).error(function(data){
 				$scope.checkResult = '失败，原因 - '+ data.result ;
 				$scope.activateResult = true;
 				if(data.result == '验证码错误，激活失败') {
 					$scope.activateSendAgain = true;
+					$scope.againInfo = "验证码错误";
 				}
 			});
 		}, 5000);

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

@@ -86,7 +86,7 @@
 		  		</div>
 		  	</div>
 		  	<div class="col-md-8 col-md-offset-1" ng-show="activateSendAgain">
-		  		验证码过期，请重新发送激活邮件：<br><br>
+		  		{{againInfo}}，请点击重新发送激活邮件：<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">重新发送激活邮件
@@ -106,9 +106,9 @@
 	<!-- enterprise form end  -->
 	<!-- remark start -->
 	<div class="col-md-3 well">
-		说明资料
-		<p>1....</p>
-		<p>2....</p>
+		<p><b>说明资料</b></p>
+		<p>1、激活过程中断可能是因为企业已激活但未设置管理员密码。</p>
+		<p>2、如有疑问，请与我们联系。<br>联系方式：800-830-1818<br>工作时间：周一至周五<br>9:00-12:00&nbsp;&nbsp;&nbsp;14:00-18:00<br>Email: serve@usoftchina.com</p>
 	</div>
 	<!-- remark end -->
 </div>