From 8ff9c111fd251698fc9ce1066c582d8701bf4ef1 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sun, 16 Aug 2020 00:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=92=E5=BA=8F=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E9=80=89=E6=8B=A9,=E5=AA=92=E4=BD=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/assets/styles/base.css | 64 ++++++ ruoyi-ui/src/main.js | 4 +- ruoyi-ui/src/views/bookmark/index/index.vue | 211 +++++++++++++++++--- 3 files changed, 250 insertions(+), 29 deletions(-) create mode 100644 ruoyi-ui/src/assets/styles/base.css diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css new file mode 100644 index 000000000..2cd07e50c --- /dev/null +++ b/ruoyi-ui/src/assets/styles/base.css @@ -0,0 +1,64 @@ + +@media only screen and (min-width: 1600px) and (max-width: 1920px) { + + .sousouleft-switch{ + display: none; + } +} + + +@media only screen and (min-width: 1130px) and (max-width: 1920px) { + + .sousouleft-switch{ + display: none; + } + + +} + +@media only screen and (min-width: 100px) and (max-width: 1000px) { + .sousou-leftico{ + display: none; + } + .header-listtxet{ + display: none; + } + .transition-box{ + width: 250px!important; + } + + +} + +@media only screen and (min-width: 1130px) and (max-width: 1920px) { + + .sousouleft-switch{ + display: none; + } + + +} + +/*@media only screen and (min-width: 0px) and (max-width: 1264px) {*/ + +/* !*右侧导航条*!*/ +/* .announcement{*/ +/* display: none!important;*/ +/* width: 0px!important;*/ +/* }*/ +/* !*书签列表*!*/ +/* .bookmarklist{*/ +/* width: 100%!important;*/ +/* }*/ + +/*}*/ + +@media only screen and (min-width: 1px) and (max-width: 660px) { + + .transition-box{ + display: none; + } + + +} + diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index d44a19fae..b96a288e5 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -24,8 +24,8 @@ import Pagination from "@/components/Pagination"; import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' - - +//媒体查詢 +import '@/assets/styles/base.css' diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue index b1eaffe14..bbaf4ba05 100644 --- a/ruoyi-ui/src/views/bookmark/index/index.vue +++ b/ruoyi-ui/src/views/bookmark/index/index.vue @@ -4,9 +4,14 @@ - + + + + +
所有书签
发现书签
任意门
@@ -26,18 +31,64 @@ + + + 我来啦! + + + + + + + + +
+
+
+
- +
+ + -
+
+
+ + - List + + + 按时间排序(正序) + 按时间排序(到序) + 按字母A-Z排序 + 按网站A-Z排序 + 按网站A-Z排序 + 按网站A-Z排序 + + + + 开启渲染 + + + 关闭 + + +
@@ -45,9 +96,27 @@
+ + + + 选择排序方式 + + + 按时间排序(正序) + 按时间排序(到序) + 按字母A-Z排序 + 按字母A-Z排序 + 按网站A-Z排序 + + + + + + +
- | +
@@ -72,7 +141,7 @@
-
+
@@ -80,7 +149,7 @@
- {{bm.title}} +

{{bm.title}}

{{bm.description}}

@@ -111,7 +180,7 @@ -
+ Footer @@ -154,6 +223,11 @@ data:function(){ return{ + drawerS:false, + drawer: false, + direction: 'ltr', + + swictxuanran:true, sousou:'',//搜索书签 enterable:false, isShowZtree:true,//ztree树显示 @@ -326,6 +400,11 @@ $.fn.zTree.init($("#treeDemo"), this.setting, this.zNodes).expandAll(that.expandAll); }, + handleCommand(command) { + this.$message('click on item ' + command); + } + + @@ -333,10 +412,15 @@ }