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

app/content/lib/News.php

@@ -78,14 +78,14 @@ class News
         }
         $info['pdate_s'] = date('Y/m/d', $info['pdate']);
 
-        if ($info['video']) {
+        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;
             $info['video_link'] = isset($info['video_info'][0]) ? $info['video_info'][0] : '';
         } else {
             $info['video_info'] = '';
             $info['video_id'] = '';
-            $info['video_link'] = '';
+            $info['video_link'] = $info['video'];
         }
 
         $info['sname'] = $info['name'] . '<br />' . $info['desc'];

main/template/xuniren/activity.php

@@ -14,29 +14,29 @@ $view
     'main/content.news|type=4',
     array
     (
-        'img' => array
+        'self' => array
         (
-            'src' => '$v.small_pic',
-            'alt' => '$v.name',
-        ),
+            'img' => array
+            (
+                'src' => '$v.small_pic',
+                'alt' => '$v.name',
+            ),
+
+            'p' => array
+            (
+                'html' => '$v.info',
+            ),
+
+            'span' => array
+            (
+                'html' => '$v.pdate_s',
+            ),
 
-        'a|0' => array
-        (
             'href' => '$v.link',
             'title' => '$v.name',
-            'html' => '$v.name ."<br/>". $v.desc',
+            'h3' => '$v.sname',
         ),
         
-
-        'p' => array
-        (
-            'html' => '$v.info',
-        ),
-
-        'span' => array
-        (
-            'html' => '$v.pdate_s',
-        ),
     )
 )
 ->fetch('.activity-module@style', 'main/content.news?type=4', 'none')

main/template/xuniren/article.php

@@ -14,7 +14,7 @@ $view
 
 ->fetch(array('.article-wrapper img@src', 0), 'main/content.view#pic')
 
-->fetch(array('.article-content article', 0), 'main/content.view#content')
+->fetch(array('.article-content .article', 0), 'main/content.view#content')
 
 # 标签
 ->fetch('.tags h5', 'main/content.view#tag_name')

main/template/xuniren/video.php

@@ -9,7 +9,7 @@ $view
 
 ->fetch('.videoposter img@src', 'main/content.home_video_first#pic')
 ->fetch('.videoplayer img@src', 'main/content.home_video_first#pic')
-->fetch(array('.icon-play@data-vid=', 0), 'main/content.home_video_first#video_id')
+->fetch(array('.icon-play@data-url', 0), 'main/content.home_video_first#video_link')
 
 ->fetch(array('h3@html', 0), 'main/content.home_video_first#sname')
 ->fetch(array('p@html', 0), 'main/content.home_video_first#info')