From 680c4f9e4e8b079593c8e57c100b92890e70960d Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 14 三月 2021 14:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/yunpan/zhishou.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/views/yunpan/zhishou.vue b/src/views/yunpan/zhishou.vue
index 4e34aa0..cdb8343 100644
--- a/src/views/yunpan/zhishou.vue
+++ b/src/views/yunpan/zhishou.vue
@@ -1,5 +1,5 @@
<template>
- <div class="zs-main">
+ <div class="zs-main" style="background-color: #fff">
<el-row class="search-title">
<el-col :span="18" class="title">
<div class="zs-title">云盘智搜</div>
@@ -21,7 +21,7 @@
<el-aside width="210px" style="background-color: #fff;text-align: center;">
<el-button class="add-folder-but" @click="dialogFormVisible = true">新增</el-button>
<el-popconfirm title="是否删除目录？" @onConfirm="delFolder()">
- <el-button slot="reference" class="hr-but-all" type="danger">删除</el-button>
+ <el-button slot="reference" class="pri-del-btn" type="primary">删除</el-button>
</el-popconfirm>
<el-dialog
title="新增文件夹"
@@ -97,12 +97,13 @@
>下载</el-button>
<el-button
type="primary"
+ class="pri-del-btn"
icon="el-icon-search"
size="mini"
@click="delFile()"
>删除</el-button>
<el-popconfirm title="是否移动文件？" @onConfirm="mvdialogFormVisible = true">
- <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
+ <el-button slot="reference" type="danger">转存</el-button>
</el-popconfirm>
<el-button type="warning" @click="openUpdateFileName()">重命名</el-button>
</el-col>
@@ -679,8 +680,8 @@
}
}
.add-folder-but {
- background: #fff !important;
- color: #a32c30 !important;
+ background: #a32c30 !important;
+ color: #fff !important;
margin-bottom: 20px;
}
padding: 0 15px 0 15px;
@@ -688,9 +689,10 @@
line-height: 60px;
}
.uploading-image {
- width: 100%;
- height: 100%;
+ width: 70%;
+ height: 70%;
display: block;
+ margin-left: 30px;
}
}
@@ -724,6 +726,18 @@
/* 设置鼠标经过对勾框，对勾框边框的颜色 */
.myRedCheckBox .el-checkbox__inner:hover {
border-color: #a32c30;
+}
+
+.myRedCheckBox .el-checkbox__label {
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+}
+.myRedCheckBox {
+ margin-left: -10px;
+}
+.myRedCheckBox .el-checkbox__input {
+ vertical-align: text-top;
}
.avatar-uploader{
.el-upload-dragger{
@@ -791,5 +805,9 @@
.el-input-number {
width: 100%;
}
+.pri-del-btn {
+ background-color: rgb(64, 158, 255) !important;
+ border-color: rgb(64, 158, 255) !important;
+}
</style>
--
Gitblit v1.8.0