Browse Source

权限验收修改

yangc 8 years ago
parent
commit
1ae59191a7

+ 3 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -85,6 +85,8 @@ define(['app/app'], function(app) {
 		//弹出添加用户模态框
 		$scope.addExistUser = function () {
 			$scope.adding = false;
+			$scope.setAddingUser(false);
+			$scope.newUser = {};
 			var modalInstance = $modal.open({
 				animation: true,
 				templateUrl: $rootScope.rootPath +'/static/view/vendor/forstore/addExistUser.html',
@@ -106,7 +108,7 @@ define(['app/app'], function(app) {
 		 */
 		$scope.addUser = function () {
 			if (!$scope.userEmailSuccess || !$scope.userTelSuccess){
-                toaster.pop('error', '未通过校验');
+                toaster.pop('error', '请填写完信息后提交');
                 return;
 			}
 			$scope.adding = true;

+ 5 - 5
src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -234,6 +234,9 @@
         border-bottom: none;
         vertical-align: middle;
     }
+    table.role-info tbody tr:hover {
+        background: #f1f5ff;
+    }
     table.role-info tbody tr:nth-child(even){
         background: #f1f5ff;
     }
@@ -345,6 +348,7 @@
     }
     .auth-info-header .addUser-group .addUser-expand {
         position: absolute;
+        right: -30px;
         height: 54px;
         width: 121px;
         box-shadow: 1.5px 2.598px 7px 0px rgb( 0, 0, 0 );
@@ -869,11 +873,7 @@
                                        placeholder="邮箱">
                             </td>
                             <td class="role-tag-area">
-                                <span class="role-tag bgcolor-1">管</span>
-                                <span class="role-tag bgcolor-2">管</span>
-                                <span class="role-tag bgcolor-3">管</span>
-                                <span class="role-tag bgcolor-4">管</span>
-                                <span class="role-tag bgcolor-5">管</span>
+                                <span class="role-tag bgcolor-5">普</span>
                             </td>
                             <td class="submit-area">
                                 <span ng-click="setAddingUser(false)" >取消</span>

+ 3 - 0
src/main/webapp/resources/view/vendor/modal/role_detail.html

@@ -324,6 +324,9 @@
 		background: #5078cb;
 		color: #fff;
 	}
+	.roleForm textarea {
+		resize: none;
+	}
 </style>
 
 <div class="modal-header">