dever 6 years ago
parent
commit
a1ad927a39
3 changed files with 39 additions and 7 deletions
  1. 5 0
      audit/database/data.php
  2. 22 5
      journal/database/info.php
  3. 12 2
      main/src/Preview.php

+ 5 - 0
audit/database/data.php

@@ -155,6 +155,11 @@ return array
 		'edit' => false,
 		'insert' => false,
 		'mul' => true,
+
+		'list_button' => array
+		(
+			'edit' => array('预览', Dever::url('main/preview.get?audit=1')),
+		),
 	),
 
 	# request 请求接口定义

+ 22 - 5
journal/database/info.php

@@ -21,6 +21,12 @@ $share = array
 	2 => '不显示',
 );
 
+$buy = array
+(
+	1 => '收费',
+	2 => '免费',
+);
+
 $page = 15;
 return array
 (
@@ -270,6 +276,17 @@ return array
 			'option'	=> $share,
 		),
 
+		'buy'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '小刊是否收费',
+			'default' 	=> '1',
+			'desc' 		=> '小刊是否收费',
+			'match' 	=> 'option',
+			'update'	=> 'radio',
+			'option'	=> $buy,
+		),
+
 		'reorder'		=> array
 		(
 			'type' 		=> 'int-11',
@@ -322,14 +339,14 @@ return array
 		# 列表
 		'list_button' => array
 		(
+			'edit' => array('预览', Dever::url('main/preview.get?type=4')),
+			'br1' => array('<br />'),
 			'list' => array('内页管理', '"content&search_option_info_id={id}&oper_parent=info&page_type=1"' , '{audit} == 1'),
-			'br' => array('<br />'),
+			'br2' => array('<br />'),
 			'add' => array('购买设置', '"buy&project=journal&search_option_info_id={id}&oper_parent=info&oper_project=journal&oper_save_jump=info&where_id={id}"', '{audit} == 1'),
 			'add1' => array('活动设置', '"active&project=journal&search_option_info_id={id}&oper_parent=info&oper_project=journal&oper_save_jump=info&where_id={id}"', '{audit} == 1'),
-			'br1' => array('<br />'),
-			'list1' => array('购买本数管理', '"buy_num&search_option_info_id={id}&oper_parent=info"' , '{audit} == 1'),
-			'br2' => array('<br />'),
-			'edit' => array('预览', Dever::url('main/preview.get?type=4')),
+			'br3' => array('<br />'),
+			'list1' => array('购买本数管理', '"buy_num&search_option_info_id={id}&oper_parent=info"' , '{audit} == 1 && {buy} == 1'),
 		),
 	),
 

+ 12 - 2
main/src/Preview.php

@@ -9,9 +9,19 @@ class Preview
     # 获取二维码
     public function get()
     {
-    	$type = Dever::input('type');
+        $type = Dever::input('type');
+        $id = Dever::input('id');
+
+        $audit = Dever::input('audit');
+        if ($audit) {
+            $audit = Dever::db('audit/data')->one($id);
+            $id = $audit['data_id'];
+            $type = $audit['type'];
+        }
+
     	$table = Dever::config('base')->type_table[$type];
-    	$id = Dever::input('id');
+
+
     	$table = array();
         $table['正式二维码'] = '暂时没有';
         $table['测试二维码'] = '暂时没有';