guhongwei 5 年之前
父節點
當前提交
921d5e7a97
共有 3 個文件被更改,包括 25 次插入10 次删除
  1. 二進制
      src/assets/logo.png
  2. 11 2
      src/layout/master/index/notice.vue
  3. 14 8
      src/views/master/index/index.vue

二進制
src/assets/logo.png


+ 11 - 2
src/layout/master/index/notice.vue

@@ -11,9 +11,9 @@
               <span class="qiudata"></span>
               <el-link :underline="false">今天(3月8日星期五)</el-link>
             </li>
-            <li v-for="(item, index) in noticelist" :key="index">
+            <li class="listdata" v-for="(item, index) in noticelist" :key="index">
               <el-col :span="24" @click.native="$router.push({ path: `/master/detail/news/${item.id}` })">
-                <P>{{ item.title }}</P>
+                <P class="textOver"><span class="qiudatas"></span>{{ item.title }}</P>
               </el-col>
             </li>
           </ul>
@@ -105,6 +105,15 @@ p {
   border-radius: 90px;
   margin: 0 15px;
 }
+.qiudatas {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  background: #fff;
+  border: 1px solid #ccc;
+  border-radius: 90px;
+  margin: 0 15px 0 5px;
+}
 .qiu {
   float: left;
   width: 10px;

+ 14 - 8
src/views/master/index/index.vue

@@ -69,7 +69,7 @@
         <foot :footinfo="footinfo"></foot>
       </el-col>
       <el-col :span="24" class="floating">
-        <el-button onClick="javascript:this.parentNode.style.display='none';">关闭</el-button>
+        <span onClick="javascript:this.parentNode.style.display='none';">关闭</span>
         <floating :floating="floating"></floating>
       </el-col>
     </el-row>
@@ -247,13 +247,19 @@ export default {
   background: #fff;
   border: 2px solid red;
 }
-/deep/.floating .el-button {
-  position: absolute;
-  top: -2px;
-  right: -2px;
-  padding: 3px 5px;
+.floating span {
+  display: inline-block;
+  width: 35px;
+  height: 20px;
+  text-align: center;
+  line-height: 20px;
   background: #ccc;
-  color: #000;
-  border-radius: 0;
+  color: #333;
+  position: absolute;
+  right: 0;
+  z-index: 10;
+}
+.floating span:hover {
+  cursor: pointer;
 }
 </style>