Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php

src/frontend/web/js/home/components/video-play.vue

@@ -81,7 +81,7 @@
         </div>
     </div>
     <div v-if="!coursewareInfo.isGuest" class="modal fade" id="pay" tabindex="-1" role="dialog"
-         aria-labelledby="myModalLabel" aria-hidden="true">
+         aria-labelledby="myModalLabel" aria-hidden="true" style="z-index:999">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <div class="modal-header">

src/frontend/web/js/home/components/video.vue

@@ -99,7 +99,8 @@
                     myPlayer.on('ended', function () {
                         layer.confirm('试看已结束，购买后查看完整版课程？', {
                             btn: ['立即购买'] //按钮
-                        }, function () {
+                        }, function (index) {
+                            layer.close(index);
                             self.pay();
                         });
                     });