Merge branch 'yuanfeng' into '20210819'

update

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

src/pages/index/Left.vue

@@ -81,6 +81,7 @@
                         <img :src="item.iconUrl" alt="照片"  @click="openStudent(index)">
                         <p>{{item.name}}</p>
                         <p>{{item.desc}}</p>
+                        <p>{{item.position}}</p>
                     </swiper-slide>
                 </swiper>
             </div>
@@ -101,7 +102,7 @@
         </div>
         <!-- 弹框 -->
         <popup-frame :visible="visible" :layout="{width: '960px', height: '540px'}" @beforeClose="closePopup">
-            <img src="../../../static/images/index/studentDemeanor.jpg" alt="弹框">
+            <img :src="'../../../static/images/index/studentDemeanor' + picIndex + '.png'" alt="弹框">
         </popup-frame>
     </div>
 </template>
@@ -191,7 +192,8 @@ export default {
             },
             greatKey: 0,
             // 弹框是否显示
-            visible: false
+            visible: false,
+            picIndex: 1
         }
     },
 
@@ -390,7 +392,7 @@ export default {
         },
         // 打开学员风采弹框
         openStudent (index) {
-            console.log(index)
+            this.picIndex = index + 1
             this.visible = true
         },
         // 关闭弹框
@@ -416,7 +418,6 @@ export default {
 
 <style lang="less" scoped>
     .managePlatform-left {
-        padding-top: 14px;
         .partTitle {
             font-size: 18px;
             font-family: Microsoft YaHei;
@@ -580,19 +581,18 @@ export default {
                     .swiper-slide {
                         cursor: pointer;
                         text-align: center;
-                        .img {
-                            width: 88px;
-                            height: 88px;
+                        img {
+                            width: 84px;
+                            height: 84px;
                             border-radius: 50%;
                         }
                         p {
-                            font-size: 14px;
+                            font-size: 13px;
                             font-family: Microsoft YaHei;
                             font-weight: 400;
                             color: #FFFFFF;
                             line-height: 20px;
-                            margin-top: 10px;
-                            &:nth-child(3) {
+                            &:nth-child(1) {
                                 margin-top: 5px;
                             }
                         }