diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css index a1aac7c86..2050a4b9d 100644 --- a/ruoyi-ui/src/assets/styles/base.css +++ b/ruoyi-ui/src/assets/styles/base.css @@ -6,14 +6,15 @@ .dropdownList{ font-size: 22px!important; } + } /* ipad pro >>lg*/ @media screen and (max-width: 1200px) { - .header-listtxet{ - display: none; - } + /*.header-listtxet{*/ + /* display: none;*/ + /*}*/ .main-right{ width: 250px; } @@ -23,13 +24,17 @@ .sousouright-icon{ margin-right: 18px; } + .logoname span{ + font-size: 18px; + } } /* >>> md*/ @media screen and (max-width: 992px) { - .el-dropdown-link span{ + + .dropdownList span{ display: none; } @@ -73,6 +78,7 @@ margin-left: 0px!important; } + } /* iphone6 7 8 plus */ @media screen and (max-width: 414px) { diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 24175dc68..281433596 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -33,14 +33,14 @@ import index3 from '@/views/bookmark/index'; breadcrumb: false // 如果设置为false,则不会在breadcrumb面包屑中显示 } */ -//书签路由bookmark -export const bookmark = [ - { - path: '/index2', - component: bookmarkmenu, - hidden: true - }, -] +// //书签路由bookmark +// export const bookmark = [ +// { +// path: '/index2', +// component: bookmarkmenu, +// hidden: true +// }, +// ] // 公共路由 @@ -137,15 +137,16 @@ export const constantRoutes = [ } ] }, - { - path: '/index2', - component: bookmarkmenu, - - }, + // { + // path: '/index2', + // component: bookmarkmenu, + // + // }, { path: '/index3', component: index3, meta:{ + title: '书签管理',icon:'user', requireAuth: false, }, children: [ @@ -157,6 +158,7 @@ export const constantRoutes = [ t:Date.now(), }, meta:{ + title: '书签页面',icon:'user', requireAuth: false,//加该字段,表示进入这个路由是需要登录的true }, },{ @@ -164,6 +166,7 @@ export const constantRoutes = [ name: 'UserTagAll', component: resolve => require(['../views/bookmark/common/UserTagAll.vue'], resolve), meta:{ + title: '用户标签',icon:'user', requireAuth: true,//加该字段,表示进入这个路由是需要登录的true }, },{ @@ -171,6 +174,7 @@ export const constantRoutes = [ name: 'importHtml', component: resolve => require(['../views/bookmark/common/ImportHtml.vue'], resolve), meta:{ + title: '导入书签',icon:'user', requireAuth: true,//加该字段,表示进入这个路由是需要登录的true }, },{ @@ -178,12 +182,14 @@ export const constantRoutes = [ name: 'ceshi', component: resolve => require(['../views/bookmark/ceshi/index.vue'], resolve), meta:{ + title: '测试页面',icon:'user', requireAuth: true,//加该字段,表示进入这个路由是需要登录的true }, } ], }, + ] export default new Router({ diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue index 59949a105..3d97f37f6 100644 --- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue +++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue @@ -683,6 +683,12 @@ .bookmarktag { margin-right: 5px; } + .bookmark-official { + float: left; + } + .info { + font-size: 12px; + } .bookmark-icon { float: left; @@ -768,7 +774,7 @@ margin-left: 4px; height: 18px; line-height: 18px; - margin-top: 2px; + margin-top: -2px; border-radius: 1px; color: #7794D8; background-color: #FFFFFF; @@ -786,10 +792,13 @@ font-weight: 600; } .bookmark-title:hover{ + color: #3C4DAC; } .description{ color: #9EABB3; + margin-top: 5px; + margin-bottom: 5px; } .info-wrap{ color: #9EABB3; @@ -807,6 +816,8 @@ /*超出部分隐藏*/ font-size: 17px; font-weight: 600; + margin-top: 2px; + margin-bottom: 2px; } .description { diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index 67217f128..7244db690 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -88,26 +88,21 @@