Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/course/Tpl/default/Video/view_w3g.html

apps/course/Tpl/default/Video/view_w3g.html

@@ -14,7 +14,7 @@
 	<div class="layout_v">
 		<van-sticky>
 			<div class="course_detail_video_container">
-
+				
 			</div>
 		</van-sticky>
 	</div>
@@ -25,9 +25,9 @@
 	<div class="fixed_bottom_bar">
 		<div class="layout_v">
 			<template v-if="bought">
-
+				
 			</template>
-
+			
 			<template v-else>
 				<span class="text_14_600 color_FF3B3B">
 					<php> if($mybuy or $data['is_buy'] or $data['is_charge'] or $data['mz_price']['price'] == 0) { </php>
@@ -43,7 +43,7 @@
 	</div>
 </div>
 
-<div class="body">
+<div class="body"> 
     <div class="classtop">
         <div class="img-box">
             <img src="{:getCover($data['cover'] ,580 , 320 )}" alt="" />
@@ -51,7 +51,7 @@
                 <p class="shareP">分享</p>
             </i>
         </div>
-
+        
         <php>if($course_event){</php><include file="./event_w3g" /><php>}</php>
         <div class="info">
             <div class="newbanben">
@@ -81,7 +81,7 @@
 					</div>
 				</div>
                 <php>}</php>
-
+				
                 <div class="newbanben-info">
                     <p class="newbb-renshu">
                         <span>{$data['video_order_count']}</span>人在学
@@ -198,7 +198,7 @@
                                         <php>if($vo1['is_free'] == 1){</php>
                                             <div class="mone"><p class="page1">免费</p></div>
                                         <php>}</php>
-
+                                        
                                         <if condition="$data['is_order'] eq 1 and $vo1['lock'] neq 1">
                                             <img src="__APP__/icon/lock.png" class="h5key">
                                         </if>
@@ -324,7 +324,8 @@
 			}
 		},
 		created:function(){
-			console.log("{$data}")
+			let c = "{$video_title}";
+			console.log(c)
 		},
 		computed: {
 			shareIcon: function() {
@@ -643,7 +644,7 @@
             if (data.status == 1) {
                 var url = '';
                 var pay_url = "{$pay_url}";
-
+                
                 if(asb == 0){
                     url = "{:U('course/PayVideo/index',['vst'=>$pay_url, 'asb'=>$jmasb['one']])}";
                 }else if(asb == 1){
@@ -680,10 +681,10 @@
             });
             return false;
         }
-    }
+    }     
     function shijian2(){
         console.log('HHH')
-    }
+    } 
     function setFollow(uid, follow) {
         if (mid <= 0) {
             ui.confirm('请先登录', {
@@ -904,7 +905,7 @@
         noSwipingSelector: '.swiper-slide',
         preventInteractionOnTransition : false
     });
-
+    
 </script>
 <script type="text/javascript" src="__THEME__/js/lazyload.js"></script>