Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
a0049873 2022-06-14 11:50:33 +08:00
commit 3b3459206d
4 changed files with 152 additions and 152 deletions

View File

@ -24,8 +24,8 @@
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="2069"
width="40"
height="40"
width="0.4rem"
height="0.4rem"
@click="goToSgc"
>
<path
@ -36,7 +36,7 @@
</svg>
<!-- <a-avatar shape="square" size="large" /> -->
</a-badge>
<a-badge :count="mynoticeNum" style="margin-left: 20px">
<a-badge :count="mynoticeNum" style="margin-left: .2rem">
<svg
t="1654051054113"
class="icon2"
@ -44,8 +44,8 @@
version="1.1"
xmlns="http://www.w3.org/2000/svg"
p-id="2187"
width="35"
height="35"
width="0.35rem"
height="0.35rem"
>
<path
d="M544 161.536a330.666667 330.666667 0 0 1 298.666667 329.130667h-0.341334c0.213333 1.493333 0.341333 2.986667 0.341334 4.565333v219.434667h39.68a32 32 0 0 1 0 64h-212.053334a160 160 0 0 1-316.586666 0H141.909333a32 32 0 1 1 0-64h39.424v-219.434667c0-1.578667 0.128-3.072 0.341334-4.565333H181.333333a330.666667 330.666667 0 0 1 298.666667-329.130667V128a32 32 0 1 1 64 0v33.536z m-298.666667 553.130667h533.333334v-219.434667c0-1.578667 0.128-3.072 0.341333-4.565333h-0.341333a266.666667 266.666667 0 1 0-533.333334 0h-0.341333c0.213333 1.493333 0.341333 2.986667 0.341333 4.565333v219.434667z m359.765334 64H418.901333a96 96 0 0 0 186.197334 0z"
@ -253,29 +253,29 @@
src: url('~@/assets/newHome/font/header-typeface.ttf');
}
.home-header {
height: 64px;
height: .64rem;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
padding: 0 190px;
padding: 0 1.9rem;
background-color: rgba(0, 0, 25, 0.7);
position: fixed;
z-index: 1000;
top: 0;
div {
color: #fff;
font-size: 16px;
font-size: .16rem;
}
.name {
font-size: 22px;
font-size: .22rem;
font-family: header-typeface;
margin-right: 20px;
margin-right: .2rem;
}
.nav {
width: 120px;
height: 64px;
line-height: 64px;
width: 1.2rem;
height: .64rem;
line-height: .64rem;
text-align: center;
}
.nav:hover {
@ -288,32 +288,32 @@
color: #fff !important;
}
.info {
width: 200px;
margin-left: 20px;
width: 2rem;
margin-left: .2rem;
display: flex;
justify-content: center;
.img {
width: 30px;
height: 30px;
border-radius: 10px;
width: .3rem;
height: .3rem;
border-radius: .1rem;
background: url('~@/assets/newHome/user.png') no-repeat;
background-size: 100%;
}
span {
height: 30px;
line-height: 30px;
margin-left: 8px;
margin-right: 6px;
font-size: 16px;
height: .3rem;
line-height: .3rem;
margin-left: .08rem;
margin-right: .06rem;
font-size: .16rem;
}
.name {
max-width: 75px;
max-width: .75rem;
overflow: hidden;
}
.out {
cursor: pointer;
padding: 0 16px;
border-left: 1px solid #666;
padding: 0 .16rem;
border-left: .01rem solid #666;
}
}
}
@ -355,41 +355,41 @@
}
}
.mynotice {
width: 250px;
height: 300px;
width: 2.5rem;
height: 3rem;
background: #eee;
border-radius: 5px;
border-radius: .05rem;
position: absolute;
top: 45px;
right: 310px;
top: .45rem;
right: 3.1rem;
overflow-y: scroll;
}
.mynotice::-webkit-scrollbar {
display: none;
}
:deep(.ant-list-item) {
border-bottom: 1px solid #ccc;
border-bottom: .01rem solid #ccc;
}
:deep(.ant-list-item-meta-title) {
display: flex;
justify-content: space-around;
align-items: center;
padding: 0 5px;
padding: 0 .05rem;
a {
width: 150px;
width: 1.5rem;
// ...
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
button {
width: 70px;
height: 25px;
width: .7rem;
height: .25rem;
display: flex;
justify-content: center;
align-items: center;
span {
font-size: 10px;
font-size: .1rem;
}
}
}

View File

@ -116,28 +116,28 @@
src: url('~@/assets/newHome/font/header-typeface.ttf');
}
.home-header {
height: 64px;
height: .64rem;
width: 100%;
display: flex;
justify-content: center;
align-items: center;
padding: 0 210px;
padding: 0 2.1rem;
background-color: rgba(0, 0, 25, 0.7);
position: fixed;
z-index: 1000;
div {
color: #fff;
font-size: 16px;
font-size: .16rem;
}
.name {
font-size: 22px;
font-size: .22rem;
font-family: header-typeface;
margin-right: 20px;
margin-right: .2rem;
}
.nav {
width: 144px;
height: 64px;
line-height: 64px;
width: 1.44rem;
height: .64rem;
line-height: .64rem;
text-align: center;
}
.nav:hover {
@ -150,32 +150,32 @@
color: #fff !important;
}
.info {
width: 200px;
margin-left: 20px;
width: 2rem;
margin-left: .2rem;
display: flex;
justify-content: center;
.img {
width: 30px;
height: 30px;
border-radius: 10px;
width: .3rem;
height: .3rem;
border-radius: .1rem;
background: url('~@/assets/newHome/user.png') no-repeat;
background-size: 100%;
}
span {
height: 30px;
line-height: 30px;
margin-left: 8px;
margin-right: 6px;
font-size: 16px;
height: .3rem;
line-height: .3rem;
margin-left: .08rem;
margin-right: .06rem;
font-size: .16rem;
}
.name {
max-width: 75px;
max-width: .75rem;
overflow: hidden;
}
.out {
cursor: pointer;
padding: 0 16px;
border-left: 1px solid #666;
padding: 0 .16rem;
border-left: .01rem solid #666;
}
}
}

