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

src/main/webapp/resources/tpl/index/sale/order.html

@@ -262,7 +262,7 @@
 							</div>
 							<div class="info">
 								<p>3、您的客户正在使用旧版本的UAS商务平台<br>
-								解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold" title="http://www.usoftchina.com">登陆旧版本UAS商务平台</a> （初次登陆密码111111，登陆后可修改）</p>
+								解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a> （初次登陆密码111111，登陆后可修改）</p>
 							</div>
 						</div>
 						<br>

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

@@ -1,3 +1,9 @@
+<style>
+.input-group-addon {
+	padding: 6px 5px;
+}
+</style>
+
 <!-- step start -->
 <div class="row text-center">
 	<div class="step col-md-8 col-md-offset-2 col-sm-11 col-sm-offset-1">
@@ -60,8 +66,8 @@
 			      		ng-pattern="/^[\d-]{6,}$/" placeholder="六位以上数字或-">
 			    </div>
 			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
-			    	<span ng-show="!myForm.enBussinessCode.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span>恭喜您，执照号可用</span>
-			    	<span ng-show="myForm.enBussinessCode.$invalid && enterprise.enBussinessCode" class="text-danger"><span class="glyphicon glyphicon-remove-circle"></span>{{codeErrorInfo}}</span>
+			    	<span ng-show="!myForm.enBussinessCode.$invalid" class="text-success"><span class="fa fa-check-circle"></span>恭喜您，执照号可用</span>
+			    	<span ng-show="myForm.enBussinessCode.$invalid && enterprise.enBussinessCode" class="text-danger"><span class="fa fa-remove"></span>{{codeErrorInfo}}</span>
 			    	请输入企业在工商部门注册时得到的营业执照注册号（注册证号）
 			    </div>
 		  	</div>
@@ -114,8 +120,8 @@
 			      		ng-parttern="/^[\d-]{8,}$/" placeholder="8位以上手机号码">
 			    </div>
 			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
-			    	<span ng-show="!myForm.enAdminTel.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span>恭喜您，手机号可用</span>
-			    	<span ng-show="myForm.enAdminTel.$invalid && enterprise.enAdminTel" class="text-danger"><span class="glyphicon glyphicon-remove-circle"></span>{{telErrorInfo}}</span>
+			    	<span ng-show="!myForm.enAdminTel.$invalid" class="text-success"><span class="fa fa-check-circle"></span>恭喜您，手机号可用</span>
+			    	<span ng-show="myForm.enAdminTel.$invalid && enterprise.enAdminTel" class="text-danger"><span class="fa fa-remove"></span>{{telErrorInfo}}</span>
 			    	可作为商务平台账号登录
 			    </div>
 		  	</div>
@@ -126,14 +132,67 @@
 			      		ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/" placeholder="请输入正确的邮箱格式">
 			    </div>
 			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
-			    	<span ng-show="!myForm.enAdminEmail.$invalid" class="text-success"><span class="glyphicon glyphicon-ok-circle"></span>恭喜您，邮箱可用</span>
-			    	<span ng-show="myForm.enAdminEmail.$invalid && enterprise.enAdminEmail" class="text-danger"><span class="glyphicon glyphicon-remove-circle"></span>{{emailErrorInfo}}</span>
+			    	<span ng-show="!myForm.enAdminEmail.$invalid" class="text-success"><span class="fa fa-check-circle"></span>恭喜您，邮箱可用</span>
+			    	<span ng-show="myForm.enAdminEmail.$invalid && enterprise.enAdminEmail" class="text-danger"><span class="fa fa-remove"></span>{{emailErrorInfo}}</span>
 			    	将用于接收激活邮件和系统邮件，可作为商务平台账号登录
 			    </div>
 		  	</div>
 		  	<div class="form-group">
-			    <div class="col-md-5 col-sm-6 col-md-offset-3 col-sm-offset-4">
-			    	<input type="checkbox" ng-model="agree" > 我已同意<a href="#">《优软商务平台服务协议》</a>
+		    	<label for="enAddress" class="col-md-3 col-sm-4 control-label">企业地址：</label>
+			    <div class="col-md-5 col-sm-6">
+			      	<input ng-required="applySaas" ng-model="enterprise.enAddress" type="text" class="form-control" id="enAddress" name="enAddress" 
+			      		placeholder="详细地址">
+			    </div>
+			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
+			    	<span ng-if="applySaas" class="text-inverse">*申请SAAS必填</span>
+			    </div>
+		  	</div>
+		  	<div class="form-group">
+		    	<label for="enIndustry" class="col-md-3 col-sm-4 control-label">企业所属行业：</label>
+			    <div class="col-md-5 col-sm-6">
+					<select ng-required="applySaas" ng-model="enterprise.enIndustry" class="form-control" id="enIndustry">
+			      		<option value="make">制造型</option>
+			      		<option value="trade">贸易型</option>
+			      	</select>
+			    </div>
+			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
+			    	<span ng-if="applySaas" class="text-inverse">*申请SAAS必填</span>
+			    </div>
+		  	</div>
+		  	<div class="form-group">
+		    	<label for="enUrl" class="col-md-3 col-sm-4 control-label">企业官网：</label>
+			    <div class="col-md-5 col-sm-6">
+			      	<div class="input-group">
+				      	<span class="input-group-addon">http://</span>
+						<input ng-required="applySaas" ng-blur="setEnSaasUrl(enterprise.enUrl)" ng-model="enterprise.enUrl" type="text" class="form-control" name="enUrl" id="enUrl" placeholder="官网网址">
+					</div>
+			    </div>
+			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
+			    	<span ng-if="applySaas" class="text-inverse">*申请SAAS必填</span>
+			    </div>
+		  	</div>
+		  	<div class="form-group" ng-if="applySaas">
+		    	<label for="enSaasUrl" class="col-md-3 col-sm-4 control-label">SAAS服务域名：</label>
+			    <div class="col-md-5 col-sm-6">
+			    	<div class="input-group">
+				      	<span class="input-group-addon">http://</span>
+						<input ng-required="applySaas" ng-model="enterprise.enSaasUrl" type="text" class="form-control" name="enSaasUrl" id="enSaasUrl" placeholder="域名前缀">
+						<span class="input-group-addon">.saas.ubtob.com</span>
+					</div>
+					<div class="text-muted" ng-if="enterprise.enSaasUrl">您的SAAS系统网址将是：http://{{enterprise.enSaasUrl}}.saas.ubtob.com</div>
+			    </div>
+			    <div class="col-md-4 col-sm-offset-4 col-md-offset-0">
+			    	<div ng-if="applySaas" class="text-inverse">*申请SAAS必填</div>
+			    	<div>
+			    		<span ng-if="!myForm.enSaasUrl.$invalid" class="text-success"><i class="fa fa-check-circle"></i> 恭喜您，SAAS系统域名可用</span>
+			    		<span ng-if="myForm.enSaasUrl.$invalid && enterprise.enSaasUrl" class="text-danger"><i class="fa fa-remove"></i> {{enSaasUrlErrorInfo}}</span>
+			    	</div>
+			    </div>
+		  	</div>
+		  	<div class="form-group">
+			    <div class="col-md-9 col-sm-8 col-md-offset-3 col-sm-offset-4">
+			    	<div><input type="checkbox" ng-model="agree" > 我已同意<a href="#">《优软商务平台服务协议》</a></div>
+			    	<div><input type="checkbox" ng-model="applySaas" > 我同时申请 <a href="#">优软SAAS服务</a></div>
 			    </div>
 		  	</div>
 		  	<div class="form-group">