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" style="z-index:999">
+         aria-labelledby="myModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-sm">
             <div class="modal-content">
                 <div class="modal-header">