账户中心前端页面修改

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -96,6 +96,7 @@ public class UserServiceImpl implements UserService {
             u.setUserEmail(email);
         }
         Short emailValidCode = user.getEmailValidCode();
+        u.setEmailValidCode((int) emailValidCode);
         String realName = user.getRealName();
         String idCard = user.getIdCard();
         if (!StringUtils.isEmpty(idCard)) {

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1761,7 +1761,7 @@ define([ 'app/app' ], function(app) {
         toaster.pop("info", "请修改登录密码");
         return;
 			}
-      if (!$scope.userInfo.userEmail) {
+      if (!$scope.userInfo.emailValidCode || $scope.userInfo.emailValidCode != 2) {
         toaster.pop("info", "请绑定邮箱");
         return;
       }

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

@@ -13,11 +13,12 @@ define(['app/app', 'calendar'], function(app) {
             User.isDevOrProd(null, function(data){
                 $scope.isProd = data.data;
                 if ($scope.isProd == 'success') {
-                    var urlPrex = 'https://account.ubtob.com';
+                    var urlPrex = 'https://sso.ubtob.com';
                 } else {
-                    var urlPrex = 'http://113.105.74.135:8001';
+                    var urlPrex = 'http://192.168.253.12:32323';
                 }
-                var url = urlPrex + '/sso/change/userspace?businessCode='+$scope.userInfo.enterprise.enBussinessCode;
+                urlPrex = 'http://192.168.253.118:3001';
+                var url = urlPrex + '/sso/login/change/userspace?spaceUU='+$scope.userInfo.enterprise.uu;
                 $.ajax({
                     url:url,
                     dataType:'jsonp',
@@ -28,7 +29,7 @@ define(['app/app', 'calendar'], function(app) {
                     jsonpCallback:"successCallback",
                     success:function(data){
                         console.log(data);
-                        window.open(urlPrex + '/sso/center?type=apply');
+                        window.open(urlPrex + '/cloudcenter/enterprise');
                     },
                     error:function(data) {
                         console.log(data);

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

@@ -268,16 +268,16 @@
 				<a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
 				<a ng-show="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">修改</a>
 			</li>
-			<li ng-class="{'active-safe-box': !userInfo.userEmail}">
+			<li ng-class="{'active-safe-box': !userInfo.emailValidCode || userInfo.emailValidCode != 2}">
 				<span>
-					<h5 ng-show="userInfo.userEmail"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
-					<h5 ng-hide="userInfo.userEmail"><img src="static/img/user/images/safe.png"/></h5>
+					<h5 ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
+					<h5 ng-show="!userInfo.emailValidCode || userInfo.emailValidCode != 2"><img src="static/img/user/images/safe.png"/></h5>
 					<font>邮箱认证：</font>
-					<span ng-show="userInfo.userEmail"><i ng-modal="userInfo.userEmail" style="color:#666;">{{userInfo.userEmail}}</i></span>
-					<span ng-hide="userInfo.userEmail">绑定邮箱可帮助您找回登录密码，并可订阅获取最新的订单动态、促销信息。</span>
+					<span ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2"><i ng-modal="userInfo.userEmail" style="color:#666;">{{userInfo.userEmail}}</i></span>
+					<span ng-show="!userInfo.emailValidCode || userInfo.emailValidCode != 2">绑定邮箱可帮助您找回登录密码，并可订阅获取最新的订单动态、促销信息。</span>
 				</span>
-				<a ng-show="userInfo.userEmail" ng-click="updateUserEmail()">修改</a>
-				<a ng-hide="userInfo.userEmail" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
+				<a ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2" ng-click="updateUserEmail()">修改</a>
+				<a ng-show="!userInfo.emailValidCode || userInfo.emailValidCode != 2" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
 			</li>
 			<li>
 				<span>
@@ -289,15 +289,17 @@
 			</li>
 			<li ng-switch="userInfo.idEnable">
 				<span>
-					<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>
+					<h5 ng-switch-when="1"><img src="static/img/user/images/safe.png"/></h5>
+					<h5 ng-switch-when="2"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
+                    <h5 ng-switch-when="3"><img src="static/img/user/images/safe.png"/></h5>
 					<font>实名认证：</font>
 					<span>实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
 				</span>
-					<a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即设置</a>
-					<a ng-switch-when="1">审核通过</a>
-					<a ng-switch-when="2">待审核</a>
+				<a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即认证</a>
+				<a ng-switch-when="1">待审核</a>
+				<a ng-switch-when="2">已认证</a>
+				<a ng-switch-when="3" ng-click="updateRealAuth()" class="mall-btn-default">重新认证</a>
 			</li>
 			<!--<li>
 				<span>

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -36,13 +36,13 @@
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
-                <div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail)">
+                <div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>
                     <li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">支付中心</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_invoice">发票管理</a></li>
                 </div>
-                <div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
+                <div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.emailValidCode && userInfo.emailValidCode == 2">
                     <li ng-class="{'active' : active == 'buyer_order'}"><a ng-click="promptUpdate()" class="disabled">订单中心</a></li>
                     <li ng-class="{'active' : active == 'seek_purchase'}"><a  ng-click="promptUpdate()" class="disabled" >我的求购</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a ng-click="promptUpdate()" class="disabled" >支付中心</a></li>

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

@@ -647,16 +647,16 @@
           <a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
           <a ng-show="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">修改</a>
         </li>
-        <li ng-class="{'active-safe-box': !userInfo.userEmail}">
+        <li ng-class="{'active-safe-box': !userInfo.emailValidCode || userInfo.emailValidCode != 2}">
 				<span>
-					<h5 ng-show="userInfo.userEmail"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
-					<h5 ng-hide="userInfo.userEmail"><img src="static/img/user/images/safe.png"/></h5>
+					<h5 ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
+					<h5 ng-show="!userInfo.emailValidCode || userInfo.emailValidCode != 2"><img src="static/img/user/images/safe.png"/></h5>
 					<font>邮箱认证：</font>
-					<span ng-show="userInfo.userEmail"><i ng-modal="userInfo.userEmail" style="color:#666;">{{userInfo.userEmail}}</i></span>
-					<span ng-hide="userInfo.userEmail">绑定邮箱可帮助您找回登录密码，并可订阅获取最新的订单动态、促销信息。</span>
+					<span ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2"><i ng-modal="userInfo.userEmail" style="color:#666;">{{userInfo.userEmail}}</i></span>
+					<span ng-show="!userInfo.emailValidCode || userInfo.emailValidCode != 2">绑定邮箱可帮助您找回登录密码，并可订阅获取最新的订单动态、促销信息。</span>
 				</span>
           <a ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2" ng-click="updateUserEmail()">修改</a>
-          <a ng-hide="userInfo.emailValidCode && userInfo.emailValidCode != 2" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
+          <a ng-show="!userInfo.emailValidCode || userInfo.emailValidCode != 2" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
         </li>
         <li>
 				<span>
@@ -668,17 +668,17 @@
         </li>
         <li ng-switch="userInfo.idEnable">
 				<span>
-					<h5 ng-switch-when="2"><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="1"><img src="static/img/user/images/safe.png"/></h5>
+					<h5 ng-switch-when="2"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
                     <h5 ng-switch-when="3"><img src="static/img/user/images/safe.png"/></h5>
 					<font>实名认证：</font>
 					<span>实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
 				</span>
-          <a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即设置</a>
-          <a ng-switch-when="2">审核通过</a>
+          <a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即认证</a>
           <a ng-switch-when="1">待审核</a>
-          <a ng-switch-when="3">重新设置</a>
+          <a ng-switch-when="2">已认证</a>
+          <a ng-switch-when="3" ng-click="updateRealAuth()" class="mall-btn-default">重新认证</a>
         </li>
        <!-- <li>
 				<span>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -43,7 +43,7 @@
 <div id="vendor_left_bar" class="user_left fl" ng-controller="leftNavCtrl">
 	<span  ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></span>
 	<ul>
-		<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail)">
+		<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.emailValidCode && userInfo.emailValidCode == 2)">
 		<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">订单中心</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_upload">产品导入</span></li>
@@ -79,7 +79,7 @@
 		<!--</li>-->
 		<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><span  ui-sref="vendor_manufacture">原厂认证</span></li>-->
 		</div>
-		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
+		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.emailValidCode && userInfo.emailValidCode == 2">
 			<li ng-class="{'active' : active == 'vendor_order'}"><span ng-click="promptUpdate()" class="disabled">订单中心</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_productOn'}"><span ng-click="promptUpdate()" class="disabled" >产品导入</span></li>