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

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

@@ -51,10 +51,15 @@
 		margin-top: 12px;
 	}
 	.count01 ul li span h5 img {
-		margin-top: 24px;
+		margin-top: 20px;
+		margin-left: 0;
+	}
+	.count01 ul li span h5 img.ok-icon {
+		margin-top: 25px;
 	}
 	.count01 ul li span>span {
 		color: #666;
+		margin-left: 0;
 	}
 	.count01 ul li >a {
 		background: #fff;
@@ -81,6 +86,8 @@
 		margin-left: 0px;
 		font-size: 12px;
 		text-align: center;
+		position: relative;
+		bottom: 1px;
 	}
 	.count01 ul li.safe-level>span >span:nth-child(3) {
 		background: rgb(255,171,44);
@@ -89,6 +96,21 @@
 		margin-left: 13px;
 		color: #666;
 	}
+	.count01 ul li.safe-level .last-login {
+		float: right;
+		font-size: 12px;
+		color: #666;
+		margin-right: 7px;
+	}
+	.count01 ul li span font {
+		font-size: 14px;
+		color: #333;
+		letter-spacing: 0;
+		margin-right: 0;
+	}
+	.count01 ul li span h5 {
+		width: 30px;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="account_manager">
@@ -159,20 +181,21 @@
 		<div class="rt_menu"><span>您的安全服务</span></div>
 		<ul>
 			<li class="safe-level">
-				<span>安全等级
+				<span>安全等级：
 					<span ng-if="userInfo.secLevel>=1">弱</span>
 					<span ng-if="userInfo.secLevel>=3">中</span>
 					<span ng-if="userInfo.secLevel>4">强</span>
 					<!--<i>中</i>-->
 					<!--完成<a href="javascript:void(0)"> 密保设置</a>，提升账户安全。-->
 				</span>
+				<div class="last-login">上次登录时间：<span>2017-10-10&nbsp;&nbsp;14：08：44</span></div>
 			</li>
 			<li ng-switch="userInfo.idEnable">
 				<span>
-					<h5 ng-switch-when="1"><img src="static/img/user/images/ok.png"/></h5>
+					<h5 ng-switch-when="1"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-switch-when="0"><img src="static/img/user/images/safe.png"/></h5>
 					<h5 ng-switch-when="2"><img src="static/img/user/images/safe.png"/></h5>
-					<font>实名认证</font>
+					<font>实名认证：</font>
 					<span>实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
 				</span>
 					<a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即设置</a>
@@ -181,35 +204,35 @@
 			</li>
 			<li>
 				<span>
-					<h5 ng-show="userInfo.pwdEnable"><img src="static/img/user/images/ok.png"/></h5>
+					<h5 ng-show="userInfo.pwdEnable"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.pwdEnable"><img src="static/img/user/images/safe.png"/></h5>
-					<font>登录密码</font>
+					<font>登录密码：</font>
 					<span>安全性高的密码可以使账号更安全，建议您定期更换密码，并且设置一个包含数字和字母，长度超过8位以上的密码。</span>
 				</span>
 				<a ng-click="updatePassword()">修改</a>
 			</li>
 			<li>
 				<span>
-					<h5 ng-show="userInfo.haveUserQuestion"><img src="static/img/user/images/ok.png"/></h5>
+					<h5 ng-show="userInfo.haveUserQuestion"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.haveUserQuestion"><img src="static/img/user/images/safe.png"/></h5>
-					<font>密保问题</font>
+					<font>密保问题：</font>
 					<span>是您找回登录密码的方式之一。建议您设置一个容易记住，且最不容易被他人获取的问题及答案，更有效保障您的密...</span>
 				</span>
 				<a ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
 			</li>
 			<li>
 				<span>
-					<h5><img src="static/img/user/images/ok.png"/></h5>
-					<font>手机验证</font>
+					<h5><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
+					<font>手机验证：</font>
 					<span>绑定手机后，您即可享受淘宝丰富的手机服务，如手机找回密码等。</span>
 				</span>
 				<a ng-click="updateUserTel()">修改</a>
 			</li>
 			<li>
 				<span>
-					<h5 ng-show="userInfo.userEmail==null?false:true"><img src="static/img/user/images/ok.png"/></h5>
+					<h5 ng-show="userInfo.userEmail==null?false:true"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.userEmail==null?false:true"><img src="static/img/user/images/safe.png"/></h5>
-					<font>邮箱认证</font>
+					<font>邮箱认证：</font>
 					<span>您当前的邮箱：529010777@qq.com</span>
 				</span>
 				<a ng-show="userInfo.userEmail==null?false:true" ng-click="updateUserEmail()">修改</a>
@@ -217,9 +240,9 @@
 			</li>
 			<li>
 				<span>
-					<h5 ng-show="userInfo.havePayPwd"><img src="static/img/user/images/ok.png"/></h5>
+					<h5 ng-show="userInfo.havePayPwd"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.havePayPwd"><img src="static/img/user/images/safe.png"/></h5>
-					<font>支付密码</font>
+					<font>支付密码：</font>
 					<span>在使用账户中余额或确认收货时，需输入支付密码。</span>
 				</span>
 				<a ng-hide="userInfo.havePayPwd" ng-click="updateUserPay()" class="mall-btn-default">立即设置</a>

src/main/webapp/resources/view/usercenter/modal/homeCenter_modal.html

@@ -1,8 +1,50 @@
-<div style="height:200px;">
-    你的账户等级过低，请<a ng-hide="userInfo.pwdEnable" ng-click="goLink('pwd')">修改密码</a>
-    <div ng-hide="userInfo.haveUserQuestion && userInfo.userEmail==null?false:true" >
-        ,<a ng-click="goLink('question')">设置密保问题</a>
-        或
-        <a ng-click="goLink('email')">绑定邮箱</a></div>
-
+<style>
+    .modal-content {
+        width: 409px;
+    }
+    .modal-header {
+        background: #5078cb;
+        text-align: center;
+    }
+    .modal-header p {
+        color: #fff;
+    }
+    .modal-body {
+        height: 145px;
+        color: #666;
+        font-size: 14px;
+        padding: 27px 20px;
+        line-height: 20px;
+    }
+    .modal-body a {
+        color: #e83825;
+    }
+    .modal-body .mall-btn-default {
+        height: 28px;
+        line-height: 28px;
+        width: 140px;
+        display: block;
+        text-align: center;
+        margin: 0 auto;
+        background: #5078cb;
+        color: #fff;
+        cursor: pointer;
+        font-size: 14px;
+        margin-top: 25px;
+    }
+</style>
+<div>
+    <div class="modal-header">
+        <img src="static/img/user/images/safeSetting.png" alt="">
+        <p>安全设置</p>
+    </div>
+    <div class="modal-body">
+        你的账户的安全等级过低，请<a ng-hide="userInfo.pwdEnable" ng-click="goLink('pwd')">修改密码</a>
+        <span ng-hide="userInfo.haveUserQuestion && userInfo.userEmail==null?false:true" >
+            ,<a ng-click="goLink('question')">设置密保问题</a>
+            或
+            <a ng-click="goLink('email')">绑定邮箱</a>
+        </span>来保障您的账户安全！
+        <a class="mall-btn-default">立即前往</a>
+    </div>
 </div>

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

@@ -2,6 +2,7 @@
 	.password .modal-body .row{
 		line-height: 34px;
 		font-size: 14px;
+		color: #666;
 	}
 	.modal-content {
 		width: 409px;
@@ -18,6 +19,7 @@
 	}
 	.password .modal-body .row .col-md-8 {
 		padding-left: 0;
+		position: relative;
 	}
 	.password .modal-body .row .col-md-8 input {
 		border-radius: 0;
@@ -40,11 +42,48 @@
 	.modal-footer {
 		text-align: center;
 		border: none;
+		padding: 0 0 25px 0;
 	}
 	.modal-footer >button:last-child {
 		background: #5078cb;
 		color: #fff;
 	}
+	.warn-style {
+		color: #cc0000;
+		font-size: 14px;
+		margin-left: 85px;
+		margin-bottom: 10px;
+	}
+	.password .modal-body .row .col-md-8 img {
+		position: absolute;
+		right: 20px;
+		top: 8px;
+	}
+	.password .safe-level {
+		color: #666;
+		display: inline-block;
+		font-size: 12px;
+	}
+	.password .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;
+		position: relative;
+		bottom: 1px;
+	}
+	.password .safe-level >span >span:nth-child(1) {
+		margin-left: 1px;
+	}
+	.password .safe-level >span >span:nth-child(3) {
+		background: rgb(255,171,44);
+	}
 </style>
 <div class="modal-header">
 	<img src="static/img/user/images/update-password.png" alt="">
@@ -60,35 +99,48 @@
 		-->
 		<div class="row line">
 			<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-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="当前密码">
+				<img src="static/img/user/images/keyboard.png" alt="">
+			</div>
 			<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>
+				<img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
+				<!--<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}">
+		<div class="row new-password" 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-blur="checkNewPassword(user.newPassword)" class="form-control input-sm" type="password" required  placeholder="8~20位字母、数字、符号">
 				<!-- <div>密码复杂度</div> -->
