Merge branch 'yuanfeng' into '20210819'

Yuanfeng

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

src/pages/index/Left.vue

@@ -99,15 +99,20 @@
                 </vue-seamless-scroll>
             </div>
         </div>
+        <!-- 弹框 -->
+        <popup-frame :visible="visible" :layout="{width: '960px', height: '543px'}" @beforeClose="closePopup">
+            <img src="../../../static/images/index/studentDemeanor.jpg" alt="弹框">
+        </popup-frame>
     </div>
 </template>
 
 <script>
-import TitleLine from '@/components/TitleLine'
-import BarChart from '@/components/echarts/BarChart.vue'
-import PieChart from '@/components/echarts/PieChart.vue'
-import LineChart from '@/components/echarts/LineChart.vue'
-import Swiper from '@/components/Swiper'
+import TitleLine from 'components/TitleLine'
+import BarChart from 'components/echarts/BarChart.vue'
+import PieChart from 'components/echarts/PieChart.vue'
+import LineChart from 'components/echarts/LineChart.vue'
+import Swiper from 'components/Swiper'
+import PopupFrame from 'components/PopupFrame.vue'
 import { swiperSlide } from 'vue-awesome-swiper'
 import utils from 'utils'
 export default {
@@ -119,7 +124,8 @@ export default {
         PieChart,
         LineChart,
         Swiper,
-        swiperSlide
+        swiperSlide,
+        PopupFrame
     },
 
     filters: {
@@ -185,7 +191,9 @@ export default {
                 step: 0.35,
                 singleHeight: 50
             },
-            greatKey: 0
+            greatKey: 0,
+            // 弹框是否显示
+            visible: false
         }
     },
 
@@ -385,6 +393,11 @@ export default {
         // 打开学员风采弹框
         openStudent (index) {
             console.log(index)
+            this.visible = true
+        },
+        // 关闭弹框
+        closePopup (data) {
+            this.visible = data
         },
         // 把数组中的key转成name
         formatArr (arr) {