提交 748225e9 authored 作者: yanpeng's avatar yanpeng

解决冲突

上级 6de3ffc6
......@@ -181,7 +181,7 @@
<div class="footer-item1">
<div class="footer-item1-bottom">
<div class="icon">
<img src="../../../assets/images/warning.png" alt="" />
<img src="../../../../assets/images/warning.png" alt="" />
</div>
<div class="text">
{{
......@@ -198,7 +198,7 @@
<div class="footer-item2">
<div class="footer-item2-bottom">
<div class="icon">
<img src="../../../assets/images/warning.png" alt="" />
<img src="../../../../assets/images/warning.png" alt="" />
</div>
<div class="text">
{{
......@@ -215,7 +215,7 @@
<div class="footer-item3">
<div class="footer-item3-bottom">
<div class="icon">
<img src="../../../assets/images/warning.png" alt="" />
<img src="../../../../assets/images/warning.png" alt="" />
</div>
<div class="text">
{{
......@@ -702,7 +702,7 @@ onMounted(() => {
.icon1 {
width: 19px;
height: 20px;
background-image: url("./assets/ai.png");
background-image: url("../assets/ai.png");
background-size: 100% 100%;
flex-shrink: 0;
}
......@@ -730,7 +730,7 @@ onMounted(() => {
.icon2 {
width: 24px;
height: 24px;
background-image: url("./assets/right.png");
background-image: url("../assets/right.png");
background-size: 100% 100%;
}
}
......@@ -1056,7 +1056,7 @@ onMounted(() => {
height: 28px;
text-align: center;
line-height: 28px;
background: url("../../../assets/images/bg3.png");
background: url("../../../../assets/images/bg3.png");
background-size: 100% 100%;
color: rgba(22, 119, 255, 1);
font-family: Microsoft YaHei;
......@@ -1098,7 +1098,7 @@ onMounted(() => {
height: 28px;
text-align: center;
line-height: 28px;
background: url("../../../assets/images/bg2.png");
background: url("../../../../assets/images/bg2.png");
background-size: 100% 100%;
color: rgba(19, 168, 168, 1);
font-family: Microsoft YaHei;
......@@ -1141,7 +1141,7 @@ onMounted(() => {
height: 28px;
text-align: center;
line-height: 28px;
background: url("../../../assets/images/bg1.png");
background: url("../../../../assets/images/bg1.png");
background-size: 100% 100%;
color: rgba(146, 84, 222, 1);
font-family: Microsoft YaHei;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论