edit

act/lib/Manage.php

@@ -12,7 +12,7 @@ class Manage
         $table = Dever::config('base')->type_table[$source_table];
         $data = Dever::db($table)->one($id);
 
-        if ($data && $data['name']) {
+        if ($data && isset($data['name']) && $data['name']) {
             return $data['name'];
         }
         return '未知';

content/database/article.php

@@ -104,6 +104,7 @@ return array
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 			'list'		=> true,
+			'search'	=> 'fulltext',
 			//增加预览
 			'preview'	=> true,
 		),
@@ -148,7 +149,7 @@ return array
 		(
 			'type' 		=> 'int-11',
 			'name' 		=> '微信数据id',
-			'default' 	=> '1',
+			'default' 	=> '0',
 			'desc' 		=> '微信数据id',
 			'match' 	=> 'is_numeric',
 		),

journal/database/content.php

@@ -16,6 +16,20 @@ $is_button = array
     2 => '不显示',
 );
 
+$text = array
+(
+    1 => '上左',
+    2 => '上中',
+    3 => '上右',
+    4 => '中左',
+    5 => '正中',
+    6 => '中右',
+    7 => '下左',
+    8 => '下中',
+    9 => '下右',
+    //10 => '自定义',
+);
+
 $author = function()
 {
     $array = array();
@@ -242,6 +256,59 @@ return array
             'update_search' => 'journal/lib/manage.search_live',
         ),
 
+        'text'       => array
+        (
+            'type'      => 'text-1000',
+            'name'      => '文字设置',
+            'default'   => '',
+            'desc'      => '文字设置',
+            'match'     => 'is_string',
+            'option'    => $text,
+            'show'      => 'type=1',
+            'update'    => array
+            (
+                array
+                (
+                    'col'       => 'name',
+                    'name'      => '文字内容',
+                    'default'   => '',
+                    'desc'      => '文字内容',
+                    'match'     => 'is_string',
+                    'update'    => 'textarea',
+                ),
+
+                array
+                (
+                    'col'       => 'color',
+                    'name'      => '文字颜色',
+                    'default'   => '#000000',
+                    'desc'      => '文字颜色',
+                    'match'     => 'is_string',
+                    'update'    => 'color',
+                ),
+
+                array
+                (
+                    'col'       => 'bgcolor',
+                    'name'      => '背景颜色',
+                    'default'   => '#000000',
+                    'desc'      => '背景颜色',
+                    'match'     => 'is_string',
+                    'update'    => 'color',
+                ),
+
+                array
+                (
+                    'col'       => 'size',
+                    'name'      => '文字大小-直接输入像素数字',
+                    'default'   => '16',
+                    'desc'      => '结果描述',
+                    'match'     => 'is_numeric',
+                    'update'    => 'text',
+                ),
+            ),
+        ),
+
         'reorder'       => array
         (
             'type'      => 'int-11',

journal/lib/Manage.php

@@ -112,12 +112,14 @@ class Manage
 
                 $data[$k]['typename'] = $type[$v['type']];
 
-
+                /*
                 if ($v['type'] == 1) {
                     $data[$k]['text'] = $this->text($database, $v['id'], $where['info_id']);
                 } else {
                     $data[$k]['text'] = '';
                 }
+                */
+                $data[$k]['text'] = '';
 
                 $link = $database->url('edit', $v['id']) . '&search_option_info_id=' . $where['info_id'];
 

journal/template/manage/journal.php

@@ -40,7 +40,8 @@ $view
 
         '.edit' => array
         (
-            'onclick' => '<{$v.edit}>',
+            //'onclick' => '<{$v.edit}>',
+            'href' => '<{$v.editurl}>',
         ),
 
         '.oper_delete' => array

spider/lib/Get.php

@@ -34,7 +34,7 @@ class Get
         $wechat = Dever::db('spider/wechat')->one($info['wechat_id']);
 
         # 查询文章表里有没有
-        $article = Dever::db('content/article')->one(array('wechat_data_id' => $id));
+        $article = Dever::db('content/article')->one(array('wechat_data_id' => $id, 'wechat' => 2));
         if ($audit == 2) {
             $insert['cate_id'] = $wechat['cate_id'];
             $insert['author_id'] = $wechat['author_id'];

video/database/live.php

@@ -90,6 +90,7 @@ return array
 			'desc' 		=> '标题',
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
+			'search'	=> 'fulltext',
 			'list'		=> true,
 		),
 

video/database/vod.php

@@ -88,6 +88,7 @@ return array
 			'desc' 		=> '标题',
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
+			'search'	=> 'fulltext',
 			'list'		=> true,
 		),