View File

@ -114,7 +114,7 @@
display: flex;
justify-content: center;
background: url('~@/assets/newHome/recommendation-ability-bg.png') no-repeat;
background-size: contain;
background-size: cover;
.recommendation-ability-son {
width: 13rem;
left: 50%;

View File

@ -254,13 +254,13 @@
position: fixed;
left: 50%;
top: 50%;
margin-left: -260px;
margin-top: -144px;
font-size: 14px;
margin-left: -2.6rem;
margin-top: -1.44rem;
font-size: .14rem;
font-weight: 500;
.ant-radio-inner {
height: 16px;
width: 16px;
height: .16rem;
width: .16rem;
}
.ant-radio-inner::after {
background-color: unset;
@ -269,24 +269,24 @@
background-position: center;
}
.ant-modal-content {
border-radius: 10px;
border-radius: .1rem;
.ability-to-type,
.component-type {
display: flex;
margin-top: 20px;
margin-top: .2rem;
.title {
white-space: nowrap;
margin-right: 20px;
margin-right: .2rem;
display: flex;
align-items: center;
height: 26px;
height: .26rem;
}
.content {
width: 100%;
.ant-radio-group {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-gap: 15px;
grid-gap: .15rem;
}
}
}
@ -295,15 +295,15 @@
display: grid;
grid-template-columns: 1fr 1fr 1fr;
div {
margin-right: 15px;
margin-right: .15rem;
cursor: pointer;
font-size: 14px;
width: 90px;
height: 26px;
border-radius: 13px;
font-size: .14rem;
width: .9rem;
height: .26rem;
border-radius: .13rem;
color: #333333;
background: #f5f5f5;
border: 1px #cccccc solid;
border: .01rem #cccccc solid;
display: flex;
justify-content: center;
align-items: center;
@ -323,19 +323,19 @@
.ant-modal-footer {
border: 0;
text-align: center;
padding-bottom: 20px;
padding-bottom: .2rem;
button {
margin-right: 20px;
border-radius: 8px;
margin-right: .2rem;
border-radius: .08rem;
}
}
.showBg {
height: 24px;
width: 24px;
height: .24rem;
width: .24rem;
background: url('~@/assets/home/shenqing.png') no-repeat;
background-size: cover;
background-position: center;
margin-right: 10px;
margin-right: .1rem;
}
}
</style>
@ -344,75 +344,75 @@
display: flex;
flex-direction: column;
align-items: center;
padding-bottom: 80px;
padding-top: 78px;
padding-bottom: .8rem;
padding-top: .78rem;
.title {
font-size: 30px;
font-size: .3rem;
font-family: 'convergence-typeface';
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 32px;
margin-bottom: .32rem;
.title-son {
width: 34px;
height: 3px;
width: .34rem;
height: .03rem;
background: #0058e1;
border-radius: 1px;
margin-top: 18px;
border-radius: .01rem;
margin-top: .18rem;
}
}
.content {
width: 1300px;
height: 480px;
width: 13rem;
height: 4.8rem;
display: flex;
padding-left: 20px;
padding-left: .2rem;
.content-empty {
height: 220px;
padding-top: 49px;
height: 2.2rem;
padding-top: .49rem;
}
}
.content > div {
background: #f3f5f9;
border: #eaedf2 1px solid;
border: #eaedf2 .01rem solid;
}
.content > div:hover {
border-radius: 2px;
border: 1px solid #0058e1;
box-shadow: 0px 8px 20px rgba(0, 88, 225, 0.3);
border-radius: .02rem;
border: .01rem solid #0058e1;
box-shadow: 0rem .08rem .2rem rgba(0, 88, 225, 0.3);
}
.content-miaoshui {
display: flex;
flex-direction: column;
padding-top: 20px;
padding-top: .2rem;
align-items: center;
padding-bottom: 10px;
padding-bottom: .1rem;
.content-miaoshui-title {
padding-left: 5px;
padding-right: 5px;
font-size: 18px;
padding-left: .05rem;
padding-right: .05rem;
font-size: .18rem;
font-weight: bold;
height: 30px;
height: .3rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
margin-bottom: 12px;
margin-bottom: .12rem;
word-break: break-all;
}
.content-miaoshui-content {
height: 120px;
width: 298px;
margin: 12px 10px 10px 10px;
height: 1.2rem;
width: 2.98rem;
margin: .12rem .1rem .1rem .1rem;
font-family: text-typeface;
font-size: 14px;
line-height: 20px;
font-size: .14rem;
line-height: .2rem;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 6;
-webkit-box-orient: vertical;
margin-bottom: 12px;
margin-bottom: .12rem;
word-break: break-all;
cursor: pointer;
}
@ -422,18 +422,18 @@
display: flex;
justify-content: space-between;
align-items: bottom;
margin-right: 16px;
margin-left: 16px;
margin-right: .16rem;
margin-left: .16rem;
div:first-child {
margin-left: 16px;
margin-left: .16rem;
}
}
.shijain-content-bootom {
margin-right: 16px;
width: 80px;
height: 24px;
margin-right: .16rem;
width: .8rem;
height: .24rem;
text-align: center;
border: 1px solid #0058e1;
border: .01rem solid #0058e1;
cursor: pointer;
color: #0058e1;
}
@ -441,102 +441,102 @@
background: rgba(0, 88, 225, 0.3);
}
.content > div > div {
height: 240px;
height: 2.4rem;
width: 100%;
}
.one {
height: 240px;
height: 2.4rem;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-size: 100%;
padding-top: 15px;
padding-top: .15rem;
.shijain {
margin-top: 20px;
margin-top: .2rem;
}
:deep(.ant-imag) {
text-align: center;
}
:deep(.ant-image-img) {
height: 210px;
height: 2.1rem;
text-align: center;
justify-content: center;
align-items: center;
width: 100%;
max-width: 298px;
max-width: 2.98rem;
}
}
.bottom {
height: 24px;
font-size: 16px;
width: 100px;
margin-top: 40px;
height: .24rem;
font-size: .16rem;
width: 1rem;
margin-top: .4rem;
cursor: pointer;
text-align: center;
color: #000000;
.gengduo {
display: inline-block;
margin-left: 4px;
width: 10px;
height: 10px;
margin-left: .04rem;
width: .1rem;
height: .1rem;
background: url('~@/assets/newHome/gd2.png') no-repeat;
background-position: center;
}
}
.bottom:hover {
border-radius: 2px;
border-radius: .02rem;
background-color: rgba(1, 102, 255, 0.1);
}
.content > div {
height: 480px;
width: 310px;
margin-right: 20px;
height: 4.8rem;
width: 3.1rem;
margin-right: .2rem;
}
.fixedmount {
height: 150px;
height: 1.5rem;
display: flex;
position: fixed;
bottom: 256px;
right: 190px;
bottom: 2.56rem;
right: 1.9rem;
z-index: 10;
flex-direction: column;
justify-content: space-between;
align-items: center;
}
.fixedmount div {
width: 70px;
height: 70px;
border-radius: 4px;
border: 1px #94aac9 solid;
width: .7rem;
height: .7rem;
border-radius: .04rem;
border: .01rem #94aac9 solid;
display: flex;
flex-direction: column;
// justify-content: center;
align-items: center;
padding-top: 13px;
padding-top: .13rem;
position: relative;
cursor: pointer;
background: #e3edfc;
}
.fixedmount div p:nth-child(2) {
position: absolute;
bottom: 0px;
height: 14px;
font-size: 14px;
line-height: 14px;
bottom: 0rem;
height: .14rem;
font-size: .14rem;
line-height: .14rem;
color: #000000;
// margin-top: 8px;
// margin-top: .08rem;
}
.fixedmount div:nth-child(1) p:nth-child(1) {
height: 24px;
width: 24px;
height: .24rem;
width: .24rem;
background: url('~@/assets/home/shenqing.png') no-repeat;
background-size: cover;
background-position: center;
}
.fixedmount div:nth-child(2) p:nth-child(1) {
height: 24px;
width: 24px;
height: .24rem;
width: .24rem;
background: url('~@/assets/home/shangjia.png') no-repeat;
}
}