dever há 4 anos atrás
pai
commit
501a8dd616

+ 1 - 1
app/collection/database/function.php

@@ -33,7 +33,7 @@ return array
     # 显示给用户看的名称
     'lang' => '功能设置',
     'menu' => false,
-    'check' => 'type',
+    'check' => 'info_id,type',
     # 数据结构
     'struct' => array
     (

+ 2 - 2
app/collection/lib/Content.php

@@ -70,10 +70,10 @@ class Content
             if ($page && $page['desc']) {
                 $result[$i] = $result[0];
                 if ($page['desc_end']) {
-                    $result[$i]['name'] .= ' 已完结';
+                    //$result[$i]['name'] .= ' 已完结';
                     $result[$i]['desc'] = $page['desc_end'];
                 } else {
-                    $result[$i]['name'] .= ' 连载中';
+                    //$result[$i]['name'] .= ' 连载中';
                 }
             }
 		}

+ 8 - 1
app/collection/src/Api.php

@@ -229,7 +229,7 @@ class Api extends Core
         $data['times_id'] = $this->times;
         # 获取用户信息
         $data['user'] = $this->user;
-
+        $data['info'] = Dever::db('collection/info')->one($this->id);
         # 获取每个模块
         $data['items'] = Dever::load('collection/lib/content')->getList($this->id, $this->page_id);
         # 滑动到多少时,加载下一页
@@ -523,4 +523,11 @@ class Api extends Core
 
         return $where;
     }
+
+    public function video()
+    {
+        $link = Dever::input('link');
+
+        return Dever::qqvideo($link);
+    }
 }

+ 1 - 1
app/content/database/video_comment.php

@@ -97,7 +97,7 @@ return array
             'desc'      => '上传点播视频',
             'match'     => 'is_string',
             'update'    => 'upload',
-            'key'       => '3',
+            'key'       => '5',
             'place'     => '150',
             'upload'    => 'qiniu',
             'large'     => true,

+ 18 - 1
app/content/database/video_short.php

@@ -28,6 +28,12 @@ $bgcolor_type = array
     2 => '不设置背景颜色',
 );
 
+$type = array
+(
+    1 => '竖屏',
+    2 => '横屏',
+);
+
 return array
 (
 	# 表名
@@ -91,6 +97,17 @@ return array
 			//增加预览
 			'preview'	=> true,
 		),
+
+        'type'     => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '展示类型',
+            'default'   => '1',
+            'desc'      => '展示类型',
+            'match'     => 'is_numeric',
+            'update'    => 'radio',
+            'option'    => $type,
+        ),
 		
 		'pic'		=> array
 		(
@@ -113,7 +130,7 @@ return array
             'desc'      => '上传点播视频',
             'match'     => 'is_string',
             'update'    => 'upload',
-            'key'       => '3',
+            'key'       => '5',
             'place'     => '150',
             'upload'    => 'qiniu',
             'large'     => true,

+ 1 - 1
config/base.php

@@ -1,7 +1,7 @@
 <?php
 $config['base'] = array
 (
-	'name' => '幻境',
+	'name' => '神境~云店',
 	'version' => '1.0.0 Beta',
 
     # 设置分类组件中的栏目下的分类为系统使用的主分类