Merge branch 'yangqingjie' into '20210819'

update

See merge request vue-project/liangXing/frontEnd!53

runner @ fe3cb93f

-Subproject commit f4746173cf454453e2895964ec3ed3d6a13d0e42
+Subproject commit fe3cb93fbe4caf5aa09741b53b8e363fcde43fb2

src/pages/index/Left.vue

@@ -587,6 +587,7 @@ export default {
                     .swiper-slide {
                         cursor: pointer;
                         text-align: center;
+                        margin:0 auto;
                         img {
                             width: 84px;
                             height: 84px;

src/pages/login.vue

@@ -3,16 +3,16 @@
     <page-head title="张謇企业家学院管理平台" slot="header" />
     <div class="login-main">
         <!-- 左 -->
-        <div class="left">
-            <div class="left1"></div>
-            <div class="left2"></div>
-            <div class="left3">
-                <div class="title">学院介绍</div>
-                <div class="content">
+        <div class="login-main-left">
+            <div class="login-main-left1"></div>
+            <div class="login-main-left2"></div>
+            <div class="login-main-left3">
+                <div class="login-main-title">学院介绍</div>
+                <div class="login-main-content">
                       <vue-seamless-scroll
                            :data="schoolClass"
                            :class-option="classOption"
-                          class="neirong"
+                          class="login-main-neirong"
                         >
                         <ul>
                             <li v-for="(item, index) in schoolClass" :key="index">
@@ -25,20 +25,20 @@
             </div>
         </div>
         <!-- 中 -->
-        <div class="center">
-            <div class="curr">
+        <div class="login-main-center">
+            <div class="login-main-curr">
                 <div 
-                class="point" 
+                class="login-main-point" 
                 @click="changeUrl" 
                 ></div>
             </div>
-            <div class="active"></div>
-            <div class="xueyuan"></div>
+            <div class="login-main-active"></div>
+            <div class="login-main-xueyuan"></div>
         </div>
         <!-- 右 -->
-        <div class="right">
-            <div class="right1"></div>
-            <div class="right2"></div>
+        <div class="login-main-right">
+            <div class="login-main-right1"></div>
+            <div class="login-main-right2"></div>
         </div>
     </div>
   </div>
@@ -88,40 +88,40 @@ background-size:contain;
         height: 100%;
         margin:0 auto;
         display: flex;
-        .left ,.right{
+        .login-main-left ,.login-main-right{
             margin-left: 20px;
             margin-right: 20px;
             width: 380px;
             height: 100%;
         }
         // 左
-         .left1{
+         .login-main-left1{
             margin-top: 20px;
             height: 445px;
             background:url('../../static/images/login/peixun.png') no-repeat;
             background-size: 360px 425px;
         }
-        .left2{
+        .login-main-left2{
             margin-top: -10px;
             height: 245px;
             background:url('../../static/images/login/56.png') no-repeat;
             background-size: 340px 240px;
         }
-        .left3{
+        .login-main-left3{
             margin-top: 30px;
             width: 100%;
             height: 285px;
-            .title{
+            .login-main-title{
                 height: 17px;
                 font-size: 20px;
                 font-family: Alibaba PuHuiTi 2.0;
                 font-weight: normal;
-                color: rgba(255, 255, 255, 1);
+                color: rgba(255, 255, 255, .8);
                 line-height: 24px;
                 text-align: center;
                 background: url('../../static/images/login/9.png') 8px 14px no-repeat;
             }
-            .content{
+            .login-main-content{
                 width: 340px;
                 height: 215px;
                 margin-top: 20px;
@@ -129,7 +129,7 @@ background-size:contain;
                 background:url('../../static/images/login/312.png') no-repeat;
                 background-size: 336px 213px;
                 display: flex;
-                .neirong{
+                .login-main-neirong{
                     width: 300px;
                     height: 160px;
                     margin: auto;
@@ -154,13 +154,13 @@ background-size:contain;
             }
         }
         // 中
-        .center{
+        .login-main-center{
             width: 1290px;
             height: 100%;
             margin-left: 20px;
             margin-right: 20px;
             position: relative;
-            .curr {
+            .login-main-curr {
                 width: 100%;
                 height: 651px;
                 // position: absolute;
@@ -168,7 +168,7 @@ background-size:contain;
                 margin-left: 80px;
                 background:url('../../static/images/login/60.png') no-repeat center;   
                 animation: flashAni  4s infinite normal;  
-                    .point{
+                    .login-main-point{
                     width: 600px;
                     height: 600px;
                     border-radius: 50%;
@@ -189,7 +189,7 @@ background-size:contain;
                 }
             }
             // 放大放小图
-            .active{
+            .login-main-active{
             width: 300px;
             height: 200px;
             position: absolute;
@@ -210,7 +210,7 @@ background-size:contain;
                    transform:scale(1);
                 }
             }
-            .xueyuan{
+            .login-main-xueyuan{
                 width: 910px;
                 height: 160px;
                 position: absolute;
@@ -221,13 +221,13 @@ background-size:contain;
             }
         }
         // 右
-        .right1{
+        .login-main-right1{
             margin-top: 20px;
             height: 300px;
             background:url('../../static/images/login/shimingyuanjing.png') no-repeat;
             background-size: 100% 100%;
         }
-         .right2{
+         .login-main-right2{
              margin-top: 40px;
             margin-bottom: 230px;
             height: 430px;