Merge branch 'master' of http://git.dever.cc/project/cms

app/content/lib/News.php

@@ -78,6 +78,8 @@ class News
         }
         $info['pdate_s'] = date('Y/m/d', $info['pdate']);
 
+        $info['video_link'] = Dever::url('main/content.video?id=' . $info['id']);
+        /*
         if ($info['video'] && strstr($info['video'], '.qq.com')) {
             $info['video_info'] = Dever::qqvideo($info['video'], 2);
             $info['video_id'] = isset($info['video_info'][1]) ? $info['video_info'][1] : 0;
@@ -87,6 +89,7 @@ class News
             $info['video_id'] = '';
             $info['video_link'] = $info['video'];
         }
+        */
 
         $info['sname'] = $info['name'] . '<br />' . $info['desc'];
 

app/push/lib/Data.php

@@ -100,10 +100,12 @@ class Data
                     }
 
                     if (isset($data['video']) && $data['video']) {
+                        /*
                         $info['video'] = $data['video'];
                         $info['video_info'] = Dever::qqvideo($data['video']);
                         $info['video_id'] = isset($info['video_info'][1]) ? $info['video_info'][1] : 0;
-                        $info['video_link'] = isset($info['video_info'][0]) ? $info['video_info'][0] : '';
+                        */
+                        $info['video_link'] = Dever::url('main/content.video?id=' . $id);
                     }
                 }
             }

main/src/Content.php

@@ -139,8 +139,8 @@ class Content
     # 获取首页专题
     public function home_feature()
     {
-        //$data = Dever::load('push/lib/data')->get('home_feature', '首页专题', 5, '1,2,3,4,5,6,7');
-        $data = false;
+        $data = Dever::load('push/lib/data')->get('home_feature', '首页专题', 5, '1,2,3,4,5,6,7');
+        //$data = false;
         if (!$data) {
             $data = Dever::load('content/lib/news')->getHome(2, 5);
         }
@@ -227,6 +227,42 @@ class Content
         return $data;
     }
 
+    # 获取底层页视频
+    public function view_video()
+    {
+        $data = Dever::load('main/content.view');
+        $result = array();
+        if ($data['video']) {
+            return true;
+        }
+
+        return false;
+    }
+
+    # 获取底层页头部视频
+    public function view_video_1()
+    {
+        $data = Dever::load('main/content.view');
+        $result = array();
+        if ($data['type'] == 3 && $data['video']) {
+            return true;
+        }
+
+        return false;
+    }
+
+    # 获取底层页尾部视频
+    public function view_video_2()
+    {
+        $data = Dever::load('main/content.view');
+        $result = array();
+        if ($data['type'] != 3 && $data['video']) {
+            return true;
+        }
+
+        return false;
+    }
+
     # 获取标签
     public function view_tag()
     {
@@ -459,4 +495,23 @@ class Content
         }
         return $html;
     }
+
+    # 播放视频
+    public function video()
+    {
+        $id = Dever::input('id');
+
+        $data = Dever::db('content/news')->one($id);
+
+        if ($data && isset($data['video']) && $data['video']) {
+            $info['video'] = $data['video'];
+            if (strstr($data['video'], '.qq.com')) {
+                $video_info = Dever::qqvideo($data['video']);
+                $info['video'] = isset($video_info[0]) ? $video_info[0] : '';
+            }
+
+            return $info;
+        }
+        return array();
+    }
 }

main/template/xuniren/article.php

@@ -12,10 +12,23 @@ $view
 ->fetch('.common-tit span', 'main/content.view#sname')
 ->fetch('.common-tit em', 'main/content.view#pdate_string')
 
-->fetch(array('.article-wrapper img@src', 0), 'main/content.view#pic')
+->fetch(array('.article-wrapper img@src', 2), 'main/content.view#pic')
+->fetch(array('.article-wrapper img@style', 2), '<{!Dever::load("main/content.view_video")}>', 'none')
 
 ->fetch(array('.article-content .article', 0), 'main/content.view#content')
 
+->fetch(array('.video-module@style', 0), 'main/content.view_video_1', 'none')
+->fetch(array('.article-wrapper img@src', 0), 'main/content.view#pic')
+->fetch(array('.article-wrapper img@src', 1), 'main/content.view#pic')
+->fetch(array('.icon-play@data-url', 0), 'main/content.view#video_link')
+
+
+->fetch(array('.article-video@style', 0), 'main/content.view_video_2', 'none')
+->fetch(array('.article-wrapper img@src', 0), 'main/content.view#pic')
+->fetch(array('.article-wrapper img@src', 1), 'main/content.view#pic')
+->fetch(array('.icon-play@data-url', 1), 'main/content.view#video_link')
+
+
 # 标签
 ->fetch('.tags h5', 'main/content.view#tag_name')
 ->fetch('.tags@style', 'main/content.view_tag', 'none')

main/template/xuniren/video.php

@@ -24,7 +24,7 @@ $view
     (
         'a|0' => array
         (
-            'href' => '$v.link',
+            'href' => 'javascript:;',
             'title' => '$v.name',
 
             'img' => array
@@ -35,6 +35,11 @@ $view
             'em' => array
             (
                 'class' => 'a iconfont icon-play',
+                'data-title' => '$v.name',
+                'data-subtitle' => '$v.desc',
+                'data-desc' => '$v.info',
+                'data-by' => '$v.pdate_string',
+                'data-url' => '$v.video_link',
             ),
         ),
 
@@ -55,7 +60,7 @@ $view
     (
         'a|1' => array
         (
-            'href' => '$v.link',
+            'href' => 'javascript:;',
             'title' => '$v.name',
 
             'img' => array
@@ -66,6 +71,11 @@ $view
             'em' => array
             (
                 'class' => 'a iconfont icon-play',
+                'data-title' => '$v.name',
+                'data-subtitle' => '$v.desc',
+                'data-desc' => '$v.info',
+                'data-by' => '$v.pdate_string',
+                'data-url' => '$v.video_link',
             ),
         ),