dever 4 years ago
parent
commit
f078a7291e

+ 8 - 0
app/collection/lib/Content.php

@@ -49,6 +49,14 @@ class Content
 			$data['data']['text'] = Dever::array_decode($data['data']['text']);
 
 			foreach ($data['data']['text'] as $k => $v) {
+				if (isset($v['name']) && $v['name']) {
+					$data['data']['text'][$k]['name_array'] = explode("\r\n", $v['name']);
+				}
+
+				if (isset($v['bgcolor_type']) && $v['bgcolor_type'][0] == 2) {
+					$data['data']['text'][$k]['bgcolor'] = '';
+				}
+				
 				if (isset($v['content']) && $v['content']) {
 					$data['data']['text'][$k]['content_array'] = $this->getContent($v);
 				}

+ 2 - 1
app/collection/lib/Manage.php

@@ -220,8 +220,9 @@ class Manage
                     Dever::setInput('oper_project', 'collection');
                 }
 
-                http://192.168.33.10/dreamland/package/manage/?l=project/database/list&project=collection&search_option_info_id=1&oper_table=info&page_type=1&table=info&table=info&menu=collection&menu_id=24&search_option_state=1
+                http://192.168.33.10/dreamland/package/manage/?l=project/database/list&project=collection&page_type=1&table=content&table=content&save_table=link&save_project=content&project=collection&page_type=1&oper_table=info&oper_project=collection&menu=collection&menu_id=24&search_option_state=1&search_option_info_id=1
 
+               // http://192.168.33.10/dreamland/package/manage/?l=project/database/list&project=collection&page_type=2&table=content&search_option_info_id=1&oper_table=info&page_type=1&menu=collection&menu_id=24&search_option_state=1
                 
                 $data[$k]['data_editurl'] = $database->url($method, $v['id'], $table_name, '', $project_name);
 

+ 1 - 1
app/content/database/pic.php

@@ -100,7 +100,7 @@ return array
             'match'     => 'option',
             'update'  => 'image',
             'key'       => '1',
-            'place'     => '150',
+            'place'     => '750*1386',
         ),
 
         'pic_info'        => array

+ 1 - 1
app/content/database/video.php

@@ -80,7 +80,7 @@ return array
 			'match' 	=> 'option',
 			'update'	=> 'image',
 			'key' 		=> '1',
-			'place'		=> '380',
+			'place'		=> '750*1386',
 		),
 
         'video'     => array