rabin 7 gadi atpakaļ
vecāks
revīzija
bc0057c4ae

+ 1 - 1
content/database/course.php

@@ -235,7 +235,7 @@ return array
 		# 列表
 		'list_button' => array
 		(
-			'list' => array('评论', '"comment&search_option_course_id={id}&oper_parent=course"'),
+			'list' => array('评论', '"review&project=comment&search_option_source_table=1&search_option_source_id={id}&oper_parent=course&oper_project=content"'),
 		),
 	),
 	

+ 15 - 3
content/database/meeting.php

@@ -93,13 +93,25 @@ return array
 			'place'		=> '150',
 		),
 
+		'link'		=> array
+		(
+			'type' 		=> 'varchar-200',
+			'name' 		=> '链接-填写此项则直接跳转到该链接',
+			'default' 	=> '',
+			'desc' 		=> '请输入标题',
+			'match' 	=> 'is_string',
+			'update'	=> 'text',
+			'search'	=> 'fulltext',
+			'list'		=> true,
+		),
+
 		'top'		=> array
 		(
 			'type' 		=> 'varchar-150',
 			'name' 		=> '头图',
 			'default' 	=> '',
 			'desc' 		=> '请选择头图',
-			'match' 	=> 'is_string',
+			'match' 	=> 'option',
 			'update'	=> 'image',
 			'key' 		=> '1',
 			'place'		=> '150',
@@ -108,7 +120,7 @@ return array
 		'sdate'		=> array
 		(
 			'type' 		=> 'int-11',
-			'name' 		=> '开始时间',
+			'name' 		=> '开始时间-头部的正在进行的会议按照开始时间和结束时间判定',
 			'match' 	=> 'is_numeric',
 			'desc' 		=> '开始时间',
 			'update'	=> 'date',
@@ -133,7 +145,7 @@ return array
 			'name' 		=> '内容',
 			'default' 	=> '',
 			'desc' 		=> '请输入内容',
-			'match' 	=> 'is_string',
+			'match' 	=> 'option',
 			'update'	=> 'editor',
 			'key' 		=> 1,
 		),

+ 24 - 14
log/database/record.php

@@ -2,10 +2,21 @@
 
 $type = array
 (
-	1 => '资讯',
-	2 => '课程',
+	1 => '浏览',
+	2 => '更新',
 );
 
+$info = function()
+{
+	$array = array();
+	$info = Dever::load('set/info-state');
+	if($info)
+	{
+		$array += $info;
+	}
+	return $array;
+};
+
 return array
 (
 	# 表名
@@ -65,6 +76,17 @@ return array
 			'list'		=> true,
 		),
 	
+		'oper'		=> array
+		(
+			'type' 		=> 'varchar-30',
+			'name' 		=> '具体操作',
+			'default' 	=> '',
+			'desc' 		=> '请输入具体操作',
+			'match' 	=> 'option',
+			'update'	=> 'text',
+			//'search'	=> 'fulltext',
+			'list'		=> true,
+		),
 		
 		'content'		=> array
 		(
@@ -79,18 +101,6 @@ return array
 			'list'		=> 'table',
 			'modal'		=> '查看详情',
 		),
-		
-		'ip'		=> array
-		(
-			'type' 		=> 'varchar-32',
-			'name' 		=> 'IP',
-			'default' 	=> '',
-			'desc' 		=> '请输入IP',
-			'match' 	=> 'option',
-			'update'	=> 'text',
-			//'search'	=> 'fulltext',
-			'list'		=> true,
-		),
 
 		'ua'		=> array
 		(

+ 1 - 4
passport/src/Login.php

@@ -25,13 +25,10 @@ class Login extends Base
         $url .= '&grant_type=authorization_code';
 
         $data = Dever::curl($url);
-
-        $data = json_decode($data);
-
         if (strstr($data, 'errcode')) {
             Dever::alert('绑定失败');
         }
-
+        $data = json_decode($data);
         $user = $this->create($data);
 
         return $user;

+ 2 - 2
set/database/info.php

@@ -100,7 +100,7 @@ return array
 			'name' 		=> '小程序appid',
 			'default' 	=> '',
 			'desc' 		=> '小程序appid',
-			'match' 	=> 'is_string',
+			'match' 	=> 'option',
 			'update'	=> 'text',
 			//'search'	=> 'fulltext',
 			//'list'		=> true,
@@ -112,7 +112,7 @@ return array
 			'name' 		=> '小程序secret',
 			'default' 	=> '',
 			'desc' 		=> '请输入小程序secret',
-			'match' 	=> 'is_string',
+			'match' 	=> 'option',
 			'update'	=> 'textarea',
 			//'search'	=> 'fulltext',
 			//'list'		=> true,