edit

audit/database/data.php

@@ -196,6 +196,7 @@ return array
 			(
 				'cate_id' => 'yes',
 				'type' => 'yes',
+				'type_no' => array('yes-type', '!='),
 				'audit' => 2,
 				'status' => 2,
 				'state' => 1,

main/database/config.php

@@ -7,6 +7,12 @@ $ios_pay = array
 	3 => '开启小程序支付',
 );
 
+$video = array
+(
+	1 => '显示',
+	2 => '不显示',
+);
+
 return array
 (
 	# 表名
@@ -150,7 +156,7 @@ return array
 			'name' 		=> '公众号名称',
 			'default' 	=> '',
 			'desc' 		=> '公众号名称',
-			'match' 	=> 'is_string',
+			'match' 	=> 'option',
 			'update'	=> 'text',
 		),
 
@@ -164,6 +170,34 @@ return array
 			'update'	=> 'text',
 		),
 
+		'hr5'		=> array
+		(
+			'name' 		=> '视频设置',
+			'class'		=> '',//本项必须填写
+			'attr'		=> '',
+		),
+
+		'video'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '是否显示视频',
+			'default' 	=> '1',
+			'desc' 		=> '是否显示视频',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'radio',
+			'option'	=> $video,
+		),
+
+		'version'		=> array
+		(
+			'type' 		=> 'varchar-100',
+			'name' 		=> '版本号',
+			'default' 	=> '',
+			'desc' 		=> '版本号',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+		),
+
 		'cdate'		=> array
 		(
 			'type' 		=> 'int-11',

main/src/Content.php

@@ -113,6 +113,11 @@ class Content extends Core
             $where['type'] = $type;
         }
 
+        $config = Dever::db('main/config')->one();
+        if (isset($config['video']) && $config['video'] == 2) {
+            $where['type_no'] = 2;
+        }
+
     	$data = Dever::db('audit/data')->getAll($where);
         if ($data) {
             foreach ($data as $k => $v) {

push/database/data.php

@@ -273,6 +273,7 @@ return array
             'option' => array
             (
                 'info_id' => 'yes',
+                'type_no' => array('yes-type', '!='),
                 'state' => 1,
             ),
             'type' => 'all',
@@ -288,6 +289,7 @@ return array
             'option' => array
             (
                 'info_id' => 'yes',
+                'type_no' => array('yes-type', '!='),
                 'state' => 1,
             ),
             'type' => 'all',

push/lib/Data.php

@@ -27,10 +27,22 @@ class Data
             if ($limit > 0) {
                 $info['num'] = $limit;
             }
+
+            $where = array();
+            $where['info_id'] = $info['id'];
+
+            
+            $config = Dever::db('main/config')->one();
+            if (isset($config['video']) && $config['video'] == 2) {
+                $where['type_no'] = 2;
+            }
+
             if ($page) {
-                $data = Dever::db('push/data')->getAllPage(array('info_id' => $info['id'], 'page' => array($info['num'], 'list')));
+                $where['page'] = array($info['num'], 'list');
+                $data = Dever::db('push/data')->getAllPage($where);
             } else {
-                $data = Dever::db('push/data')->getAll(array('info_id' => $info['id'], 'limit' => '0,' . $info['num']));
+                $where['limit'] = '0,' . $info['num'];
+                $data = Dever::db('push/data')->getAll($where);
             }
 
             if ($data) {