Merge remote-tracking branch 'origin/liusw-account-v1.0.10.19' into liusw-account-v1.0.10.19

# Conflicts:
#	src/main/webapp/resources/view/usercenter/forstore/account_manager.html

src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -15,10 +15,12 @@
 	}
 	.rt_menu{
 		border-bottom: #e8e8e8 1px solid;
-		background: #fff;
+		background: #ecf2fd;
 	}
 	.rt_menu span{
 		margin-left: 40px;
+		color: #666;
+		font-size: 14px;
 	}
 	.count01 .count-content{
 		width: 100%;
@@ -48,6 +50,45 @@
 		border-radius: inherit;
 		margin-top: 12px;
 	}
+	.count01 ul li span h5 img {
+		margin-top: 24px;
+	}
+	.count01 ul li span>span {
+		color: #666;
+	}
+	.count01 ul li >a {
+		background: #fff;
+		color: #5078cb;
+		text-align: center;
+		height: 30px;
+		line-height: 30px;
+		padding: 0 7px;
+		margin-top: 16px;
+		margin-right: 7px;
+	}
+	.count01 ul li >a.mall-btn-default {
+		background: #5078cb;
+		color: #fff;
+	}
+	.count01 ul li.safe-level>span >span {
+		display: inline-block;
+		height: 14px;
+		line-height: 14px;
+		background: rgb(255, 90, 0);
+		color: #fff;
+		margin-right: 1px;
+		width: 64px;
+		margin-left: 0px;
+		font-size: 12px;
+		text-align: center;
+	}
+	.count01 ul li.safe-level>span >span:nth-child(3) {
+		background: rgb(255,171,44);
+	}
+	.count01 ul li.safe-level>span>i {
+		margin-left: 13px;
+		color: #666;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="account_manager">
@@ -117,61 +158,62 @@
 	<div class="count01 clearfix" ng-if="tab=='safe'">
 		<div class="rt_menu"><span>您的安全服务</span></div>
 		<ul>
-			<li>
+			<li class="safe-level">
 				<span>安全等级
-					<span><b>
-						{{userInfo.secLevel}}
-					</b><em><i style="width: 20%;"></i></em></span>
-					<img src="static/img/user/images/safe.png"/> <!--完成<a href="javascript:void(0)"> 密保设置</a>，提升账户安全。-->
+					<span>弱</span>
+					<span>中</span>
+					<span>强</span>
+					<i>中</i>
+					<!--完成<a href="javascript:void(0)"> 密保设置</a>，提升账户安全。-->
 				</span>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/><p>已完成</p></h5>
+					<h5><img src="static/img/user/images/ok.png"/></h5>
 					<font>实名认证</font>
-					<span class="gray">实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
+					<span>实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
 				</span>
-				<a ng-click="updateRealAuth()">立即认证</a>
+				<a ng-click="updateRealAuth()" class="mall-btn-default">立即设置</a>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/><p>已完成</p></h5>
+					<h5><img src="static/img/user/images/ok.png"/></h5>
 					<font>登录密码</font>
-					<span class="gray">安全性高的密码可以使账号更安全，建议您定期更换密码，并且设置一个包含数字和字母，长度超过8位以上的密码。</span>
+					<span>安全性高的密码可以使账号更安全，建议您定期更换密码，并且设置一个包含数字和字母，长度超过8位以上的密码。</span>
 				</span>
 				<a ng-click="updatePassword()">修改</a>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/><p>已完成</p></h5>
+					<h5><img src="static/img/user/images/ok.png"/></h5>
 					<font>密保问题</font>
-					<span class="gray">是您找回登录密码的方式之一。建议您设置一个容易记住，且最不容易被他人获取的问题及答案，更有效保障您的密...</span>
+					<span>是您找回登录密码的方式之一。建议您设置一个容易记住，且最不容易被他人获取的问题及答案，更有效保障您的密...</span>
 				</span>
-				<a ng-click="updateUserQuestion()">立即设置</a>
+				<a ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/><p>已完成</p></h5>
-					<font>邮箱认证</font>
-					<span class="gray">您当前的邮箱：529010777@qq.com</span>
+					<h5><img src="static/img/user/images/ok.png"/></h5>
+					<font>手机验证</font>
+					<span>绑定手机后，您即可享受淘宝丰富的手机服务，如手机找回密码等。</span>
 				</span>
-				<a ng-click="updateUserEmail()">修改</a>
+				<a ng-click="updateUserTel()">修改</a>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/><p>已完成</p></h5>
-					<font>绑定手机</font>
-					<span class="gray">绑定手机后，您即可享受淘宝丰富的手机服务，如手机找回密码等。</span>
+					<h5><img src="static/img/user/images/ok.png"/></h5>
+					<font>邮箱认证</font>
+					<span>您当前的邮箱：529010777@qq.com</span>
 				</span>
-				<a ng-click="updateUserTel()">修改</a>
+				<a ng-click="updateUserEmail()">修改</a>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/><p>已完成</p></h5>
+					<h5><img src="static/img/user/images/ok.png"/></h5>
 					<font>支付密码</font>
-					<span class="gray">在使用账户中余额或确认收货时，需输入支付密码。</span>
+					<span>在使用账户中余额或确认收货时，需输入支付密码。</span>
 				</span>
-				<a ng-click="updateUserPay()">立即设置</a>
+				<a ng-click="updateUserPay()" class="mall-btn-default">立即设置</a>
 			</li>
 		</ul>
 	</div>

src/main/webapp/resources/view/vendor/modal/updatePassword.html

@@ -3,49 +3,92 @@
 		line-height: 34px;
 		font-size: 14px;
 	}
