From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/utils/option.js | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 406f0ae..df5e76b 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -87,18 +87,18 @@
isSystem: true
},
{
- title: '瑙掕壊鏉冮檺鍒嗛厤',
- type: 'RolePermission',
- url: rolemanage,
- isSystem: true,
- hidden: true
- },
- {
title: '澶栭儴椤甸潰',
type: 'NewPage',
url: customImg,
baseconfig: '',
isSystem: true
+ },
+ {
+ title: '瑙掕壊鏉冮檺鍒嗛厤',
+ type: 'RolePermission',
+ url: rolemanage,
+ isSystem: true,
+ hidden: true
}
]
@@ -694,8 +694,11 @@
'play-circle',
'login',
'logout',
+ 'search',
'fullscreen',
- 'fullscreen-exit'
+ 'fullscreen-exit',
+ 'download',
+ 'upload'
],
hint: [
'question',
@@ -774,6 +777,8 @@
'credit-card',
'customer-service',
'dashboard',
+ 'ellipsis',
+ 'more',
'database',
'dislike',
'environment',
@@ -798,6 +803,8 @@
'phone',
'picture',
'red-envelope',
+ 'setting',
+ 'tool',
'smile',
'star',
'thunderbolt',
@@ -808,9 +815,8 @@
'woman',
'team',
'poweroff',
- 'search',
'shopping-cart',
- 'link'
+ 'link',
]
}
--
Gitblit v1.8.0