Merge branch 'dev-mysql' into wangdy_material_person_20180108

# Conflicts:
#	src/main/webapp/resources/view/vendor/left_nav.html

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -258,7 +258,7 @@ public class UserController {
 			throw new IllegalOperatorException("新邮箱地址与旧邮箱地址相同");
 		}
 		// 正则校验邮箱地址
-		if(!newUserEmail.matches("^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+")){
+		if(!newUserEmail.matches("^[A-Za-z0-9\\u4e00-\\u9fa5]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$")){
 			throw new IllegalOperatorException("新邮箱地址格式不正确");
 		}
 		String _checkCode = (String) session.getAttribute("checkCode");

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

@@ -170,7 +170,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		try {
 			result = AccountUtils.applyAppForMall(detail);
 		}catch (Exception e){
-			return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
+			return new ResultMap(CodeType.SYSTEM_ERROR, "账户中心异常，注册失败");
 		}
 		if (result.contains("errMsg") || !result.contains("enuu")){
 			return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");

src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -105,7 +105,7 @@ public class ProductController {
      * @return model and view
      * @throws UnsupportedEncodingException the unsupported encoding exception
      */
-    @RequestMapping(value = "/template/download/type", method = RequestMethod.POST)
+    @RequestMapping(value = "/template/download/type", method = RequestMethod.GET)
 	public ModelAndView exportProductsStandard(@RequestParam("type") String type, @RequestParam(required = false, value = "isAjax", defaultValue = "false")Boolean isAjax, HttpServletRequest request, @RequestParam(value = "keyword", required = false) String keyword) throws UnsupportedEncodingException {
 		HttpSession session = request.getSession();
 		ModelAndView modelAndView = new ModelAndView();

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsPriceInfoServiceImpl.java

@@ -180,7 +180,7 @@ public class GoodsPriceInfoServiceImpl implements GoodsPriceInfoService {
 	public GoodsPriceInfo save(GoodsPriceInfo priceInfo, String comment, String deviceInfo) {
 		checkPriceInfo(priceInfo);
 		priceInfo = goodsPriceInfoDao.save(priceInfo);
-		updateGoodsInfos(priceInfo);
+//		updateGoodsInfos(priceInfo);
 		log(priceInfo, comment, deviceInfo);
 		return priceInfo;
 	}

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -2885,7 +2885,7 @@ public class GoodsServiceImpl implements GoodsService {
             if (!StringUtils.isEmpty(goods.getUuid())) {
                 uuids.add(goods.getUuid());
             }
-            if (goods.getProductid() == null) {
+            if (goods.getProductid() != null) {
                 Product product = productDao.findOne(goods.getProductid());
                 if (product != null) {
                     Integer count = product.getBatchCount();

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -288,6 +288,7 @@ public class ProductServiceImpl implements ProductService {
         List<Product> products = new ArrayList<Product>();
         page.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
         page.filter("b2cEnabled", com.uas.platform.b2c.prod.commodity.constant.IntegerConstant.YES_INT);
+        page.sorting(Sort.Direction.DESC, "standard", "id");
         //产品部要求导出是非标和标准全部导出，先注释这条代码
 //        if(StringUtils.isEmpty(type)) {
 //            type = "all";
@@ -311,28 +312,13 @@ public class ProductServiceImpl implements ProductService {
             query.where(page.getPredicates(root, query, cb));
             return null;
             }
-        });
-        //先按照id降序排列
-        Collections.sort(products, new Comparator<Product>() {
-            @Override
-            public int compare(Product o1, Product o2) {
-                return (o2.getId().compareTo(o1.getId()));
-            }
-        });
-        //后面按照非标与标准排列
-        Collections.sort(products, new Comparator<Product>() {
-            @Override
-            public int compare(Product o1, Product o2) {
-                return o2.getStandard().compareTo(o1.getStandard());
-            }
-        });
+        }, page.getSort());
         List<Goods> goodses = new ArrayList<>();
         for (Product product : products) {
-            System.out.println(product.getId() + " -" + product.getStandard());
             List<Goods> goodses1 = goodsDao.findByProductIdOrderByGoodsId(product.getId());
-            if(goodses1.size() > 0) {
+            if (goodses1.size() > 0) {
                 goodses.addAll(goodses1);
-            }else {
+            } else {
                 Goods g = Goods.productConvertGoods(product);
                 goodses.add(g);
             }

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

@@ -309,15 +309,15 @@ define([ 'app/app' ], function(app) {
 				if($scope.searchType.brand) {
 					SessionService.set('brand', true);
 					SessionService.unset('component');
-					window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=brand';
+					window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=brand';
 				}else if($scope.searchType.isCmp()){
 					SessionService.set('component', angular.toJson($scope.searchType));
 					SessionService.unset('brand');
-					window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=component';
+					window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=component';
 				}else {
 					SessionService.unset('component');
 					SessionService.unset('brand');
-					window.location.href = 'search?w=' + encodeURI(encodeURIComponent($scope.keyword)) + '&type=all';
+					window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=all';
 				}
 
 			}

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

@@ -19,6 +19,7 @@ define(['app/app'], function (app) {
           // $scope.userInfo.userEmail = null;
           $scope.userInfoBackup = angular.copy($scope.userInfo);
           $scope.canAddTotal = 20;
+
           //手机号和邮箱号的部分隐藏
           if($scope.userInfo.userTel){
             $scope.userInfo.userTel = $scope.userInfo.userTel.substr(0, 3)
@@ -439,10 +440,11 @@ define(['app/app'], function (app) {
 				}
 			});
 
-            modalInstance.result.then(function () {
-            }, function () {
-            });
-          };
+			modalInstance.result.then(function () {
+				window.location.href = "user#/accountManager/sec";
+			}, function () {
+			});
+		};
 
           $scope.updateUserEmail = function () {
             var modalInstance = $modal.open({
@@ -458,6 +460,7 @@ define(['app/app'], function (app) {
             });
 
             modalInstance.result.then(function () {
+              window.location.href = "user#/accountManager/sec";
             }, function () {
             });
           };
@@ -512,6 +515,7 @@ define(['app/app'], function (app) {
             });
 
             modalInstance.result.then(function () {
+              window.location.href = "user#/accountManager/sec";
             }, function () {
             });
           };
@@ -554,8 +558,12 @@ define(['app/app'], function (app) {
 
   // 修改密码Controller
   app.register.controller('PasswordCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
-        function ($scope, $modalInstance, user, User, toaster,$state) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$state) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           $scope.checking = false;
           $scope.showPassword = false;
@@ -774,8 +782,12 @@ define(['app/app'], function (app) {
 
   // 修改邮箱Controller
   app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userEmail = null;
@@ -809,7 +821,7 @@ define(['app/app'], function (app) {
           $scope.emailEnable = function (newUserEmail) {
             //邮箱不可用
             if ((newUserEmail == null || newUserEmail.length > 30)
-                || !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(
+                || !/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(
                     newUserEmail)) {
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
@@ -941,10 +953,14 @@ define(['app/app'], function (app) {
           };
         }]);
 
-  //手机验证Controller
+  // 手机验证Controller
   app.register.controller('UserTelCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userTel = null;
@@ -1106,8 +1122,12 @@ define(['app/app'], function (app) {
 
   // 设置支付密码Controller
   app.register.controller('UserPayCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //原密码框是否显示
           $scope.user = angular.copy(user);
           $scope.checking = true;
@@ -1325,8 +1345,12 @@ define(['app/app'], function (app) {
 
   // 设置密保问题Controller
   app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
-        function ($scope, $modalInstance, user, User, toaster,$timeout) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$timeout) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //查询所有的密保问题
           $scope.pageInfo = {page: 1, count: 20};
           User.getAllSecQuestion($scope.pageInfo, function (data) {
@@ -1449,8 +1473,12 @@ define(['app/app'], function (app) {
 
   // 实名认证Controller
   app.register.controller('UserRealAuthCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           //姓名验证  不超过20个字符
           $scope.checkSuccess = false;

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

@@ -217,7 +217,12 @@ define(['app/app', 'calendar'], function(app) {
             height: 220
         });
     }]);
-  app.register.controller('homeModalCtrl', ['$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+    
+  app.register.controller('homeModalCtrl', ['$rootScope', '$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($rootScope, $scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+    $rootScope.$on('$stateChangeStart',
+        function(event, toState, toParams, fromState, fromParams){
+          $modalInstance.dismiss();
+    })
     $scope.goLink = function(op){
       $state.go('account_manager',{op:op});
       $modalInstance.dismiss('cancel');

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

@@ -309,8 +309,8 @@ define(['app/app'], function(app) {
                 }
               }
             });
-
             modalInstance.result.then(function () {
+              window.location.href = "vendor#/account/management/sec";
             }, function () {
             });
           };
@@ -326,6 +326,7 @@ define(['app/app'], function(app) {
             });
 
             modalInstance.result.then(function(){
+              window.location.href = "vendor#/account/management/sec";
             }, function(){
             });
           };
@@ -371,6 +372,7 @@ define(['app/app'], function(app) {
             });
 
             modalInstance.result.then(function(){
+              window.location.href = "vendor#/account/management/sec";
             }, function(){
             });
           };
@@ -495,8 +497,12 @@ define(['app/app'], function(app) {
 
   // 修改密码Controller
   app.register.controller('PasswordCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
-        function ($scope, $modalInstance, user, User, toaster,$state) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$state) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           $scope.checking = false;
           $scope.showPassword = false;
@@ -715,8 +721,12 @@ define(['app/app'], function(app) {
 
   // 修改邮箱Controller
   app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userEmail = null;
@@ -750,7 +760,7 @@ define(['app/app'], function(app) {
           $scope.emailEnable = function (newUserEmail) {
             //邮箱不可用
             if ((newUserEmail == null || newUserEmail.length > 30)
-                || !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(
+                || !/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(
                     newUserEmail)) {
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
@@ -884,8 +894,12 @@ define(['app/app'], function(app) {
 
   //手机验证Controller
   app.register.controller('UserTelCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userTel = null;
@@ -1047,8 +1061,12 @@ define(['app/app'], function(app) {
 
   // 设置支付密码Controller
   app.register.controller('UserPayCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //原密码框是否显示
           $scope.user = angular.copy(user);
           $scope.checking = true;
@@ -1266,8 +1284,12 @@ define(['app/app'], function(app) {
 
   // 设置密保问题Controller
   app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
-        function ($scope, $modalInstance, user, User, toaster,$timeout) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$timeout) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //查询所有的密保问题
           $scope.pageInfo = {page: 1, count: 20};
           User.getAllSecQuestion($scope.pageInfo, function (data) {
@@ -1390,8 +1412,12 @@ define(['app/app'], function(app) {
 
   // 实名认证Controller
   app.register.controller('UserRealAuthCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           //姓名验证  不超过20个字符
           $scope.checkSuccess = false;

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

@@ -90,8 +90,11 @@ define(['app/app', 'calendar'], function(app) {
 
     }]);
 
-    app.register.controller('homeModalCtrl', ['$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($scope, $modalInstance, toaster, $http, ShippingAddress,$state){
-        console.info($scope.userInfo);
+    app.register.controller('homeModalCtrl', ['$rootScope', '$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($rootScope, $scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+        $rootScope.$on('$stateChangeStart',
+          function(event, toState, toParams, fromState, fromParams){
+            $modalInstance.dismiss();
+        })
         $scope.goLink = function(op) {
             $state.go('vendor_account_management',{op:op});
             $modalInstance.dismiss('cancel');

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

@@ -47,7 +47,7 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 		 */
 		$scope.initial = function () {
 			$scope.enterprise = $rootScope.applyInfo.enterprise || {};
-			$scope.applySampleInfo.logoUrl = $scope.enterprise.enLogoUrl || null;
+			$scope.applySampleInfo.logoUrl = null;
 			accessTemplates();
 			createPlainProducts();
 		};

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

@@ -33,7 +33,7 @@
                     <dt><img src="static/img/user/images/user_photo.png" /></dt>
                     <dd>
                         <span ng-cloak ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
-                        <span ng-cloak ng-bind="'|&nbsp;' + userInfo.enterprise.enName || '个人账户'" class="enName" title="{{userInfo.enterprise.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                        <span ng-cloak ng-bind="'|&nbsp;' + (userInfo.enterprise.enName || '个人账户')" class="enName" title="{{userInfo.enterprise.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                         <a ui-sref="account_manager" href="#/accountManager/">账户设置&nbsp;》</a>
                     </dd>
                 </dl>

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

@@ -37,7 +37,7 @@
                 <dt><img src="static/img/vendor/images/user_photo.png" /></dt>
                 <dd>
                     <span ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/><!--<em>账户余额：￥68899.99</em>--></span>
-                    <span ng-bind="'|&nbsp;' + vendor.enName || '个人账户'" class="enName" title="{{vendor.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                    <span ng-bind="'|&nbsp;' + (vendor.enName || '个人账户')" class="enName" title="{{vendor.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                     <a ui-sref="vendor_account_management" href="#/account/management/">账户设置&nbsp;》</a>
                     <!--<p><img src="static/img/vendor/images/sell_grade.png"/>专有服务：******</p>-->
                 </dd>

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

@@ -4,6 +4,7 @@
 	}
 	#vendor_left_bar.user_left p {
 		text-align: center;
+		cursor: pointer;
 	}
 	#vendor_left_bar.user_left p span {
 		margin-left: 0;
@@ -29,74 +30,83 @@
 		font-weight: normal;
 		width: auto;
 	}
+	.user_content .user_left ul li span {
+		width: 100%;
+		display: inline-block;
+		height: 50px;
+		cursor: pointer;
+	}
+	.user_content .user_left ul li.active span, .user_content .user_left ul li:hover span {
+		color: #fff;
+	}
 </style>
 <div id="vendor_left_bar" class="user_left fl" ng-controller="leftNavCtrl">
-	<a  ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></a>
+	<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)">
-		<li ng-class="{'active' : active == 'vendor_order'}"><a  ui-sref="vendor_order">订单中心</a></li>
+		<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">订单中心</span></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}">
-			<a  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</a>
-			<a  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</a>
+			<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
+			<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 		</li>
-		<li ng-class="{'active' : active == 'vendor_invoice'}"><a  ui-sref="vendorInvoice">发票管理</a></li>
-	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a  ui-sref="vendor_logistics">物流管理</a></li>-->
-		<li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">结算中心</a></li>
-		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a  ui-sref="vendor_brand_apply">品牌申请</a></li>
-		<li ng-class="{'active' : active == 'vendor_component_apply'}"><a  ui-sref="vendor_component_apply">器件申请</a></li>
-	<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_productOn">产品导入</a></li>-->
-		<li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_upload">产品导入</a></li>
-		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a  ui-sref="vendor_repository">仓库管理</a></li>-->
-		<li ng-class="{'active' : active == 'vendor_material_person'}"><a  ui-sref="vendor_material_person">产品管理</a></li>
+		<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">发票管理</span></li>
+	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
+		<li ng-class="{'active' : active == 'pay_center'}"><span  ui-sref="pay_center">结算中心</span></li>
+		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><span  ui-sref="vendor_brand_apply">品牌申请</span></li>
+		<li ng-class="{'active' : active == 'vendor_component_apply'}"><span  ui-sref="vendor_component_apply">器件申请</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>
+		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
+		<li ng-class="{'active' : active == 'vendor_material_person'}"><span  ui-sref="vendor_material_person">产品管理</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
-		<!--&lt;!&ndash;<a  ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
+		<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
 		<!--售后处理-->
 		<!--</li>-->
-		<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a  ui-sref="vendor_manufacture">原厂认证</a></li>-->
+		<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><span  ui-sref="vendor_manufacture">原厂认证</span></li>-->
 		<li ng-class="{'active' : active == 'vendor_store'}">
 			<!-- 我要开店 !store && applyStatus == 'NONE' -->
-			<a  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</a>
+			<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>
 			<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
-			<a  ui-sref="vendor_store_wait" ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
+			<span  ui-sref="vendor_store_wait" ng-if="!store && applyStatus == 'PREPARE'">开店申请</span>
 			<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-			<a  ui-sref="vendor_store_info" ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
+			<span  ui-sref="vendor_store_info" ng-if="!store && applyStatus == 'PASS'">我的店铺</span>
 			<!-- 我的店铺 store -->
-			<a  ui-sref="vendor_store_maintain" ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
+			<span  ui-sref="vendor_store_maintain" ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</span>
 			<!-- 我的店铺申述 store -->
-			<a  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
+			<span  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
 		</li>
 		</div>
 		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
-			<li ng-class="{'active' : active == 'vendor_order'}"><a ng-click="promptUpdate()" ng-click="promptUpdate()" class="disabled">订单中心</a></li>
-			<li ng-class="{'active' : active == 'vendor_logistics'}"><a ng-click="promptUpdate()" class="disabled">物流管理</a></li>
-			<li ng-class="{'active' : active == 'vendor_invoice'}"><a ng-click="promptUpdate()" class="disabled" >发票管理</a></li>
-			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a  ui-sref="vendor_logistics">物流管理</a></li>-->
-			<li ng-class="{'active' : active == 'pay_center'}"><a ng-click="promptUpdate()" class="disabled" >结算中心</a></li>
-			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a ng-click="promptUpdate()" class="disabled" >品牌申请</a></li>
-			<li ng-class="{'active' : active == 'vendor_component_apply'}"><a ng-click="promptUpdate()" class="disabled" >器件申请</a></li>
-			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_productOn">产品导入</a></li>-->
-			<li ng-class="{'active' : active == 'vendor_productOn'}"><a ng-click="promptUpdate()" class="disabled" >产品导入</a></li>
-			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a  ui-sref="vendor_repository">仓库管理</a></li>-->
-			<li ng-class="{'active' : active == 'vendor_material_person'}"><a ng-click="promptUpdate()" class="disabled" >产品管理</a></li>
+			<li ng-class="{'active' : active == 'vendor_order'}"><span ng-click="promptUpdate()" class="disabled">订单中心</span></li>
+			<li ng-class="{'active' : active == 'vendor_logistics'}"><span ng-click="promptUpdate()" class="disabled">物流管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_invoice'}"><span ng-click="promptUpdate()" class="disabled" >发票管理</span></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
+			<li ng-class="{'active' : active == 'pay_center'}"><span ng-click="promptUpdate()" class="disabled" >结算中心</span></li>
+			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><span ng-click="promptUpdate()" class="disabled" >品牌申请</span></li>
+			<li ng-class="{'active' : active == 'vendor_component_apply'}"><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>
+			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
+			<li ng-class="{'active' : active == 'vendor_material_person'}"><span ng-click="promptUpdate()" class="disabled" >产品管理</span></li>
 			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
-			<!--&lt;!&ndash;<a  ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
+			<!--&lt;!&ndash;<span  ui-sref="vendor_after_sale">售后处理</span>&ndash;&gt;-->
 			<!--售后处理-->
 			<!--</li>-->
-			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a  ui-sref="vendor_manufacture">原厂认证</a></li>-->
+			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><span  ui-sref="vendor_manufacture">原厂认证</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
-				<a ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'NONE'">开店申请</a>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'NONE'">开店申请</span>
 				<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
-				<a ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</span>
 				<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-				<a ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PASS'">我的店铺</span>
 				<!-- 我的店铺 store -->
-				<a ng-click="promptUpdate()" class="disabled"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</span>
 				<!-- 我的店铺申述 store -->
-				<a ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
+				<span ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</span>
 			</li>
 
 		</div>
-		<li ng-class="{'active' : active == 'vendor_account_management'}"><a  ui-sref="vendor_account_management">账户管理</a></li>
+		<li ng-class="{'active' : active == 'vendor_account_management'}"><span  ui-sref="vendor_account_management">账户管理</span></li>
 	</ul>
 </div>