+	.modal-content {
+		width: 409px;
+	}
+	.modal-header {
+		background: #5078cb;
+		text-align: center;
+	}
+	.modal-header p {
+		color: #fff;
+	}
+	.password .modal-body .row >label {
+		padding: 0;
+	}
+	.password .modal-body .row .col-md-8 {
+		padding-left: 0;
+	}
+	.password .modal-body .row .col-md-8 input {
+		border-radius: 0;
+	}
+	.modal-footer >button {
+		width: 90px;
+		height: 28px;
+		border: 1px solid #5078cb;
+		line-height: 28px;
+		text-align: center;
+	}
+	.modal-footer >button[disabled] {
+		cursor: not-allowed;
+	}
+	.modal-footer >button:first-child {
+		background: #fff;
+		color: #5078cb;
+		margin-right: 10px;
+	}
+	.modal-footer {
+		text-align: center;
+		border: none;
+	}
+	.modal-footer >button:last-child {
+		background: #5078cb;
+		color: #fff;
+	}
 </style>
 <div class="modal-header">
-	<h3 class="f14 modal-title"><i class="fa fa-lock fa-fw"></i>修改密码</h3>
+	<img src="static/img/user/images/update-password.png" alt="">
+	<p>修改密码</p>
 </div>
 <form class="password" name="sampleSendForm" ng-submit="ok()">
 	<div class="modal-body">
 		<div class="row">
-			<label class="col-md-4 col-sm-4 col text-right">用户：</label>
-			<div class="col-md-4 col-sm-4 col">{{::user.userTel}} - {{::user.userName}} </div>
+			<label class="col-md-3 col-sm-3 col text-right">用户：</label>
+			<div class="col-md-8 col-sm-8 col">{{::user.userTel}} - {{::user.userName}} </div>
 		</div>
 		<div class="row line" 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 placeholder="当前密码"></div>
-			<div class="col-md-4 col-sm-4 col">
+			<label class="col-md-3 col-sm-3 col text-right">原密码：</label>
+			<div class="col-md-8 col-sm-8 col"><input ng-model="user.password" class="form-control input-sm" type="password" ng-blur="checkPassword(user.password)" required placeholder="当前密码"></div>
+			<div class="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>
 		</div>
-		<div class="row" ng-class=""{'has-success': checkSuccess1, 'has-error': checkFailed1}">
-			<label class="col-md-4 col-sm-4 col text-right">新密码：</label>
-			<div class="col-md-4 col-sm-4 col">
+		<div class="row" ng-class="{'has-success': checkSuccess1, 'has-error': checkFailed1}">
+			<label class="col-md-3 col-sm-3 col text-right">新密码：</label>
+			<div class="col-md-8 col-sm-8 col">
 				<input ng-model="user.newPassword" ng-keyup="checkNewPassword(user.newPassword)" class="form-control input-sm" type="password" required  placeholder="8~20位字母、数字、符号">
 				<!-- <div>密码复杂度</div> -->
 			</div>
-			<div class="col-md-4 col-sm-4 col">
+			<div class="col">
 				<i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>
 				<i ng-show="checkFailed1" class="fa fa-close" style="color:#CC3333;"></i>
 			</div>
 		</div>
 		<div class="row line">
