冲突

Your Name

2022-08-17 2475c65a3c091cee4fe48f49e0f53697403750df

 src/views/newHome/index.vue

@@ -424,16 +424,12 @@
                    font-size: 28px;
                    line-height: 34px;
                    height: 40%;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                    color: #072270;
                }
                .enTit{
                    font-size: 18px;
                    line-height: 20px;
                    color: #072270;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                }

                .iconImg {
@@ -475,8 +471,6 @@
                    font-size: 34px;
                    line-height: 42px;
                    height: 40%;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                    letter-spacing: 1px;
                    color: #072270;
                    margin-bottom: 12px;
@@ -485,8 +479,6 @@
                    font-size: 22px;
                    line-height: 24px;
                    color: #072270;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                }
            }
            .bgImg1 {
@@ -529,16 +521,12 @@
                    font-size: 26px;
                    line-height: 30px;
                    height: 40%;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                    color: #072270;
                    margin-bottom: 2px;
                }
                .enTit{
                    font-size: 14px;
                    color: #072270;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                }

                .iconImg {
@@ -580,8 +568,6 @@
                    font-size: 28px;
                    line-height: 36px;
                    height: 40%;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                    letter-spacing: 1px;
                    color: #072270;
                    margin-bottom: 12px;
@@ -589,8 +575,6 @@
                .enTit1{
                    font-size: 16px;
                    color: #072270;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                }
            }
            .bgImg1 {
@@ -630,16 +614,12 @@
                .itemTit {
                    font-size: 18px;
                    line-height: 22px;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                    color: #072270;
                }
                .enTit{
                    font-size: 12px;
                    line-height: 14px;
                    color: #072270;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                }

                .iconImg {
@@ -680,8 +660,6 @@
                    font-size: 24px;
                    line-height: 36px;
                    height: 40%;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                    letter-spacing: 1px;
                    color: #072270;
                    margin-bottom: 12px;
@@ -689,8 +667,6 @@
                .enTit1{
                    font-size: 14px;
                    color: #072270;
                    font-family: 'PingFang SC';
                    font-weight: 600;
                }
            }
            .bgImg1 {
@@ -805,7 +781,7 @@
        height: 100%;
        z-index: 99;
        background: url('../../assets/newMenu/leftbg.png') no-repeat center;
        background-size: 100% auto;
        background-size: 100% 100%;
    }
    .topCont{
        position: absolute;