Merge remote-tracking branch 'origin/dev-liveSix-20200817' into dev-liveSix-20200817

src/router/router.js

@@ -60,6 +60,8 @@ const roleManage = r => require.ensure([], () => r(require('../views/yqrange/rol
 const createRange = r => require.ensure([], () => r(require('../views/yqrange/create-range.vue')), 'create-range')
 const editRange = r => require.ensure([], () => r(require('../views/yqrange/edit-range.vue')), 'edit-range')
 const createLive = r => require.ensure([], () => r(require('../views/yqrange/create-live.vue')), 'create-live')
+const adminManage = r => require.ensure([], () => r(require('../views/yqrange/admin-manage.vue')), 'admin-manage')
+
 
 export default [{
     path: '/',
@@ -226,6 +228,10 @@ export default [{
             path: '/role-manage',
             component: roleManage
         },
+        {
+            path: '/admin-manage',
+            component: adminManage
+        },
         {
             path: '/create-range',
             component: createRange

src/utils/filter.js

@@ -305,7 +305,29 @@ const vueFilter = {
         } else if (value == 2) {
             return '取消屏蔽';
         }
-    },
+    }, 
+    roleAdminStatus: (value) => {
+    if(value == 1) {
+        return '普通成员';
+    } else if(value == 2) {
+        return '主管理员';
+    }else if(value == 3) {
+        return '高级主管理员';
+    }else if(value == 4) {
+        return '管理员';
+    }
+  },
+  roleAdminButton: (value) => {
+    if(value == 1) {
+        return '升为管理员';
+    } else if(value == 2) {
+        return '';
+    }else if(value == 3) {
+        return '';
+    }else if(value == 4) {
+        return '降为普通成员';
+    }
+  },
     areaText: (value) => {
         let text = '-';
         if (value.regions.length == 0) {