Merge branch 'master' of https://github.com/visuddhinanda/mint

app/course/course.php

@@ -46,11 +46,8 @@ echo '<div class="summary"  style=""><button>关注</button><button>报名</butt
 echo "</div>";
 echo '</div>';
 
-echo "<div class='index_inner'>";
+echo "<div  class='index_inner'>";
 
-//课程视频
-$query = "select * from lesson where course_id = '{$_GET["id"]}'   limit 0,100";
-$fAllLesson = PDO_FetchAll($query);
 echo '<div class="card" style="margin:1em;">';
     echo '<div class="title">';
     echo '简介';
@@ -66,54 +63,103 @@ echo '<div class="card" style="margin:1em;">';
     echo '</div>';   
 echo '</div>';
 
+echo "<div id='lesson_list'>";
+//课程视频
+$query = "select * from lesson where course_id = '{$_GET["id"]}'   limit 0,100";
+$fAllLesson = PDO_FetchAll($query);
+foreach($fAllLesson as $row){
+
+}
+
+echo "</div>";
+
+?>
+</div>
+<script src="../public/js/marked.js"></script>
+<script>
+    $("#main_video_win").height($("#main_video_win").width()*9/16);
+
+    $.get("../course/lesson_list.php",
+  {
+    id:"<?php echo $_GET["id"]; ?>"
+  },
+  function(data,status){
+      let arrLesson = JSON.parse(data);
+      let html="";
+    for(const lesson of  arrLesson){
+        html+= '<div class="card" style="display:flex;margin:1em;padding:10px;">';
+
+        html+= '<div style="flex:7;max-width: 80%;">';
+        html+= '<div class="pd-10">';
+        html+= '<div class="title" style="padding-bottom:5px;font-size:100%;font-weight:600;">'+lesson["title"]+'</div>';
+        let summary = "";
+        try{
+            summary = marked(lesson["summary"]);
+        }
+        catch{
+
+        }
+        html+= '<div class="summary"  style="padding-bottom:5px;">'+summary+'</div>';
+        let live = "";
+        try{
+            live = marked(lesson["live"]);
+        }
+        catch{
 
-    foreach($fAllLesson as $row){
-        echo '<div class="card" style="display:flex;margin:1em;padding:10px;">';
-
-        echo '<div style="flex:7;">';
-        echo '<div class="pd-10">';
-        echo '<div class="title" style="padding-bottom:5px;font-size:100%;font-weight:600;">'.$row["title"].'</div>';
-        echo '<div class="summary"  style="padding-bottom:5px;">'.$row["summary"].'</div>';
-        echo '<div class="summary"  style="padding-bottom:5px;">'.$row["live"].'</div>';
-        echo '<div class="summary"  style="padding-bottom:5px;">'.$row["replay"].'</div>';
-        echo '<div class="summary"  style="padding-bottom:5px;">'.$row["attachment"].'</div>';
-        echo '</div>'; 
-        echo '</div>';
-
-        echo '<div style="flex:3;max-width:15em;">';
-        echo '<div >开始：'.date("Y/m/d h:ia",$row["date"]/1000) .'</div>';
-        $dt = $row["duration"]/60;
-        $sdt = "";
-        if($dt>59){
-            $sdt .= floor($dt/60)."小时";
         }
-        $m = ($dt %60);
-        if($m>0){
-            $sdt .=($dt %60)."分钟";
+        html+= '<div class="summary"  style="padding-bottom:5px;">'+live+'</div>';
+        let replay = "";
+        try{
+            replay = marked(lesson["replay"]);
         }
-        echo "<div >持续：{$sdt}</div>";
-        $now = mTime();
-        $lesson_time="";
-        if($now<$row["date"]){
-            $lesson_time = "尚未开始";
+        catch{
+
         }
-        else if($now>$row["date"] && $now<($row["date"]+$dt*1000)){
-            $lesson_time = "正在进行";
+        html+= '<div class="summary"  style="padding-bottom:5px;">'+replay+'</div>';
+        let attachment = "";
+        try{
+            attachment = marked(lesson["attachment"]);
         }
-        else{
-            $lesson_time = "已经结束";
+        catch{
+
         }
-        echo '<div ><span class="lesson_status">'.$lesson_time.'</span></div>';
-        echo '</div>';
+        html+= '<div class="summary"  style="padding-bottom:5px;">'+attachment+'</div>';
+        html+= '</div>'; 
+        html+= '</div>';
 
-        echo '</div>';
-    }
+        html+= '<div style="flex:3;max-width:15em;">';
+        /*
+        html+= '<div >开始：'+date("Y/m/d h:ia",lesson["date"]/1000) +'</div>';
+        let dt = lesson["duration"]/60;
+        let dt sdt = "";
+        if(dt>59){
+            sdt .= floor(dt/60)."小时";
+        }
+        let m = (dt %60);
+        if(m>0){
+            sdt .=(dt %60)."分钟";
+        }
+        html+= "<div >持续：{$sdt}</div>";
+        let now = mTime();
+        let lesson_time="";
+        if(now<lesson["date"]){
+            lesson_time = "尚未开始";
+        }
+        else if(now>lesson["date"] && now<(lesson["date"]+dt*1000)){
+            lesson_time = "正在进行";
+        }
+        else{
+            lesson_time = "已经结束";
+        }
+        html+= '<div ><span class="lesson_status">'+lesson_time+'</span></div>';
+*/        
+        html+= '</div>';
 
+        html+= '</div>';
 
-?>
-</div>
-<script>
-    $("#main_video_win").height($("#main_video_win").width()*9/16);
+    }
+    $("#lesson_list").html(html);
+  });
 </script>
 <?php
 include "../pcdl/html_foot.php";

app/course/lesson_list.php

@@ -0,0 +1,13 @@
+<?php
+//
+
+require_once "../path.php";
+require_once "../public/_pdo.php";
+
+global $PDO;
+PDO_Connect("sqlite:"._FILE_DB_COURSE_);
+$query = "select * from lesson where course_id = '{$_GET["id"]}'   limit 0,100";
+$fAllLesson = PDO_FetchAll($query);
+echo json_encode($fAllLesson, JSON_UNESCAPED_UNICODE);
+
+?>

app/course/my_course_list.php

@@ -52,17 +52,6 @@ foreach ($covers as $value) {
 foreach($Fetch as $row){
     echo '<div class="file_list_row">';
 
-    
-    $coverlink = $cover["{$row["cover"]}"];
-    echo '<div class="v-cover" style="flex:2;">';
-    if(substr($coverlink,0,6)=="media:"){
-        echo '<img src="'._DIR_USER_IMG_LINK_.'/'.substr($coverlink,6).'" width="100%" height="auto">';
-    }
-    else{
-        echo '<img src="'.$coverlink.'" width="50" height="50">';
-    }
-    echo '</div>';
-
     echo '<div class="pd-10" style="flex:8;padding:5px;">';
     echo '<div class="title" style="padding-bottom:5px;"><a href="../course/my_course_index.php?course='.$row["id"].'">'.$row["title"].'</a></div>';
     echo '<div class="summary"  style="padding-bottom:5px;">'.$row["subtitle"].'</div>';
@@ -70,7 +59,6 @@ foreach($Fetch as $row){
     echo '<div class="author"  style="padding-bottom:5px;">主讲：'.$row["teacher"].'</div>';
     echo '</div>';
     
-
     echo '</div>';
 }