Merge remote-tracking branch 'origin/dev' into dev

src/frontend/web/js/home/components/course-lists.vue

@@ -115,7 +115,7 @@
         mounted()
         {
             var self = this;
-            this.nextTick(function(){
+            this.$nextTick(function(){
                 self.getLists(self.classId, self.page, self.num);
             });
         }

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

@@ -51,7 +51,7 @@
         },
         methods: {
             pay(){
-                this.$emit('payClick');
+                this.$emit('pay-click');
             }
         },
         mounted(){