Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-01-12 01:37:41 +08:00
15 changed files with 140 additions and 165 deletions

View File

@@ -94,11 +94,11 @@
<div class="btns">
<!-- 2022-11-30注释 后面放开 -->
<div
class="btn btn3"
class="btn btn2"
@click="openMessage"
style="margin-right: 14px"
>
<div class="search"></div>
<div class="img2"></div>
<div class="btnText">导出</div>
</div>
<div class="btn btn3" @click="of_hShow">
@@ -5839,8 +5839,8 @@ export default defineComponent({
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
.btn1 {
.search {
background-image: url("../../assets/images/courseManage/search0.png");
@@ -5850,18 +5850,18 @@ export default defineComponent({
color: #ffffff;
}
}
/**
.btn1:active {
background: #0982ff;
}
.btn2:hover {
.btn2 {
background: rgba(64, 158, 255, 0.1);
}
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
}*/
}
.btns {
@@ -5894,31 +5894,22 @@ export default defineComponent({
}
}
.btn3 {
margin-right: 0px;
.search {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active {
background: #0982ff;
}
}
}
@@ -6940,7 +6931,7 @@ export default defineComponent({
}
}
.btn1:hover {
.btn1 {
background: rgba(64, 158, 255, 1);
.search {
@@ -6960,7 +6951,7 @@ export default defineComponent({
}
}
.btn2:hover {
.btn2{
background: rgba(64, 158, 255, 1);
.search {
@@ -7352,7 +7343,7 @@ export default defineComponent({
}
}
.btn1:hover {
.btn1 {
background: #4ea6ff;
.search {
@@ -7364,7 +7355,7 @@ export default defineComponent({
}
}
.btn2:hover {
.btn2 {
background: #4ea6ff;
.reset {
@@ -7580,8 +7571,8 @@ export default defineComponent({
}
}
.btn1:hover {
background: rgba(64, 158, 255, 0.76);
.btn1{
.search {
background-image: url("../../assets/images/courseManage/search0.png");
@@ -7591,7 +7582,7 @@ export default defineComponent({
color: #ffffff;
}
}
/**
.btn1:active {
background: #0982ff;
}
@@ -7603,7 +7594,7 @@ export default defineComponent({
.btn2:active {
background: rgba(64, 158, 255, 0.2);
}
*/
.btns {
display: flex;
@@ -7632,33 +7623,20 @@ export default defineComponent({
line-height: 36px;
margin-left: 5px;
}
}
.btn3 {
.btn2 {
margin-right: 0px;
.search {
.img2 {
width: 17px;
height: 18px;
background-image: url("../../assets/images/courseManage/add0.png");
background-image: url(../../assets/images/coursewareManage/export1.png);
}
}
.btn3:hover {
background: rgba(64, 158, 255, 0.76);
.search {
background-image: url("../../assets/images/courseManage/add0.png");
}
.btnText {
color: #ffffff;
}
}
.btn3:active {
background: #0982ff;
}
}
}