dever 6 years ago
parent
commit
3d5f8a9bad

+ 19 - 0
config/env/localhost/default.php

@@ -23,4 +23,23 @@ $config['debug'] = array
 (
 	'log' => array('type' => 'file'),
 );
+
+$host = 'http://192.168.33.10/';
+$upload = $host . 'jmupload/';
+$uploadcdn = $host . 'jmupload/data/';
+
+$config['host'] = array
+(
+    'upload'=> $upload . 'upload/?save',
+    'uploadRes'     => $uploadcdn . 'upload/',
+    'project' => array
+    (
+    	/*
+        'passport' => array
+        (
+            'path' => $host. 'jmuser/passport/?',
+        ),
+        */
+    ),
+);
 return $config;

+ 1 - 3
content/database/article.php

@@ -339,12 +339,10 @@ return array
 	(
 		//'insert' => false,
 		# 列表
-		/*
 		'list_button' => array
 		(
-			'list' => array('评论列表', '"comment&search_option_data_id={id}&oper_parent=article"'),
+			'edit' => array('预览', Dever::url('main/preview.get?type=1')),
 		),
-		*/
 	),
 
 	# request 请求接口定义

+ 3 - 0
data/compile/wonderful/manage/layadmin/console.cmp.php

@@ -10,6 +10,9 @@
   
   <div class="layui-fluid">
     <div class="layui-row layui-col-space15">
+    <blockquote class="layui-elem-quote layui-quote-nm" id="content">欢迎光临本系统,控制台功能迭代优化中</blockquote>
+    </div>
+    <div class="layui-row layui-col-space15" style="display:none;">
       <div class="layui-col-md8">
         <div class="layui-row layui-col-space15">
           <div class="layui-col-md6">

+ 1 - 0
data/compile/wonderful/manage/layadmin/project/database/list.cmp.php

@@ -107,6 +107,7 @@
     table.render({
       elem: '#table'
       ,page: false
+      ,limit:20
       ,cols: config.table.cols
       ,data: config.table.data
     });

+ 1 - 0
journal/database/content.php

@@ -267,6 +267,7 @@ return array
         'button' => array
         (
             '新增内页' => array('fasts'),
+            '预览' => array('fast', 'main/preview.get?type=4&id=' . Dever::input('search_option_info_id')),
         ),
     ),
 );

+ 38 - 0
journal/database/info.php

@@ -8,6 +8,17 @@ $audit = array
 	2 => '上线发布',
 );
 
+$share = function()
+{
+	$array = array();
+	$info = Dever::db('poster/template')->state();
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
 $page = 15;
 return array
 (
@@ -222,6 +233,31 @@ return array
 			'auth'		=> '"{pdate}" > 0',
 		),
 
+		'share'		=> array
+		(
+			'type' 		=> 'text-255',
+			'name' 		=> '分享海报-选择海报库中的海报',
+			'default' 	=> '',
+			'desc' 		=> '分享海报',
+			'match' 	=> 'option',
+			//'update'	=> 'checkbox',
+			'option'	=> $share,
+		),
+
+		'reorder'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '排序(数值越大越靠前)',
+			'default' 	=> '1',
+			'desc' 		=> '请输入排序',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+			'search'	=> 'order',
+			'list'		=> true,
+			'order'		=> 'desc',
+			'edit'		=> true,
+		),
+
 		'udate'		=> array
 		(
 			'type' 		=> 'int-11',
@@ -266,6 +302,8 @@ return array
 			'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')),
 		),
 	),
 

+ 1 - 1
journal/database/order.php

@@ -26,7 +26,7 @@ return array
     'name' => 'order',
     # 显示给用户看的名称
     'lang' => '订单管理',
-    'order' => 100,
+    'order' => 1,
 
     'end' => array
     (

+ 4 - 0
journal/lib/Manage.php

@@ -38,6 +38,10 @@ class Manage
             $data = array_merge($data, array());
         }
 
+        if (!$data) {
+            Dever::alert('暂无数据');
+        }
+
         return $data;
 	}
 

+ 21 - 0
main/src/Preview.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Main\Src;
+
+use Dever;
+
+class Preview
+{
+    # 获取二维码
+    public function get()
+    {
+    	$type = Dever::input('type');
+    	$table = Dever::config('base')->type_table[$type];
+    	$id = Dever::input('id');
+    	$table = array();
+        $table['正式二维码'] = '暂时没有';
+        $table['测试二维码'] = '暂时没有';
+
+        return Dever::table($table);
+    }
+}

+ 1 - 3
video/database/live.php

@@ -289,12 +289,10 @@ return array
 	(
 		//'insert' => false,
 		# 列表
-		/*
 		'list_button' => array
 		(
-			'list' => array('评论列表', '"comment&search_option_data_id={id}&oper_parent=article"'),
+			'edit' => array('预览', Dever::url('main/preview.get?type=3')),
 		),
-		*/
 	),
 
 	# request 请求接口定义

+ 1 - 3
video/database/vod.php

@@ -279,12 +279,10 @@ return array
 	(
 		//'insert' => false,
 		# 列表
-		/*
 		'list_button' => array
 		(
-			'list' => array('评论列表', '"comment&search_option_data_id={id}&oper_parent=article"'),
+			'edit' => array('预览', Dever::url('main/preview.get?type=2')),
 		),
-		*/
 	),
 
 	# request 请求接口定义