From 69b7e0a806a2a034ff6efd39a52b7f272a07b1c9 Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Sat, 3 Oct 2020 23:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E7=9A=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/styles/base.css           |  2 +-
 .../src/views/bookmark/bookmark/index.vue     | 13 ++++++-
 ruoyi-ui/src/views/bookmark/index/index.vue   | 39 +++++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/base.css b/ruoyi-ui/src/assets/styles/base.css
index 2dd418b9f..a1aac7c86 100644
--- a/ruoyi-ui/src/assets/styles/base.css
+++ b/ruoyi-ui/src/assets/styles/base.css
@@ -15,7 +15,7 @@
     display: none;
   }
   .main-right{
-    width: 250px!important;
+    width: 250px;
   }
   .tabBar{
     width: 250px!important;
diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
index 729dae87b..5ef63e621 100644
--- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue
+++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
@@ -66,7 +66,7 @@
     </div>
 
 
-    <div class="bookmarklist" :style="datalist" v-loading="loading" v-if="showbookmark" v-infinite-scroll="load"
+    <div class="bookmarklist" :style="datalist" infinite-scroll-distance="10" v-loading="loading" v-if="showbookmark" v-infinite-scroll="load"
          infinite-scroll-disabled="disabled" style="overflow:auto;" infinite-scroll-immediate="false">
       <el-row>
         <hr class="bookamrk-hr"/>
@@ -351,6 +351,7 @@
 
       /**滚动监控**/
       load() {
+        console.log("滚动开始")
 
         //判断是否加载了所有数据
         this.queryParams.pageNum=this.queryParams.pageNum+1;
@@ -757,5 +758,15 @@
     background: #dcdfe682;
     font-weight: 600;
   }
+  .bookmark-title:hover{
+    color: #3C4DAC;
+  }
+  .description{
+    color: #9EABB3;
+  }
+  .info-wrap{
+    color: #9EABB3;
+  }
+
 
 </style>
diff --git a/ruoyi-ui/src/views/bookmark/index/index.vue b/ruoyi-ui/src/views/bookmark/index/index.vue
index 860ad0e32..0de381171 100644
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@@ -8,7 +8,7 @@
           <el-header class="aside-logo">
             <!--        <img src="https://s1.ax1x.com/2020/08/15/dACqUO.png"/>-->
             <div class="logoname">
-              <span>集趣书签</span>
+              <span>藏趣云书签</span>
             </div>
             <div class="logoright">
               <i class="el-icon-plus"/>
@@ -894,10 +894,12 @@
 
 
   body {
-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+    /*font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;*/
+    font-family: "Merriweather","Open Sans","Microsoft Jhenghei","Microsoft Yahei",sans-serif;
   }
 
 
+
   .ztree li ul {
     margin: 0;
     padding: 0
@@ -1013,17 +1015,46 @@
 
   }
 
-  aside {
+  aside{
     padding: 0;
     margin-bottom: 0;
     /*background:url('https://ftp.bmp.ovh/imgs/2020/08/4ac1d6b4f41049ef.jpg') no-repeat;*/
     /*background-color: #F6F6F6;*/
-    background: url("https://s1.ax1x.com/2020/08/16/dEcqVU.jpg") no-repeat;
+    /*background: url("https://s1.ax1x.com/2020/08/16/dEcqVU.jpg") no-repeat;*/
+
+
+    /*background: url("https://s1.ax1x.com/2020/10/03/03WM4K.md.jpg") no-repeat;*/
+    background: url("https://s1.ax1x.com/2020/10/03/03fri6.png") no-repeat;
+
+
+    /*background: url("https://s1.ax1x.com/2020/10/03/03RCSe.jpg") no-repeat;*/
+    /*background-color: #2E90AE;*/
+    /*background: -webkit-linear-gradient(to right, #000C40, #F0F2F0);  !* Chrome 10-25, Safari 5.1-6 *!*/
+    /*background: linear-gradient(to right, #000C40, #F0F2F0); !* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ *!*/
+
+    /*opacity:0.9;*/
+    /*filter:alpha(opacity=90);*/
+
+
+
+
     filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
     -moz-background-size:100% 100%;
     background-size:100% 100%;
 
 
+    /*background: url("https://s1.ax1x.com/2020/10/03/03sAeK.md.jpg") no-repeat, linear-gradient(90deg, rgb(107, 165, 255) 40%, rgb(197, 197, 197) 100%) ;*/
+    /*background-repeat: no-repeat;*/
+    /*filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";*/
+    /*-moz-background-size:100% 100%;*/
+    /*background-size:400px 100%;*/
+
+    /*background-color: #2E90AE;*/
+    /*background: -webkit-linear-gradient(to right, #000C40, #F0F2F0);  !* Chrome 10-25, Safari 5.1-6 *!*/
+    /*!*background: linear-gradient(to right, #000C40, #F0F2F0); !* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ *!*!*/
+
+
+
 
     /*background-size: cover;*/
     /*z-index: -1;!*-1 可以当背景*!*/