Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -881,8 +881,8 @@ define(['app/app'], function (app) {
           //校验验证码
           $scope.validCheckCode = function (checkCode) {
             if(!checkCode){
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
+              // $scope.checkSuccess2 = false;
+              $scope.checkFailed2 = false;
                 return false;
             }
             User.validCheckCode({checkCode: checkCode,newUserEmail:$scope.user.newUserEmail}, function (data) {
@@ -1051,8 +1051,8 @@ define(['app/app'], function (app) {
           //校验验证码
           $scope.validTelCheckCode = function (telCheckCode) {
             if(!telCheckCode){
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
+              // $scope.checkSuccess2 = false;
+              $scope.checkFailed2 = false;
               return false;
             }
             User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -821,7 +821,7 @@ define(['app/app'], function(app) {
           $scope.validCheckCode = function (checkCode) {
             if(!checkCode){
               // $scope.checkSuccess2 = false;
-              // $scope.checkFailed2 = true;
+              $scope.checkFailed2 = false;
               return false;
             }
             User.validCheckCode({checkCode: checkCode,newUserEmail:$scope.user.newUserEmail}, function (data) {
@@ -991,7 +991,7 @@ define(['app/app'], function(app) {
           $scope.validTelCheckCode = function (telCheckCode) {
             if(!telCheckCode){
               // $scope.checkSuccess2 = false;
-              // $scope.checkFailed2 = true;
+              $scope.checkFailed2 = false;
               return false;
             }
             User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},

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

@@ -299,7 +299,7 @@
 					<a ng-switch-when="1">审核通过</a>
 					<a ng-switch-when="2">待审核</a>
 			</li>
-			<li>
+			<!--<li>
 				<span>
 					<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>
@@ -308,7 +308,7 @@
 				</span>
 				<a ng-hide="userInfo.havePayPwd" ng-click="updateUserPay()" class="mall-btn-default">立即设置</a>
 				<a ng-show="userInfo.havePayPwd" ng-click="updateUserPay()">修改</a>
-			</li>
+			</li>-->
 		</ul>
 	</div>
 

src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -678,7 +678,7 @@
           <a ng-switch-when="1">审核通过</a>
           <a ng-switch-when="2">待审核</a>
         </li>
-        <li>
+       <!-- <li>
 				<span>
 					<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>
@@ -687,7 +687,7 @@
 				</span>
           <a ng-hide="userInfo.havePayPwd" ng-click="updateUserPay()" class="mall-btn-default">立即设置</a>
           <a ng-show="userInfo.havePayPwd" ng-click="updateUserPay()">修改</a>
-        </li>
+        </li>-->
       </ul>
     </div>
     <!--权限管理-->

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

@@ -50,6 +50,8 @@
         background: #5078cb;
         color: #fff;
         cursor: pointer;
+        float: right;
+        margin-top: 3px;
     }
     .userEmail .modal-body .row.validate-code .col-md-8 .code-btn[disabled] {
         cursor: not-allowed;

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

@@ -50,6 +50,8 @@
         background: #5078cb;
         color: #fff;
         cursor: pointer;
+        float: right;
+        margin-top: 3px;
     }
     .userTel .modal-body .row.validate-code .col-md-8 .code-btn[disabled] {
         cursor: not-allowed;