Browse Source

买家中心首页弹窗

liusw 8 years ago
parent
commit
d8526f952e

+ 2 - 2
src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -24,7 +24,7 @@ public class UserInfo {
 		this.userName = user.getUserName();
 		this.userName = user.getUserName();
 		this.userTel = user.getUserTel();
 		this.userTel = user.getUserTel();
 		this.userSex = user.getUserSex();
 		this.userSex = user.getUserSex();
-		this.pwdEnable = user.getPwdSecLevel()>1?true:false;
+		this.pwdEnable = user.getPwdSecLevel()!=null && user.getPwdSecLevel()>1?true:false;
 		this.sys = user.isSys();
 		this.sys = user.isSys();
 		if (user.getRoles() != null && user.getRoles().size() > 0) {
 		if (user.getRoles() != null && user.getRoles().size() > 0) {
 			StringBuffer sb = new StringBuffer();
 			StringBuffer sb = new StringBuffer();
@@ -52,7 +52,7 @@ public class UserInfo {
 			this.enterprises = list;
 			this.enterprises = list;
 		}
 		}
 		this.havePayPwd = user.getUserPay()==null?false:true;
 		this.havePayPwd = user.getUserPay()==null?false:true;
-		this.idEnable = user.getIdEnable();
+		this.idEnable = user.getIdEnable()==null?0:user.getIdEnable();
 		this.secLevel = countSecLevel();
 		this.secLevel = countSecLevel();
 	}
 	}
 
 

+ 26 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_home_ctrl.js

@@ -14,12 +14,24 @@ define(['app/app', 'calendar'], function(app) {
         };
         };
         getRecommendComps(null, null, {page: 0, size: 12});
         getRecommendComps(null, null, {page: 0, size: 12});
 
 
+        //安全设置提醒框
+      $scope.openModel = function() {
+        var modalInstance = $modal.open({
+          animation: true,
+          templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
+          controller:'homeModalCtrl'
+        });
+        modalInstance.result.then(function(){
+        }, function(){
+        });
+      }
+
         //安全级别
         //安全级别
         $scope.secSuccess = false;
         $scope.secSuccess = false;
         if($scope.userInfo.pwdEnable && ($scope.userInfo.haveUserQuestion || $scope.userInfo.userEmail==null?false:true)){//通过验证
         if($scope.userInfo.pwdEnable && ($scope.userInfo.haveUserQuestion || $scope.userInfo.userEmail==null?false:true)){//通过验证
           $scope.secSuccess = true;
           $scope.secSuccess = true;
         }else{
         }else{
-            //location.href="#/accountManager";
+          $scope.openModel();
         }
         }
 
 
         /**
         /**
@@ -207,6 +219,19 @@ define(['app/app', 'calendar'], function(app) {
         });
         });
 
 
     }]);
     }]);
+  app.register.controller('homeModalCtrl', ['$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($scope, addr, $modalInstance, toaster, $http, ShippingAddress,$state){
+    $scope.goLink = function(op){
+        //location.href="user#/accountManager";
+      //$state.go('account_manager');
+       // $.state.go('account_manager',{op:op});
+     // $modalInstance.close();
+      close();
+    }
+    // 关闭模态窗
+    $scope.close = function() {
+      $modalInstance.close();
+    };
+  }]);
 
 
     //地址编辑模态框
     //地址编辑模态框
     app.register.controller('editAddrHomeCtrl', ['$scope', 'isSetTop', 'isModify', 'addr', '$modalInstance', 'toaster', '$http', 'ShippingAddress', function($scope, isSetTop, isModify, addr, $modalInstance, toaster, $http, ShippingAddress){
     app.register.controller('editAddrHomeCtrl', ['$scope', 'isSetTop', 'isModify', 'addr', '$modalInstance', 'toaster', '$http', 'ShippingAddress', function($scope, isSetTop, isModify, addr, $modalInstance, toaster, $http, ShippingAddress){

+ 12 - 3
src/main/webapp/resources/view/usercenter/left_nav.html

@@ -24,8 +24,18 @@
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
             <ul>
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a href="javascript:void(0)" ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a href="javascript:void(0)" ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
-                <li ng-disabled="true" ng-class="{'active' : active == 'buyer_order'}"><a href="javascript:void(0)" ui-sref="buyer_order">订单中心</a></li>
-                <li ng-disabled="!secSuccess" ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">支付中心</a></li>
+                <div ng-hide="!secSuccess">
+                    <li ng-disabled="true" ng-class="{'active' : active == 'buyer_order'}"><a href="javascript:void(0)" ui-sref="buyer_order">订单中心</a></li>
+                    <li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">支付中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a href="javascript:void(0)" ng-disabled="!secSuccess"  ui-sref="buyer_invoice">发票管理</a></li>
+                </div>
+                <div ng-hide="secSuccess">
+                    <li  ng-class="{'active' : active == 'buyer_order'}"><a ng-disabled="true" href="javascript:void(0)">订单中心</a></li>
+                    <li ng-class="{'active' : active == 'pay_center'}"><a ng-disabled="true" href="javascript:void(0)">支付中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a ng-disabled="true" href="javascript:void(0)">发票管理</a></li>
+                </div>
+
+
                 <!--<li ng-class="{'active' : active == 'my_wallet'}" class="undo">-->
                 <!--<li ng-class="{'active' : active == 'my_wallet'}" class="undo">-->
                    <!--<a href="javascript:void(0)" ui-sref="my_wallet">我的钱包</a>-->
                    <!--<a href="javascript:void(0)" ui-sref="my_wallet">我的钱包</a>-->
                 <!--</li>-->
                 <!--</li>-->
@@ -33,7 +43,6 @@
                     <!--<a href="javascript:void(0)" ui-sref="my_seek_purchase">我的求购</a>-->
                     <!--<a href="javascript:void(0)" ui-sref="my_seek_purchase">我的求购</a>-->
                 <!--</li>-->
                 <!--</li>-->
                 <!--<li ng-class="{'active' : active == 'buyer_logistics'}"><a href="javascript:void(0)" ui-sref="buyer_logistics">物流信息</a></li>-->
                 <!--<li ng-class="{'active' : active == 'buyer_logistics'}"><a href="javascript:void(0)" ui-sref="buyer_logistics">物流信息</a></li>-->
-                <li ng-class="{'active' : active == 'buyer_invoice'}"><a href="javascript:void(0)" ng-disabled="!secSuccess"  ui-sref="buyer_invoice">发票管理</a></li>
                 <!--<li ng-class="{'active' : active == 'after_sale'}" class="undo">-->
                 <!--<li ng-class="{'active' : active == 'after_sale'}" class="undo">-->
                     <!--<a href="javascript:void(0)" ui-sref="after_sale">申请售后</a>-->
                     <!--<a href="javascript:void(0)" ui-sref="after_sale">申请售后</a>-->
                 <!--</li>-->
                 <!--</li>-->

+ 3 - 0
src/main/webapp/resources/view/usercenter/modal/homeCenter_modal.html

@@ -0,0 +1,3 @@
+<div style="height:200px;">
+    你的账户等级过低,请<a ng-click="close()">修改密码</a>
+</div>