-			<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">
+			<label ng-model="user.newPassword1" class="col-md-3 col-sm-3 col text-right">重复新密码：</label>
+			<div class="col-md-8 col-sm-8 col">
 				<input ng-model="user.newPassword1" ng-keyup="checkNewPassword1(user.newPassword1)" class="form-control input-sm" type="password" required placeholder="重复新密码">
 			</div>
-			<div class="col-md-4 col-sm-4 col">
+			<div class="col">
 				<i ng-show="checkSuccess2" class="fa fa-check" style="color:#339933"></i>
 				<i ng-show="checkFailed2" class="fa fa-close" style="color:#CC3333;"></i>
 			</div>
 		</div>
 	</div>
 	<div class="modal-footer">
-		<button class="btn btn-primary" ng-disabled="!checkSuccess || !checkSuccess1 || !checkSuccess2" type="submit">确认修改</button>
-		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+		<button ng-click="cancel()" type="button">取消</button>
+		<button ng-disabled="!checkSuccess || !checkSuccess1 || !checkSuccess2" type="submit">确定</button>
 	</div>
 </form>

src/main/webapp/resources/view/vendor/modal/updateRealAuth.html

@@ -1,46 +1,100 @@
 <style>
+    .modal-content {
+        width: 409px;
+    }
+    .modal-header {
+        background: #5078cb;
+        text-align: center;
+    }
+    .modal-header p {
+        color: #fff;
+    }
     .realAuth .modal-body .row {
         line-height: 34px;
         font-size: 14px;
     }
