diff --git a/dedebiz b/dedebiz index d54796bf..09d46566 100755 --- a/dedebiz +++ b/dedebiz @@ -9,19 +9,14 @@ * @license https://www.dedebiz.com/license * @link https://www.dedebiz.com */ - define('DEDE_ENVIRONMENT', 'production'); define('DEBUG_LEVEL', FALSE); //如果设置为TRUE则会打印执行SQL的时间和标签加载时间方便调试 - -//切换工作目录到./public +//切换工作目录到/src $workDir = dirname(__FILE__) . "/src"; - chdir($workDir); - if (substr(php_sapi_name(), 0, 3) === 'cgi') { die("DedeBIZ:needs php-cli to run\n\n"); } - $helpStr = " NAME: DedeBIZ Cli Tools @@ -36,7 +31,6 @@ COMMANDS: WEBSITE: https://www.dedebiz.com/help/ "; - //将选项转化为SQL IN参数 function Option2SQLin($str = "") { @@ -63,7 +57,6 @@ function Option2SQLin($str = "") } return implode(",", $strs); } - function RandEncode($length=26) { $chars='abcdefghigklmnopqrstuvwxwyABCDEFGHIGKLMNOPQRSTUVWXWY0123456789'; @@ -75,7 +68,6 @@ function RandEncode($length=26) } return $rnd_cookieEncode; } - if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { //PHP5.4以下不支持内建服务器 //用于开发调试 @@ -90,10 +82,8 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { DedeCli::error("Check your root path is right"); exit; } - require_once($workDir . "/system/common.inc.php"); require_once(DEDEINC . "/libraries/cli.class.php"); - //一个命令行的生成工具 if (count($argv) > 2 && ($argv[2] == "arc" || $argv[2] == "a")) { //生成文档 @@ -188,7 +178,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { DedeCli::error("start is empty"); exit; } - //1.生成首页 $pv = new PartView(); $row = $pv->dsql->GetOne("SELECT * FROM `#@__homepageset` "); @@ -238,7 +227,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } DedeCli::write("Make list html successfull"); } - //生成文档 $tt = $dsql->GetOne("SELECT COUNT(id) as dd FROM `#@__arctiny` WHERE senddate >=" . $start . " AND arcrank>-1"); $total = intval($tt['dd']); @@ -252,7 +240,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $i++; } DedeCli::write("Make archives html successfull"); - //优化数据 OptimizeData($dsql); DedeCli::write("Optimize data successfull"); @@ -291,7 +278,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { DedeCli::error("latest version,don't need to update"); exit; } - $fileHashURL = "https://cdn.dedebiz.com/release/{$cfg_version_detail}.json"; $del = new DedeHttpDown(); $del->OpenUrl($fileHashURL); @@ -322,9 +308,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $dbpwd = ""; $dbprefix = "dede_"; $dblang = "utf8"; - mkdir($workDir.'/data/tplcache', 0777); - //common.inc.php $configStr1 = str_replace("~dbtype~",$dbtype,$configStr1); $configStr1 = str_replace("~dbhost~",$dbhost,$configStr1); @@ -336,14 +320,12 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $fp = fopen($workDir."/data/common.inc.php","w") or die("error,check /data writeable"); fwrite($fp,$configStr1); fclose($fp); - $cookieencode = RandEncode(26); $baseurl = "http://127.0.0.1:8088"; $indexUrl = "/"; $cmspath = ""; $webname = "DedeBIZ本地测试开发站点"; $adminmail = "admin@dedebiz.com"; - $fp = fopen($workDir."/install/config.cache.inc.php","r"); $configStr2 = fread($fp,filesize($workDir."/install/config.cache.inc.php")); fclose($fp); @@ -353,15 +335,12 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $configStr2 = str_replace("~cookieEncode~",$cookieencode,$configStr2); $configStr2 = str_replace("~webname~",$webname,$configStr2); $configStr2 = str_replace("~adminmail~",$adminmail,$configStr2); - $fp = fopen($workDir.'/data/config.cache.inc.php','w'); fwrite($fp,$configStr2); fclose($fp); - $fp = fopen($workDir.'/data/config.cache.bak.php','w'); fwrite($fp,$configStr2); fclose($fp); - $query = ''; $fp = fopen($workDir.'/install/sql-dftables.txt','r'); while(!feof($fp)) @@ -374,7 +353,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $query = preg_replace('/character set (.*?) /i','',$query); $query = str_replace('unsigned','',$query); $query = str_replace('TYPE=MyISAM','',$query); - $query = preg_replace ('/TINYINT\(([\d]+)\)/i','INTEGER',$query); $query = preg_replace ('/mediumint\(([\d]+)\)/i','INTEGER',$query); $query = preg_replace ('/smallint\(([\d]+)\)/i','INTEGER',$query); @@ -399,7 +377,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } } fclose($fp); - //导入默认数据 $query = ''; $fp = fopen($workDir.'/install/sql-dfdata.txt','r'); @@ -422,7 +399,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { } } fclose($fp); - //更新配置 $cquery = "UPDATE `{$dbprefix}sysconfig` SET value='{$baseurl}' WHERE varname='cfg_basehost';"; $db->exec($cquery); @@ -436,46 +412,35 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $db->exec($cquery); $cquery = "UPDATE `{$dbprefix}sysconfig` SET value='{$adminmail}' WHERE varname='cfg_adminemail';"; $db->exec($cquery); - $adminuser = "admin"; $adminpwd = "admin"; - //增加管理员帐号 $adminquery = "INSERT INTO `{$dbprefix}admin` VALUES (1, 10, '$adminuser', '".substr(md5($adminpwd),5,20)."', 'admin', '', '', 0, '".time()."', '127.0.0.1');"; $db->exec($adminquery); - DedeCli::write("admin user:admin"); DedeCli::write("admin password:admin"); - //关连前台会员帐号 - $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`, - `scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` ) - VALUES ('1','个人','$adminuser','".md5($adminpwd)."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); "; + $adminquery = "INSERT INTO `{$dbprefix}member` (`mid`,`mtype`,`userid`,`pwd`,`uname`,`sex`,`rank`,`money`,`email`,`scores` ,`matt` ,`face`,`safequestion`,`safeanswer` ,`jointime` ,`joinip` ,`logintime` ,`loginip` ) + VALUES ('1','个人','$adminuser','".md5($adminpwd)."','$adminuser','男','100','0','','10000','10','','0','','".time()."','','0',''); "; $db->exec($adminquery); - - $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`, - `income` , `education` , `height` , `bodytype` , `blood` , `vocation` , `smoke` , `marital` , `house` ,`drink` , `datingtype` , `language` , `nature` , `lovemsg` , `address`,`uptime`) - VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); "; + $adminquery = "INSERT INTO `{$dbprefix}member_person` (`mid`,`onlynet`,`sex`,`uname`,`qq`,`msn`,`tel`,`mobile`,`place`,`oldplace`,`birthday`,`star`,`income`,`education`,`height`,`bodytype`,`blood`,`vocation`,`smoke`,`marital`,`house` ,`drink`,`datingtype`,`language`,`nature`,`lovemsg`,`address`,`uptime`) + VALUES ('1', '1', '男', '{$adminuser}', '', '', '', '', '0', '0','1980-01-01', '1', '0', '0', '160', '0', '0', '0', '0', '0', '0','0', '0', '', '', '', '','0'); "; $db->exec($adminquery); - $adminquery = "INSERT INTO `{$dbprefix}member_tj` (`mid`,`article`,`album`,`archives`,`homecount`,`pagecount`,`feedback`,`friend`,`stow`) - VALUES ('1','0','0','0','0','0','0','0','0'); "; + VALUES ('1','0','0','0','0','0','0','0','0'); "; $db->exec($adminquery); - $adminquery = "Insert Into `{$dbprefix}member_space`(`mid` ,`pagesize` ,`matt` ,`spacename` ,`spacelogo` ,`spacestyle`, `sign` ,`spacenews`) - Values('1','10','0','{$adminuser}的空间','','person','',''); "; + Values('1','10','0','{$adminuser}的空间','','person','',''); "; $db->exec($adminquery); if (phpversion() < "5.4") { die("DedeBIZ:command web server not support\n\n"); } - // 写入程序安装锁 file_put_contents($workDir.'/install/install_lock.txt', 'ok'); - echo "Start Dev Server For DedeBIZ\n\r"; echo "Open http://localhost:8088\n\r"; passthru(PHP_BINARY . ' -S localhost:8088 -t' . escapeshellarg('./')); exit; } else { echo $helpStr; -} +} \ No newline at end of file diff --git a/src/admin/article_description_main.php b/src/admin/article_description_main.php index 6945c3e3..d77ae1ad 100644 --- a/src/admin/article_description_main.php +++ b/src/admin/article_description_main.php @@ -80,9 +80,9 @@ if ($dojob == '') { ShowMsg('完成所有任务', 'javascript:;'); exit(); } - $dvlen = $tjlen * 2; - $tjsta = "
"; - $tjsta .= "
完成处理文档总数的：$tjlen %，继续执行任务"; + $dvlen = $tjlen * 1; + $tjsta = "
"; + $tjsta .= "
完成处理文档总数 $tjlen %"; $nurl = "article_description_main.php?totalnum=$totalnum&startdd={$startdd}&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); exit(); @@ -140,9 +140,9 @@ if ($dojob == '') { } else { $tjlen = 100; } - $dvlen = $tjlen * 2; - $tjsta = "
"; - $tjsta .= "
完成处理文档总数的：$tjlen %，继续执行任务"; + $dvlen = $tjlen * 1; + $tjsta = "
"; + $tjsta .= "
完成处理文档总数 $tjlen %"; if ($tjnum < $totalnum) { $nurl = "article_description_main.php?totalnum=$totalnum&startdd=".($startdd + $pagesize)."&pagesize=$pagesize&table={$table}&field={$field}&dsize={$dsize}&msize={$msize}&channel={$channel}&dojob={$dojob}"; ShowMsg($tjsta, $nurl, 0, 500); @@ -151,5 +151,5 @@ if ($dojob == '') { ShowMsg('完成所有任务', 'javascript:;'); exit(); } - } //更新自动分页处理代码结束 + }//更新自动分页处理代码结束 } \ No newline at end of file diff --git a/src/admin/inc/inc_action_info.php b/src/admin/inc/inc_action_info.php index e3facf64..03508538 100644 --- a/src/admin/inc/inc_action_info.php +++ b/src/admin/inc/inc_action_info.php @@ -306,12 +306,6 @@ $actionSearch[7] = array( 'linkurl' => 'makehtml_rss.php' ), 6 => array( - 'title' => '更新脚本', - 'description' => '可以获取某个栏目的脚本连接', - 'purview' => 'sys_MakeHtml', - 'linkurl' => 'makehtml_js.php' - ), - 7 => array( 'title' => '更新缓存', 'description' => '更新栏目缓存、更新枚举缓存、清理arclist调用缓存、清理过期会员访问历史、删除过期短信 ', 'purview' => 'sys_ArcBatch', diff --git a/src/admin/inc/inc_menu.php b/src/admin/inc/inc_menu.php index 3e383035..5d4031dc 100644 --- a/src/admin/inc/inc_menu.php +++ b/src/admin/inc/inc_menu.php @@ -108,7 +108,6 @@ $adminMenu1 - diff --git a/src/admin/inc/inc_menu_map.php b/src/admin/inc/inc_menu_map.php index fb8ffea4..62ff07b9 100644 --- a/src/admin/inc/inc_menu_map.php +++ b/src/admin/inc/inc_menu_map.php @@ -70,7 +70,6 @@ $menusMain = " - diff --git a/src/admin/makehtml_archives_action.php b/src/admin/makehtml_archives_action.php index a91dc258..36e7af84 100644 --- a/src/admin/makehtml_archives_action.php +++ b/src/admin/makehtml_archives_action.php @@ -1,5 +1,4 @@ 0 ? ceil(($tjnum / $totalnum) * 100) : 100; -$dvlen = $tjlen * 2; -$tjsta = "
"; -$tjsta .= "
本次用时：".number_format($t2, 2)."，总用时：$ttime 分钟，到达位置：".($startdd + $pagesize)."
完成创建文件总数的：$tjlen %，继续执行任务"; +$tjsta = "
"; +$tjsta .= "
到达位置：".($startdd + $pagesize)."，用时：$ttime 分钟
完成更新文档总数 $tjlen %"; //速度测试 if ($tjnum < $totalnum) { $nurl = "makehtml_archives_action.php?endid=$endid&startid=$startid&typeid=$typeid"; @@ -92,12 +90,12 @@ if ($tjnum < $totalnum) { exit(); } else { if ($typeid != '') { - ShowMsg("生成文件：$totalnum 总用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); + ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，现转向当前栏目更新", "makehtml_list_action.php?typeid=$typeid&uptype=all&maxpagesize=50&upnext=1"); } else { if ($uptype == '') { - ShowMsg("完成所有创建任务，生成文件：$totalnum 总用时：{$ttime} 分钟", "javascript:;"); + ShowMsg("更新文档：$totalnum，用时：{$ttime} 分钟，完成所有所有任务", "javascript:;"); } else { - ShowMsg("完成文档HTML更新任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); + ShowMsg("完成更新文档任务，现在开始进行主页更新", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); } } } \ No newline at end of file diff --git a/src/admin/makehtml_freelist_action.php b/src/admin/makehtml_freelist_action.php index 67ab45e2..f87bf19e 100644 --- a/src/admin/makehtml_freelist_action.php +++ b/src/admin/makehtml_freelist_action.php @@ -54,10 +54,10 @@ if ($nextpage == $totalpage) { } else { if ($finishType) { $gourl = "makehtml_freelist_action.php?maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$nextpage"; - ShowMsg("成功创建列表：".$tid."，继续进行操作", $gourl, 0, 100); + ShowMsg("创建列表：".$tid."，继续执行任务", $gourl, 0, 100); } else { $gourl = "makehtml_freelist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&startid=$startid&endid=$endid&pageno=$pageno"; - ShowMsg("列表：".$tid."，继续进行操作", $gourl, 0, 100); + ShowMsg("创建列表：".$tid."，继续执行任务", $gourl, 0, 100); } } $dsql->ExecuteNoneQuery("Update `#@__freelist` set nodefault='1' where aid='$startid';"); \ No newline at end of file diff --git a/src/admin/makehtml_js.php b/src/admin/makehtml_js.php deleted file mode 100644 index d29b804b..00000000 --- a/src/admin/makehtml_js.php +++ /dev/null @@ -1,13 +0,0 @@ -GetOne("SELECT id FROM `#@__arctype` WHERE id>'$typeid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); - if (!is_array($row)) { - echo ""; - echo "
完成所有文件更新
"; - exit(); - } else { - $pv = new PartView($row['id']); - $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); - $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/static/js/".$row['id'].".js", 0); - $typeid = $row['id'];; - ShowMsg("成功更新".$cfg_cmspath."/static/js/".$row['id'].".js，继续进行操作", "makehtml_js_action.php?typeid=$typeid", 0, 100); - exit(); - } -} else { - $pv = new PartView($typeid); - $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet); - $pv->SaveToHtml($cfg_basedir.$cfg_cmspath."/static/js/".$typeid.".js", 0); - echo ""; - echo "
成功更新".$cfg_cmspath."/static/js/".$typeid.".js"; - echo "预览：
"; - echo "
"; - echo ""; - exit(); -} \ No newline at end of file diff --git a/src/admin/makehtml_list_action.php b/src/admin/makehtml_list_action.php index 9cc3750b..4ec361d6 100644 --- a/src/admin/makehtml_list_action.php +++ b/src/admin/makehtml_list_action.php @@ -95,7 +95,7 @@ if ($nextpage >= $totalpage && $finishType) { if (empty($reurl)) { $reurl = '../apps/list.php?tid='.$tid; } - ShowMsg("完成所有栏目列表更新浏览栏目", "javascript:;"); + ShowMsg("完成所有栏目列表更新，浏览栏目", "javascript:;"); exit(); } else if ($gotype == 'mkall' || $gotype == 'mkallct') { ShowMsg("完成所有栏目列表更新，现在作最后数据优化", "makehtml_all.php?action=make&step=10"); @@ -104,11 +104,11 @@ if ($nextpage >= $totalpage && $finishType) { } else { if ($finishType) { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage"; - ShowMsg("成功创建栏目：".$tid."，继续进行操作", $gourl, 0, 100); + ShowMsg("创建栏目：".$tid."，继续执行任务", $gourl, 0, 100); exit(); } else { $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno"; - ShowMsg("栏目：".$tid."，继续进行操作", $gourl, 0, 100); + ShowMsg("创建栏目：".$tid."，继续执行任务", $gourl, 0, 100); exit(); } } \ No newline at end of file diff --git a/src/admin/makehtml_rss_action.php b/src/admin/makehtml_rss_action.php index 1abd8ca6..1e5d98f9 100644 --- a/src/admin/makehtml_rss_action.php +++ b/src/admin/makehtml_rss_action.php @@ -15,11 +15,11 @@ if (empty($tid)) $tid = 0; if (empty($maxrecord)) $maxrecord = 50; $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$tid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;"); if (!is_array($row)) { - echo ""; - echo "
完成所有文件更新
"; + echo ""; + echo "
完成所有文件更新
"; } else { $rv = new RssView($row['id'], $maxrecord); $rssurl = $rv->MakeRss(0); $tid = $row['id']; - ShowMsg("成功更新".$rssurl."，继续进行操作", "makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord", 0, 100); + ShowMsg("成功更新".$rssurl."，继续执行任务", "makehtml_rss_action.php?tid=$tid&maxrecord=$maxrecord", 0, 100); } \ No newline at end of file diff --git a/src/admin/makehtml_taglist_action.php b/src/admin/makehtml_taglist_action.php index 04c9354f..08542c3a 100644 --- a/src/admin/makehtml_taglist_action.php +++ b/src/admin/makehtml_taglist_action.php @@ -93,12 +93,12 @@ if (is_array($tag) && count($tag) > 0) { $nextpage = 0; } $gourl = "makehtml_taglist_action.php?maxpagesize=$maxpagesize&tagid=$tagid&pageno=$nextpage&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg("成功生成TAG：".$tag['tag']."，继续进行操作", $gourl, 0, 100); + ShowMsg("成功生成TAG：".$tag['tag']."，继续执行任务", $gourl, 0, 100); exit(); } else { //继续当前这个 $gourl = "makehtml_taglist_action.php?mkpage=$mkpage&maxpagesize=$maxpagesize&tagid=$tagid&pageno=$pageno&upall=$upall&ctagid=$ctagid&startid=$startid&endid=$endid&mktime=$mktime"; - ShowMsg("成功生成TAG：".$tag['tag']."，继续进行操作", $gourl, 0, 100); + ShowMsg("成功生成TAG：".$tag['tag']."，继续执行任务", $gourl, 0, 100); exit(); } } diff --git a/src/admin/templets/catalog_main.htm b/src/admin/templets/catalog_main.htm index 742cda0e..b0d78d0b 100644 --- a/src/admin/templets/catalog_main.htm +++ b/src/admin/templets/catalog_main.htm @@ -172,7 +172,6 @@ 增加顶级栏目 批量增加栏目 更新栏目缓存 - 更新栏目 @@ -205,10 +204,9 @@ - - + diff --git a/src/admin/templets/diy_list.htm b/src/admin/templets/diy_list.htm index 5f08b45c..d3b67ddd 100644 --- a/src/admin/templets/diy_list.htm +++ b/src/admin/templets/diy_list.htm @@ -24,7 +24,7 @@ { $allowhtml = array('htmltext'); $fields['sta'] = $fields['ifcheck'] == 1 ? '已审核':'未审核'; - echo ''.$fields['id'].' '.$fields['sta'].''; + echo ''.$fields['id'].' '.$fields['sta'].''; foreach($fieldlist as $field=>$fielddata) { if($fields[$field]=='') continue; diff --git a/src/admin/templets/index_menu.htm b/src/admin/templets/index_menu.htm index 6bc7dcbf..09b9ca3d 100644 --- a/src/admin/templets/index_menu.htm +++ b/src/admin/templets/index_menu.htm @@ -84,7 +84,7 @@ } .fllct { float: left; - width: 80px + width: 86px } .flrct { float: left; diff --git a/src/admin/templets/makehtml_js.htm b/src/admin/templets/makehtml_js.htm deleted file mode 100644 index 70c8465c..00000000 --- a/src/admin/templets/makehtml_js.htm +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - 更新脚本 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - -
更新脚本栏目管理
-
选择栏目： - GetOptionArray($cid,$admin_catalogs,0,1); - echo ""; - ?> -
JS文件： - -
模板文件： - -
更新选项： - - -
- -
- - - - - -
结果： - - 增大 - 缩小 -
-
-
- -
-
- - \ No newline at end of file diff --git a/src/static/js/.gitkeep b/src/static/js/.gitkeep deleted file mode 100644 index 88302ffc..00000000 --- a/src/static/js/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -DedeBIZ \ No newline at end of file diff --git a/src/theme/templets/article_image.htm b/src/theme/templets/article_image.htm index 8dae351f..f9dff50f 100644 --- a/src/theme/templets/article_image.htm +++ b/src/theme/templets/article_image.htm @@ -21,10 +21,8 @@ var totalpage = { dede: field name = 'totalpage' / }; - var namehand = '{dede:field name=' - namehand '/}'; - var displaytype = '{dede:field name=' - displaytype '/}'; + var namehand = '{dede:field name='namehand'/}'; + var displaytype = '{dede:field name='displaytype'/}'; var gtimer = null; //大图 function dPlayBig() { diff --git a/src/theme/templets/index.htm b/src/theme/templets/index.htm index 4675615a..fc77c231 100644 --- a/src/theme/templets/index.htm +++ b/src/theme/templets/index.htm @@ -22,44 +22,48 @@
- {/dede:list}
diff --git a/src/theme/templets/list_free.htm b/src/theme/templets/list_free.htm index 2d5d2531..bec33648 100644 --- a/src/theme/templets/list_free.htm +++ b/src/theme/templets/list_free.htm @@ -34,7 +34,7 @@
diff --git a/src/theme/templets/list_image.htm b/src/theme/templets/list_image.htm index 627aa848..2b9db626 100644 --- a/src/theme/templets/list_image.htm +++ b/src/theme/templets/list_image.htm @@ -45,7 +45,7 @@
diff --git a/src/theme/templets/list_infos.htm b/src/theme/templets/list_infos.htm index 353c8358..aaa15f57 100644 --- a/src/theme/templets/list_infos.htm +++ b/src/theme/templets/list_infos.htm @@ -77,7 +77,7 @@ diff --git a/src/theme/templets/list_shop.htm b/src/theme/templets/list_shop.htm index 82c4cb27..0eb9975d 100644 --- a/src/theme/templets/list_shop.htm +++ b/src/theme/templets/list_shop.htm @@ -40,9 +40,7 @@
- - [field:description/]... - + [field:description/]...
日期：[field:pubdate function="MyDate('Y-m-d', @me)"/] 价格：[field:trueprice/] diff --git a/src/theme/templets/list_soft.htm b/src/theme/templets/list_soft.htm index fe305d45..0ea31ca2 100644 --- a/src/theme/templets/list_soft.htm +++ b/src/theme/templets/list_soft.htm @@ -40,9 +40,7 @@
- - [field:description/]... - + [field:description/]...
上传日期：[field:pubdate function="MyDate('Y-m-d', @me)"/] 推荐级别：[field:softrank @@ -54,7 +52,7 @@
diff --git a/src/theme/templets/list_spec.htm b/src/theme/templets/list_spec.htm index 3304aad4..d32f5664 100644 --- a/src/theme/templets/list_spec.htm +++ b/src/theme/templets/list_spec.htm @@ -41,20 +41,16 @@
- - [field:description/]... - -
-
- 上传日期：[field:pubdate function="MyDate('Y-m-d', @me)"/] + [field:description/]...
+
上传日期：[field:pubdate function="MyDate('Y-m-d', @me)"/]
{/dede:list} diff --git a/src/theme/templets/search.htm b/src/theme/templets/search.htm index 79e61d7e..c862e3f5 100644 --- a/src/theme/templets/search.htm +++ b/src/theme/templets/search.htm @@ -48,7 +48,7 @@ {/dede:list}