+				<img src="static/img/user/images/keyboard.png" alt="">
 			</div>
 			<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>
+				<img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+				<!--<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 class="safe-level">安全等级：
+				<span>
+					<span>弱</span><span>中</span><span>强</span>
+				</span>
 			</div>
-			<div style="display:block;color:red;" ng-show="checkFailed1">密码为8-20字符的英文、数字混合密码</div>
 		</div>
+		<div class="warn-style" ng-show="checkFailed1">密码为8-20字符的英文、数字混合密码</div>
 		<div class="row line">
 			<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-blur="checkNewPassword1(user.newPassword1)" class="form-control input-sm" type="password" required placeholder="重复新密码">
+				<img src="static/img/user/images/keyboard.png" alt="">
 			</div>
 			<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>
+				<img ng-show="checkSuccess2" src="static/img/user/images/input-check-yes.png" alt="">
+				<!--<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 style="display:block;color:red;" ng-show="checkFailed2">两次输入的密码不一致</div>
 		</div>
+		<div class="warn-style" ng-show="checkFailed2">两次输入的密码不一致</div>
 	</div>
 	<div class="modal-footer">
 		<button ng-click="cancel()" type="button">取消</button>

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

@@ -12,6 +12,7 @@
     .realAuth .modal-body .row {
         line-height: 34px;
         font-size: 14px;
+        color: #666;
     }
     .realAuth .modal-body .row >label {
         padding: 0;
@@ -30,7 +31,7 @@
     .realAuth .modal-body .upload-area .preview {
         width: auto;
         height: auto;
-        margin: 19px 0;
+        margin: 19px 0 0 0;
     }
     .realAuth .modal-body .upload-area .preview .previewImage {
         width: 117px;
@@ -55,11 +56,18 @@
     .modal-footer {
         text-align: center;
         border: none;
+        padding-top: 0;
+        padding-bottom: 25px;
     }
     .modal-footer >button:last-child {
         background: #5078cb;
         color: #fff;
     }
+    .warn-style {
+        color: #cc0000;
+        font-size: 14px;
+        margin-left: 85px;
+    }
 </style>
 <div class="modal-header">
     <img src="static/img/user/images/realAuth.png" alt="">
@@ -73,8 +81,9 @@
                                                        name="uesrName" ng-blur="checkUserName(user.userName)" required
                                                       ></div>
             <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>
+                <img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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">
@@ -85,11 +94,12 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <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>
+                <img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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;color:red;" ng-show="checkFailed1">请输入18位的身份证号</div>
         </div>
+        <div class="warn-style" ng-show="checkFailed1">请输入18位的身份证号</div>
         <div class="upload-area">
             <div class="area-header">请上传一张本人手持身份证照片：</div>
             <input type="hidden" name="idImgUrl" ng-model="user.idImgUrl"/>

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

@@ -2,6 +2,7 @@
     .userEmail .modal-body .row {
         line-height: 34px;
         font-size: 14px;
+        color: #666
     }
     .modal-content {
         width: 409px;
@@ -61,11 +62,18 @@
     .modal-footer {
         text-align: center;
         border: none;
+        padding: 0 0 25px 0;
     }
     .modal-footer >button:last-child {
         background: #5078cb;
         color: #fff;
     }
+    .userEmail .warn-style {
+        color: #cc0000;
+        font-size: 14px;
+        margin-left: 85px;
+        margin-bottom: 10px;
+    }
 </style>
 <div class="modal-header">
     <img src="static/img/user/images/valid-email.png" alt="">
@@ -86,8 +94,9 @@
                                                       type="userEmail" ng-blur="checkUserEmail(user.userEmail)" required
                                                       placeholder="当前邮箱地址"></div>
             <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>
+                <img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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">
@@ -98,10 +107,12 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <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>
+                <img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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="warn-style">请输入正确的邮箱</div>
         <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">
@@ -110,6 +121,7 @@
                 <input ng-click="sendCheckCode(user.newUserEmail)" ng-disabled="!sendSuccess" ng-init="paracont='获取验证码'" class="code-btn" ng-model="paracont"/>
             </div>
         </div>
+        <div class="warn-style">验证码错误</div>
     </div>
     <div class="modal-footer">
         <button ng-click="cancel()" type="button">取消</button>

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

@@ -2,6 +2,7 @@
     .userPay .modal-body .row {
         line-height: 34px;
         font-size: 14px;
+        color: #666;
     }
     .modal-content {
         width: 409px;
@@ -40,11 +41,23 @@
     .modal-footer {
         text-align: center;
         border: none;
+        padding: 0 0 25px 0;
     }
     .modal-footer >button:last-child {
         background: #5078cb;
         color: #fff;
     }
+    .userPay .warn-style {
+        color: #cc0000;
+        font-size: 14px;
+        margin-left: 85px;
+        margin-bottom: 10px;
+    }
+    .userPay .modal-body .row .col-md-8 img {
+        position: absolute;
+        right: 20px;
+        top: 8px;
+    }
 </style>
 <div class="modal-header">
     <img src="static/img/user/images/update-pay.png" alt="">
@@ -54,38 +67,48 @@
     <div class="modal-body">
         <div class="row line oldUserPay">
             <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-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>
+                <img src="static/img/user/images/keyboard.png" alt="">
+            </div>
             <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>
+                <img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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="warn-style">密码为6位数字</div>
         <div class="row">
             <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>
+                <img src="static/img/user/images/keyboard.png" alt="">
                 <!-- <div>密码复杂度</div> -->
             </div>
             <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>
+                <img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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="warn-style">密码为6位数字</div>
         <div class="row">
             <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>
+                <img src="static/img/user/images/keyboard.png" alt="">
             </div>
             <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>
+                <img ng-show="checkSuccess2" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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="warn-style">两次输入的密码不一致</div>
     </div>
     <div class="modal-footer">
         <button ng-click="cancel()" type="button">取消</button>

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

@@ -2,6 +2,7 @@
     .userQuestion .modal-body .row {
         line-height: 34px;
         font-size: 14px;
+        color: #666
     }
     .modal-content {
         width: 409px;
@@ -19,9 +20,13 @@
     .userQuestion .modal-body .row .col-md-8 {
         padding-left: 0;
     }
-    .userQuestion .modal-body .row .col-md-8 input {
+    .userQuestion .modal-body .row .col-md-8 input, .userQuestion .modal-body .row .col-md-8 select {
         border-radius: 0;
     }
+    .userQuestion .modal-body .row .col-md-8 select {
+        background: url(static/img/user/images/select-arrow.png) no-repeat;
+        background-position: 97% 50%;
+    }
     .modal-footer >button {
         width: 90px;
         height: 28px;
@@ -40,11 +45,19 @@
     .modal-footer {
         text-align: center;
         border: none;
+        padding-top: 0;
+        padding-bottom: 25px;
     }
     .modal-footer >button:last-child {
         background: #5078cb;
         color: #fff;
     }
+    .userQuestion .warn-style {
+        color: #cc0000;
+        font-size: 14px;
+        margin-left: 85px;
+        margin-bottom: 10px;
+    }
 </style>
 <div class="modal-header">
     <img src="static/img/user/images/pass-question.png" alt="">
@@ -66,8 +79,9 @@
                 </select>
             </div>
             <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>
+                <img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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">
@@ -77,12 +91,13 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <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>
+                <img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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;color:red;" ng-show="checkFailed1">请输入您想要设置的答案</div>
-            <div style="display:block;color:red;" ng-show="checkFailed1_1">请勿超过30个字符</div>
         </div>
+        <div class="warn-style" ng-show="checkFailed1">请输入您想要设置的答案</div>
+        <div class="warn-style" ng-show="checkFailed1_1">请勿超过30个字符</div>
         <div class="row">
             <input type="hidden" name="sort" ng-model="uq[1].sort" ng-init="uq[1].sort=2"/>
             <label class="col-md-3 col-sm-3 col text-right">问题2：</label>
@@ -97,8 +112,9 @@
                 </select>
             </div>
             <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>
+                <img ng-show="checkSuccess2" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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">
@@ -108,12 +124,13 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <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>
+                <img ng-show="checkSuccess3" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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 style="display:block;color:red;" ng-show="checkFailed3">请输入您想要设置的答案</div>
-            <div style="display:block;color:red;" ng-show="checkFailed3_1">请勿超过30个字符</div>
         </div>
+        <div class="warn-style" ng-show="checkFailed3">请输入您想要设置的答案</div>
+        <div class="warn-style" ng-show="checkFailed3_1">请勿超过30个字符</div>
     </div>
     <div class="modal-footer">
         <button ng-click="cancel()" type="button">取消</button>

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

@@ -2,6 +2,7 @@
     .userTel .modal-body .row {
         line-height: 34px;
         font-size: 14px;
+        color: #666
     }
     .modal-content {
         width: 409px;
@@ -61,11 +62,18 @@
     .modal-footer {
         text-align: center;
         border: none;
+        padding: 0 0 25px 0;
     }
     .modal-footer >button:last-child {
         background: #5078cb;
         color: #fff;
     }
+    .userTel .warn-style {
+        color: #cc0000;
+        font-size: 14px;
+        margin-left: 85px;
+        margin-bottom: 10px;
+    }
 </style>
 <div class="modal-header">
     <img src="static/img/user/images/phonecheck.png" alt="">
@@ -80,8 +88,9 @@
                                                       type="userTel"  ng-blur="checkUserTel(user.userTel)" required
                                                       ></div>
             <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>
+                <img ng-show="checkSuccess" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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">
@@ -92,11 +101,12 @@
                 <!-- <div>密码复杂度</div> -->
             </div>
             <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>
+                <img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
+                <!--<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;color:red;" ng-show="checkFailed1">手机号为8-11位数字</div>
         </div>
+        <div class="warn-style" ng-show="checkFailed1">手机号为8-11位数字</div>
         <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">
@@ -105,8 +115,8 @@
                 <input class="code-btn" ng-click="sendTelCheckCode(user.newUserTel)" ng-init="paracont='获取验证码'" ng-disabled="!sendSuccess" ng-model="paracont" />
             </span>
         </div>
-        <div style="display:block;color:red;" ng-show="validSuccess">验证码错误</div>
     </div>
+    <div class="warn-style" ng-show="validSuccess">验证码错误</div>
     <div class="modal-footer">
         <button ng-click="cancel()" type="button">取消</button>
         <button ng-disabled="!validSuccess || !checkSuccess || !checkSuccess1" type="submit">确定</button>