-    .previewImage{
-        width:100px;
-        height: 100px;
+    .realAuth .modal-body .row >label {
+        padding: 0;
+    }
+    .realAuth .modal-body .row .col-md-8 {
+        padding-left: 0;
+    }
+    .realAuth .modal-body .row .col-md-8 input {
+        border-radius: 0;
+    }
+    .realAuth .modal-body .upload-area .area-header {
+        padding-left: 15px;
+        font-size: 14px;
+        margin-top: 17px;
+    }
+    .realAuth .modal-body .upload-area .preview {
+        width: auto;
+        height: auto;
+        margin: 19px 0;
+    }
+    .realAuth .modal-body .upload-area .preview .previewImage {
+        width: 117px;
+        height: 117px;
+        border: 1px solid rgb( 220, 220, 220 );
+    }
+    .modal-footer >button {
+        width: 90px;
+        height: 28px;
+        border: 1px solid #5078cb;
+        line-height: 28px;
+        text-align: center;
+    }
+    .modal-footer >button[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button:first-child {
+        background: #fff;
+        color: #5078cb;
+        margin-right: 10px;
+    }
+    .modal-footer {
+        text-align: center;
+        border: none;
+    }
+    .modal-footer >button:last-child {
+        background: #5078cb;
+        color: #fff;
     }
 </style>
 <div class="modal-header">
-    <h3 class="f14 modal-title"><i class="fa fa-lock fa-fw"></i>实名认证</h3>
+    <img src="static/img/user/images/realAuth.png" alt="">
+    <p>实名认证</p>
 </div>
 <form class="realAuth" name="sampleSendForm" ng-submit="ok()">
     <div class="modal-body">
         <div class="row line oldUserPay">
-            <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.userName" class="form-control input-sm"
+            <label class="col-md-3 col-sm-3 col text-right">真实姓名：</label>
+            <div class="col-md-8 col-sm-8 col"><input ng-model="user.userName" class="form-control input-sm"
                                                        name="uesrName" ng-blur="checkUserName(user.userName)" required
                                                       ></div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <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>
         </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.userIdcode"
+            <label class="col-md-3 col-sm-3 col text-right">身份证号：</label>
+            <div class="col-md-8 col-sm-8 col">
+                <input ng-model="user.userIdcode" maxlength="18"
                        class="form-control input-sm" name="userIdcode" ng-blur="checkUserIdcode(user.userIdcode)" required>
                 <!-- <div>密码复杂度</div> -->
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed1" class="fa fa-close" style="color:#CC3333;"></i>
             </div>
+            <!--<div style="display:block;" ng-show="checkFailed1">请输入18位的身份证号</div>-->
         </div>
-        <div class="row">
-            <label class="col-md-6 col-sm-6 col text-right">请上传一张本人手持身份证照片：</label>
-            <br>
+        <div class="upload-area">
+            <div class="area-header">请上传一张本人手持身份证照片：</div>
             <input type="hidden" name="idImgUrl" ng-model="user.idImgUrl"/>
-            <div style="width:100px;height: 100px;"  image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadID($data)"></div>
-            <span class="help-block font-size-12 text-inverse">建议图片大小在3M以内，支持图片格式jpg、png、gif</span>
+            <div  image-upload data-src="static/img/vendor/images/upload.png" on-success="onUploadID($data)"></div>
+            <!--<span class="help-block font-size-12 text-inverse">建议图片大小在3M以内，支持图片格式jpg、png、gif</span>-->
             </div>
             <div class="col-md-4 col-sm-4 col">
                 <i ng-show="checkSuccess2" class="fa fa-check" style="color:#339933"></i>
@@ -49,7 +103,7 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="!checkSuccess || !checkSuccess1 || !checkSuccess2" type="submit">确认修改</button>
-        <button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+        <button ng-click="cancel()" type="button">取消</button>
+        <button ng-disabled="!checkSuccess || !checkSuccess1 || !checkSuccess2" type="submit">确定</button>
     </div>
 </form>

src/main/webapp/resources/view/vendor/modal/updateUserEmail.html

@@ -3,52 +3,114 @@
         line-height: 34px;
         font-size: 14px;
     }
+    .modal-content {
+        width: 409px;
+    }
+    .modal-header {
+        background: #5078cb;
+        text-align: center;
+    }
+    .modal-header p {
+        color: #fff;
+    }
+    .userEmail .modal-body .row >label {
+        padding: 0;
+    }
+    .userEmail .modal-body .row .col-md-8 {
+        padding-left: 0;
+    }
+    .userEmail .modal-body .row .col-md-8 input {
+        border-radius: 0;
+    }
+    .userEmail .modal-body .row.validate-code .col-md-8 .input-sm {
+        width: 162px;
+        display: inline-block;
+    }
+    .userEmail .modal-body .row.validate-code .col-md-8 .code-btn {
+        width: 94px;
+        height: 30px;
+        text-align: center;
+        line-height: 30px;
+        vertical-align: middle;
+        display: inline-block;
+        margin-left: -4px;
+        border-left: none;
+        border-right: 1px solid rgb( 204, 204, 204 );
+        border-bottom: 1px solid rgb( 204, 204, 204 );
+        border-top: 1px solid rgb( 204, 204, 204 );
+        background: rgb( 227, 227, 227 );
+    }
+    .userEmail .modal-body .row.validate-code .col-md-8 .code-btn[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button {
+        width: 90px;
+        height: 28px;
+        border: 1px solid #5078cb;
+        line-height: 28px;
+        text-align: center;
+    }
+    .modal-footer >button[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button:first-child {
+        background: #fff;
+        color: #5078cb;
+        margin-right: 10px;
+    }
+    .modal-footer {
+        text-align: center;
+        border: none;
+    }
+    .modal-footer >button:last-child {
+        background: #5078cb;
+        color: #fff;
+    }
 </style>
 <div class="modal-header">
-    <h3 class="f14 modal-title"><i class="fa fa-lock fa-fw"></i>修改邮箱</h3>
+    <img src="static/img/user/images/valid-email.png" alt="">
+    <p>邮箱验证</p>
 </div>
 <form class="userEmail" name="sampleSendForm" ng-submit="ok()">
     <input type="hidden" ng-model="pageToken"/>
     <div class="modal-body">
         <div class="row">
-            <label class="col-md-4 col-sm-4 col text-right">用户：</label>
-            <div class="col-md-4 col-sm-4 col">{{::user.userTel}} - {{::user.userName}}</div>
+            <label class="col-md-3 col-sm-3 col text-right">用户：</label>
+            <div class="col-md-8 col-sm-8 col">{{::user.userTel}} - {{::user.userName}}</div>
         </div>
         <div class="row line" 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.userEmail" class="form-control input-sm"
+            <label class="col-md-3 col-sm-3 col text-right">原邮箱地址：</label>
+            <div class="col-md-8 col-sm-8 col"><input ng-model="user.userEmail" class="form-control input-sm"
                                                       type="userEmail" ng-blur="checkUserEmail(user.userEmail)" required
                                                       placeholder="当前邮箱地址"></div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <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>
         </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">
+            <label class="col-md-3 col-sm-3 col text-right">新邮箱地址：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="user.newUserEmail"
                        class="form-control input-sm" ng-pattern="/^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/" type="newUserEmail" required ng-blur="emailEnable(user.newUserEmail)" placeholder="新邮箱地址">
                 <!-- <div>密码复杂度</div> -->
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed1" 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">
+        <div class="row validate-code">
+            <label class="col-md-3 col-sm-3 col text-right">验证码：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="checkCode"
                        class="form-control input-sm" ng-disabled="!codeSuccess" type="checkCode" ng-blur="validCheckCode(checkCode)" required>
-            </div>
-            <div class="col-md-4 col-sm-4 col">
-                <input ng-click="sendCheckCode(user.newUserEmail)" ng-disabled="!sendSuccess" ng-init="paracont='获取验证码'" class="btn btn-primary" ng-model="paracont"/>
+                <input ng-click="sendCheckCode(user.newUserEmail)" ng-disabled="!sendSuccess" ng-init="paracont='获取验证码'" class="code-btn" ng-model="paracont"/>
             </div>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="!validSuccess || !checkSuccess || !checkSuccess1" type="submit">确认修改</button>
-        <button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+        <button ng-click="cancel()" type="button">取消</button>
+        <button ng-disabled="!validSuccess || !checkSuccess || !checkSuccess1" type="submit">确定</button>
     </div>
 </form>

src/main/webapp/resources/view/vendor/modal/updateUserPay.html

@@ -3,49 +3,92 @@
         line-height: 34px;
         font-size: 14px;
     }
+    .modal-content {
+        width: 409px;
+    }
+    .modal-header {
+        background: #5078cb;
+        text-align: center;
+    }
+    .modal-header p {
+        color: #fff;
+    }
+    .userPay .modal-body .row >label {
+        padding: 0;
+    }
+    .userPay .modal-body .row .col-md-8 {
+        padding-left: 0;
+    }
+    .userPay .modal-body .row .col-md-8 input {
+        border-radius: 0;
+    }
+    .modal-footer >button {
+        width: 90px;
+        height: 28px;
+        border: 1px solid #5078cb;
+        line-height: 28px;
+        text-align: center;
+    }
+    .modal-footer >button[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button:first-child {
+        background: #fff;
+        color: #5078cb;
+        margin-right: 10px;
+    }
+    .modal-footer {
+        text-align: center;
+        border: none;
+    }
+    .modal-footer >button:last-child {
+        background: #5078cb;
+        color: #fff;
+    }
 </style>
 <div class="modal-header">
-    <h3 class="f14 modal-title"><i class="fa fa-lock fa-fw"></i>支付密码</h3>
+    <img src="static/img/user/images/update-pay.png" alt="">
+    <p>支付密码</p>
 </div>
 <form class="userPay" name="sampleSendForm" ng-submit="ok()" ng-init="checkHaveUserPay()">
     <div class="modal-body">
         <div class="row line oldUserPay">
-            <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.userPay" class="form-control input-sm"
+            <label class="col-md-3 col-sm-3 col text-right">原密码：</label>
+            <div class="col-md-8 col-sm-8 col"><input ng-model="user.userPay" class="form-control input-sm"
                                                       type="password" name="userPay" ng-blur="checkUserPay(user.userPay)" required
                                                       ></div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <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>
         </div>
         <div class="row">
-            <label class="col-md-4 col-sm-4 col text-right" ng-hide="!isNewFailed">新密码：</label>
-            <label class="col-md-4 col-sm-4 col text-right" ng-hide="!isNewSuccess">密码：</label>
-            <div class="col-md-4 col-sm-4 col">
+            <label class="col-md-3 col-sm-3 col text-right" ng-hide="!isNewFailed">新密码：</label>
+            <label class="col-md-3 col-sm-3 col text-right" ng-hide="!isNewSuccess">密码：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="user.newUserPay"
                        class="form-control input-sm" type="password" name="newUserPay" ng-keyup="checkNewUserPay(user.newUserPay)" required>
                 <!-- <div>密码复杂度</div> -->
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed1" 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">
+            <label class="col-md-3 col-sm-3 col text-right">确认密码：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="user.newUserPay1"
                        class="form-control input-sm" name="newUserPay1"  type="password" ng-keyup="checkNewUserPay1()" required>
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess2" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed2" class="fa fa-close" style="color:#CC3333;"></i>
             </div>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="(!checkSuccess && !checkSuccess1 && !checkSuccess2)" type="submit">确认修改</button>
-        <button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+        <button ng-click="cancel()" type="button">取消</button>
+        <button ng-disabled="(!checkSuccess && !checkSuccess1 && !checkSuccess2)" type="submit">确定</button>
     </div>
 </form>

src/main/webapp/resources/view/vendor/modal/updateUserQuestion.html

@@ -3,16 +3,59 @@
         line-height: 34px;
         font-size: 14px;
     }
+    .modal-content {
+        width: 409px;
+    }
+    .modal-header {
+        background: #5078cb;
+        text-align: center;
+    }
+    .modal-header p {
+        color: #fff;
+    }
+    .userQuestion .modal-body .row >label {
+        padding: 0;
+    }
+    .userQuestion .modal-body .row .col-md-8 {
+        padding-left: 0;
+    }
+    .userQuestion .modal-body .row .col-md-8 input {
+        border-radius: 0;
+    }
+    .modal-footer >button {
+        width: 90px;
+        height: 28px;
+        border: 1px solid #5078cb;
+        line-height: 28px;
+        text-align: center;
+    }
+    .modal-footer >button[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button:first-child {
+        background: #fff;
+        color: #5078cb;
+        margin-right: 10px;
+    }
+    .modal-footer {
+        text-align: center;
+        border: none;
+    }
+    .modal-footer >button:last-child {
+        background: #5078cb;
+        color: #fff;
+    }
 </style>
 <div class="modal-header">
-    <h3 class="f14 modal-title"><i class="fa fa-lock fa-fw"></i>密保问题</h3>
+    <img src="static/img/user/images/pass-question.png" alt="">
+    <p>密保问题</p>
 </div>
 <form class="userQuestion" name="sampleSendForm" ng-submit="ok()">
     <div class="modal-body">
         <div class="row line">
             <input type="hidden" name="sort" ng-model="uq[0].sort" ng-init="uq[0].sort=1"/>
-            <label class="col-md-4 col-sm-4 col text-right">问题1：</label>
-            <div class="col-md-4 col-sm-4 col">
+            <label class="col-md-3 col-sm-3 col text-right">问题1：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="uq[0].id" type="hidden"/>
                 <!--
                 <input ng-model="uq[0].question" class="form-control input-sm" name="uq[0].question" required>
@@ -22,26 +65,26 @@
                     <option value="{{info.question}}">{{info.question}}</option>
                 </select>
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <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>
         </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">
+            <label class="col-md-3 col-sm-3 col text-right">答案：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="uq[0].answer" ng-blur="inputAnswer()"  class="form-control input-sm" name="uq[0].answer" required>
                 <!-- <div>密码复杂度</div> -->
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed1" class="fa fa-close" style="color:#CC3333;"></i>
             </div>
         </div>
         <div class="row">
             <input type="hidden" name="sort" ng-model="uq[1].sort" ng-init="uq[1].sort=2"/>
-            <label class="col-md-4 col-sm-4 col text-right">问题2：</label>
-            <div class="col-md-4 col-sm-4 col">
+            <label class="col-md-3 col-sm-3 col text-right">问题2：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="uq[1].id" type="hidden"/>
                 <!--
                 <input ng-model="uq[1].question"  class="form-control input-sm" name="uq[1].question" required>
@@ -51,25 +94,25 @@
                     <option value="{{info.question}}">{{info.question}}</option>
                 </select>
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess2" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed2" 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">
+            <label class="col-md-3 col-sm-3 col text-right">答案：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input  ng-model="uq[1].answer" ng-blur="inputAnswer1()" class="form-control input-sm" name="uq[1].answer" required>
                 <!-- <div>密码复杂度</div> -->
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <i ng-show="checkSuccess3" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed3" class="fa fa-close" style="color:#CC3333;"></i>
             </div>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="!checkSuccess || !checkSuccess1 || !checkSuccess2 || !checkSuccess3" type="submit">确认修改</button>
-        <button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+        <button ng-click="cancel()" type="button">取消</button>
+        <button ng-disabled="!checkSuccess || !checkSuccess1 || !checkSuccess2 || !checkSuccess3" type="submit">确定</button>
     </div>
 </form>

src/main/webapp/resources/view/vendor/modal/updateUserTel.html

@@ -3,50 +3,112 @@
         line-height: 34px;
         font-size: 14px;
     }
+    .modal-content {
+        width: 409px;
+    }
+    .modal-header {
+        background: #5078cb;
+        text-align: center;
+    }
+    .modal-header p {
+        color: #fff;
+    }
+    .userTel .modal-body .row >label {
+        padding: 0;
+    }
+    .userTel .modal-body .row .col-md-8 {
+        padding-left: 0;
+    }
+    .userTel .modal-body .row .col-md-8 input {
+        border-radius: 0;
+    }
+    .userTel .modal-body .row.validate-code .col-md-8 .input-sm {
+        width: 162px;
+        display: inline-block;
+    }
+    .userTel .modal-body .row.validate-code .col-md-8 .code-btn {
+        width: 94px;
+        height: 30px;
+        text-align: center;
+        line-height: 30px;
+        vertical-align: middle;
+        display: inline-block;
+        margin-left: -4px;
+        border-left: none;
+        border-right: 1px solid rgb( 204, 204, 204 );
+        border-bottom: 1px solid rgb( 204, 204, 204 );
+        border-top: 1px solid rgb( 204, 204, 204 );
+        background: rgb( 227, 227, 227 );
+    }
+    .userTel .modal-body .row.validate-code .col-md-8 .code-btn[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button {
+        width: 90px;
+        height: 28px;
+        border: 1px solid #5078cb;
+        line-height: 28px;
+        text-align: center;
+    }
+    .modal-footer >button[disabled] {
+        cursor: not-allowed;
+    }
+    .modal-footer >button:first-child {
+        background: #fff;
+        color: #5078cb;
+        margin-right: 10px;
+    }
+    .modal-footer {
+        text-align: center;
+        border: none;
+    }
+    .modal-footer >button:last-child {
+        background: #5078cb;
+        color: #fff;
+    }
 </style>
 <div class="modal-header">
-    <h3 class="f14 modal-title"><i class="fa fa-lock fa-fw"></i>手机验证</h3>
+    <img src="static/img/user/images/phonecheck.png" alt="">
+    <p>手机验证</p>
 </div>
 <form class="userTel" name="sampleSendForm" ng-submit="ok()">
     <input type="hidden" ng-model="pageToken"/>
     <div class="modal-body">
         <div class="row line" 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.userTel" class="form-control input-sm"
+            <label class="col-md-3 col-sm-3 col text-right">原手机号：</label>
+            <div class="col-md-8 col-sm-8 col"><input ng-model="user.userTel" class="form-control input-sm"
                                                       type="userTel"  ng-blur="checkUserTel(user.userTel)" required
                                                       ></div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="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>
         </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">
+            <label class="col-md-3 col-sm-3 col text-right">新手机号：</label>
+            <div class="col-md-8 col-sm-8 col">
                 <input ng-model="user.newUserTel"
                        class="form-control input-sm" type="newUserTel" required ng-blur="telEnable(user.newUserTel)">
                 <!-- <div>密码复杂度</div> -->
             </div>
-            <div class="col-md-4 col-sm-4 col">
+            <div class="col">
                 <span ng-show="checking1">验证手机号...</span>
                 <i ng-show="checkSuccess1" class="fa fa-check" style="color:#339933"></i>
                 <i ng-show="checkFailed1" 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">
+        <div class="row validate-code">
+            <label class="col-md-3 col-sm-3 col text-right">验证码：</label>
+            <span class="col-md-8 col-sm-8 col">
                 <input ng-model="telCheckCode"
                        class="form-control input-sm" ng-disabled="!codeSuccess" type="telCheckCode" ng-blur="validTelCheckCode(telCheckCode)" required>
-            </div>
-            <div class="col-md-4 col-sm-4 col">
-                <input ng-click="sendTelCheckCode(user.newUserTel)" ng-disabled="!sendSuccess" ng-init="paracont='获取验证码'" class="btn btn-primary" ng-model="paracont"/>
-            </div>
+                <input class="code-btn" ng-click="sendTelCheckCode(user.newUserTel)" ng-init="paracont='获取验证码'" ng-disabled="!sendSuccess" ng-model="paracont" />
+            </span>
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-primary" ng-disabled="!validSuccess || !checkSuccess || !checkSuccess1" type="submit">确认修改</button>
-        <button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+        <button ng-click="cancel()" type="button">取消</button>
+        <button ng-disabled="!validSuccess || !checkSuccess || !checkSuccess1" type="submit">确定</button>
     </div>
 </form>