Merge remote-tracking branch 'origin/feature/authority-0918' into feature/authority-0918

# Conflicts:
#	src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

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

@@ -218,7 +218,7 @@ define(['app/app'], function (app) {
                 $scope.searchMthod = false;
             }
             $scope.tableParams.page(1);
-            // $scope.tableParams.reload();
+            $scope.tableParams.reload();
         };
         $scope.onKeyUpSearch = function (keyword, filterRole, event) {
             if (event && event.keyCode == 13) {

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

@@ -313,26 +313,26 @@
         text-align: center;
     }
     .user_right .bgcolor-1 {
-        background: #89aefa!important;
+        background: #89aefa !important;
     }
     .user_right .bgcolor-2 {
-        background: #f7b73c!important;
+        background: #f7b73c !important;
     }
     .user_right .bgcolor-3 {
-        background: #01d9ce!important;
+        background: #01d9ce !important;
     }
     .user_right .bgcolor-4 {
-        background: #ff6769!important;
+        background: #ff6769 !important;
     }
     .user_right .bgcolor-5 {
-        background: #ff8050!important;
+        background: #ff8050 !important;
     }
-  /*  .user_right  .bgcolor-6 {
-        background: #64bfe9!important;
+    .user_right  .bgcolor-6 {
+        background: #64bfe9 !important;
     }
     .user_right .bgcolor-7 {
-        background: #4bc701!important;
-    }*/
+        background: #4bc701 !important;
+    }
     .auth-info-area .role-info .submit-area span {
         font-size: 12px;
         display: inline-block;
@@ -618,7 +618,7 @@
     color: #666;
     margin-left: 0;
   }
-  .count01 ul li >a {
+  .count01 > ul li >a {
     background: #fff;
     color: #5078cb;
     text-align: center;
@@ -910,7 +910,7 @@
             <ul class="fl">
                 <li ng-class="{'active': tab=='base'}"><a ng-click="checkTab('base')">基本信息</a></li>
                 <li ng-class="{'active': tab=='safe'}"><a ng-click="checkTab('safe')">安全设置</a></li>
-        <li ng-class="{'active': tab=='bind'}"><a ng-click="checkTab('bind')" ng-if="isAdmin">申请绑定</a></li>
+                <li ng-class="{'active': tab=='bind'}" ng-if="isAdmin"><a ng-click="checkTab('bind')">申请绑定</a></li>
                 <li ng-class="{'active': tab=='auth'}"><a ng-click="checkTab('auth')">员工管理</a></li>
                 <li ng-class="{'active': tab=='role'}"><a ng-click="checkTab('role')">角色权限</a></li>
                 <!--<li ng-class="{'active': tab=='logistic'}"><a href="#" ng-click="checkTab('logistic')">收货地址</a></li>-->
@@ -1378,7 +1378,7 @@
                         <td ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
                             <input ng-model="newUser.userTel"
                                    ng-blur="telValid(newUser.userTel)" required name="newUserTel"
-                                   ng-pattern="/^1[3|4|5|7|8]\d{9}$/" type="text" placeholder="手机号">
+                                   ng-pattern="/^1\d{10}$/" type="text" placeholder="手机号">
                         </td>
                         <td ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
                             <input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
@@ -1407,7 +1407,8 @@
                         <td>{{user.userTel}}</td>
                         <td>{{user.userEmail}}</td>
                         <td class="role-tag-area detail-role-tag">
-                            <span ng-repeat="role in user.roles" class="role-tag bgcolor-{{role.color || 1}}">{{role.desc.substring(0,1)}}</span>
+                            <span ng-repeat="role in user.roles track by $index" ng-if="$index < 6 || user.roles.length == 7" class="role-tag bgcolor-{{role.color || 1}}">{{role.desc.substring(0,1)}}</span>
+                            <span class="role-tag bgcolor-6" ng-if="user.roles.length > 7">...</span>
                         </td>
                         <!--<td class="edit-btn-area">
                             <a>编辑 </a><span>|</span><a> 删除</a>
@@ -1511,7 +1512,7 @@
         </table>
       </div>
     <!--权限管理-->
-    <div class="count01 clearfix" ng-if="tab=='auth'">
+   <!-- <div class="count01 clearfix" ng-if="tab=='auth'">
       <div class="power_title">员工账号及权限管理</div>
       <dl class="power_list">
         <dt>
@@ -1555,7 +1556,7 @@
           <span><a href="#" class="p_off fl">取消</a><a href="#" class="p_save fr">提交更改</a></span>
         </dd>
       </dl>
-    </div>
+    </div>-->
   </div>
   <!--收货地址-->
   <div class="logistic-content" ng-if="tab=='logistic'">