调整前后台页面

.gitignore

@@ -28,3 +28,4 @@ src/special/
 src/data/backupdata/*
 src/a/*.html
 src/data/mkall_cache_*.php
+src/data/payment/cod.php

src/dede/css/base.css

@@ -1,5 +1,5 @@
 * {
-	font-size: 12px;
+	font-size: 13px;
 	font-family: "宋体";
 }
 
@@ -8,7 +8,7 @@ td {
 }
 
 body {
-	font-size: 12px;
+	font-size: 13px;
 	line-height: 1.5;
 	font-family: "宋体";
 	background-color: #FFF;

src/dede/css/frame.css

@@ -11,7 +11,7 @@ body {
 
 body {
 	height: 100%;
-	font-size: 12px;
+	font-size: 13px;
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	overflow: hidden;
 	z-index: 1;
@@ -36,16 +36,16 @@ form {
 
 .head {
 	width: 100%;
-	height: 66px;
+	height: 76px;
 	overflow: hidden;
 	z-index: 8;
 	position: relative;
 }
 
 .top {
-	height: 37px;
+	height: 47px;
 	width: 100%;
-	background-color: rgb(94, 149, 0);
+	background-image: linear-gradient(135deg, #008E38 0%, #639709 100%);
 	overflow: hidden;
 	clear: both;
 }
@@ -53,12 +53,13 @@ form {
 .top .top_logo {
 	width: 170px;
 	height: 37px;
+	margin-top: 5px;
 	float: left;
 }
 
 .top .top_link {
 	float: right;
-	padding: 5px 10px 0px 0px;
+	padding: 10px 10px 0px 0px;
 }
 
 .top .top_link ul {
@@ -283,7 +284,7 @@ body.hidemenu .right {
 
 .left {
 	position: absolute;
-	top: 66px;
+	top: 76px;
 	width: 212px;
 	left: 0px;
 	bottom: 0px;
@@ -303,6 +304,10 @@ body.hidemenu .right {
 	height: 100%;
 }
 
+.top_link {
+	font-size: 13px;
+}
+
 .menu iframe {
 	height: 100%;
 	width: 99.99%;
@@ -312,7 +317,7 @@ body.hidemenu .right {
 .right {
 	position: absolute;
 	right: 0;
-	top: 66px;
+	top: 76px;
 	bottom: 0px;
 	z-index: 7;
 }

src/dede/freelist_main.php

@@ -89,8 +89,8 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid')
         <td> {$row['templet']} </td>
         <td> {$row['click']} </td>
         <td>".MyDate("y-m-d",$row['edtime'])."</td>
-        <td> <a href='#' onclick='EditNote({$row['aid']})' class='btn btn-secondary btn-sm'> <i class=\"fa fa-pencil-square-o\" aria-hidden=\"true\"></i> 更改</a> |
-        <a href='#' onclick='CreateNote({$row['aid']})' class='btn btn-secondary btn-sm'> <i class=\"fa fa-refresh\" aria-hidden=\"true\"></i> 更新</a> |
+        <td> <a href='#' onclick='EditNote({$row['aid']})' class='btn btn-secondary btn-sm'> <i class=\"fa fa-pencil-square-o\" aria-hidden=\"true\"></i> 更改</a>
+        <a href='#' onclick='CreateNote({$row['aid']})' class='btn btn-secondary btn-sm'> <i class=\"fa fa-refresh\" aria-hidden=\"true\"></i> 更新</a>
          <a href='#' onclick='DelNote({$row['aid']})' class='btn btn-secondary btn-sm'> <i class=\"fa fa-trash\" aria-hidden=\"true\"></i> 删除</a>
     </td>
   </tr>";

src/dede/images/style2/style.css

@@ -1,7 +1,7 @@
 .top {
 	height:37px;
 	width:100%;
-	background-color:#3C86C5 ;
+    background-image: linear-gradient(135deg, #6561FE 0%, #1C6F93 100%);
 	overflow:hidden;
 	clear:both;
 }

src/dede/images/style3/style.css

@@ -1,7 +1,7 @@
 .top {
 	height:37px;
 	width:100%;
-	background-color:#9E8560;
+    background-image: linear-gradient(135deg, #856404 0%, #8B7859 100%);
 	overflow:hidden;
 	clear:both;
 }

src/dede/images/style4/style.css

@@ -1,7 +1,7 @@
 .top {
 	height:37px;
 	width:100%;
-	background:rgb(231, 236, 239);
+    background-image: linear-gradient(135deg, #E2E3E5 0%, #83888C 100%);
 	overflow:hidden;
 	clear:both;
 }

src/dede/inc/inc_archives_functions.php

@@ -734,7 +734,7 @@ function Replace_Links( &$body, $allow_urls=array()  )
     $host_rule = preg_replace("#[\n\r]#", '', $host_rule);
     $host_rule = str_replace('.', "\\.", $host_rule);
     $host_rule = str_replace('/', "\\/", $host_rule);
-    $arr = '';
+    $arr = array();
     preg_match_all("#<a([^>]*)>(.*)<\/a>#iU", $body, $arr);
     if( is_array($arr[0]) )
     {
@@ -857,7 +857,7 @@ function UploadOneImage($upname,$handurl='',$isremote=1,$ntitle='')
         $filename = $fullUrl;
 
         //水印
-        @WaterImg($imgfile, 'up');
+        @WaterImg($cfg_basedir.$fullUrl, 'up');
         $isrm_up = TRUE;
     }
 
@@ -870,7 +870,7 @@ function UploadOneImage($upname,$handurl='',$isremote=1,$ntitle='')
         }
 
         //远程图片并要求本地化
-        if($isremote==1 && preg_match("#^http:\/\/#i", $handurl))
+        if($isremote==1 && preg_match("#^http[s]?:\/\/#i", $handurl))
         {
             $ddinfos = GetRemoteImage($handurl, $cuserLogin->getUserID());
             if(!is_array($ddinfos))
@@ -898,7 +898,7 @@ function UploadOneImage($upname,$handurl='',$isremote=1,$ntitle='')
 
         //把新上传的图片信息保存到媒体文档管理档案中
         $inquery = "
-        INSERT INTO #@__uploads(title,url,mediatype,width,height,playtime,filesize,uptime,mid)
+        INSERT INTO `#@__uploads`(title,url,mediatype,width,height,playtime,filesize,uptime,mid)
         VALUES ('$title','$filename','1','".$imginfos[0]."','".$imginfos[1]."','0','".filesize($imgfile)."','".time()."','".$cuserLogin->getUserID()."');
     ";
         $dsql->ExecuteNoneQuery($inquery);

src/dede/index_body.php

@@ -216,12 +216,6 @@ else if ($dopost == 'getRightSide') {
     </table>
 <?php
     exit;
-} else if ($dopost == 'showauth') {
-    include('templets/index_body_showauth.htm');
-    exit;
-} else if ($dopost == 'showad') {
-    include('templets/index_body_showad.htm');
-    exit;
 } else if ($dopost == 'setskin') {
     $cskin = empty($cskin) ? 1 : $cskin;
     $skin = !in_array($cskin, array(1, 2, 3, 4)) ? 1 : $cskin;

src/dede/templets/album_add.htm

@@ -119,7 +119,7 @@
         <td width="400%" height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td><?php
           $dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
           $dsql->Execute();
@@ -152,7 +152,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
+              <td width="90">&nbsp;Tag标签：</td>
               <td>
                 <input name="tags" type="text" id="tags" value="" style="width:300px" />(','号分开，单个标签小于12字节)
               </td>
@@ -202,7 +202,7 @@
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;图集主栏目：</td>
+              <td width="100">&nbsp;图集主栏目：</td>
               <td>
                 <span id='typeidct'>
                   <?php
@@ -252,7 +252,7 @@
         <td height="24" colspan="4" class="bline" style="padding-top:6px">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="80">&nbsp;<b>表现方式：</b></td>
+              <td width="90">&nbsp;<b>表现方式：</b></td>
               <td>
                 <input name="pagestyle" class="np" type="radio" id="pagestyle1" onClick="checkMuList()" value="1"
                   <?php if($cfg_album_style==1) echo " checked='checked'"; ?> />
@@ -325,12 +325,12 @@
         <td colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0" height="100">
             <tr>
-              <td width="90">&nbsp;压缩包文件：</td>
+              <td width="100">&nbsp;压缩包文件：</td>
               <td><input type='text' name='zipfile' id='zipfile' style='width:300px'>
                 <button name='addon_bt' type='button' 
                   onClick="SelectSoft('form1.zipfile')" class="btn btn-secondary btn-sm">浏览...</button>
-                <input name="delzip" type="checkbox" id="delzip" value="1" checked="checked" />
-                处理后删除压缩文件 </td>
+                <label><input name="delzip" type="checkbox" id="delzip" value="1" checked="checked" />
+                处理后删除压缩文件</label> </td>
             </tr>
           </table>
         </td>
@@ -358,7 +358,7 @@
         <td width="100%" height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="80" height="40">&nbsp;<b>手工上传：</b></td>
+              <td width="90" height="40">&nbsp;<b>手工上传：</b></td>
               <td>
                 <span class="btn btn-secondary btn-sm fileinput-button">
                   <i class="glyphicon glyphicon-plus"></i>

src/dede/templets/album_edit.htm

@@ -112,7 +112,7 @@ body {
     <tr>
       <td width="400%" height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;自定义属性：</td>
+            <td width="100">&nbsp;自定义属性：</td>
             <td><?php
             $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
             $dsql->Execute();
@@ -140,7 +140,7 @@ body {
     <tr>
       <td width="400%" height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;TAG标签：</td>
+            <td width="90">&nbsp;Tag标签：</td>
             <td width="536"><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />
               (','号分开，单个标签小于12字节) </td>
             <td width="40">权重：</td>
@@ -186,7 +186,7 @@ body {
     <tr>
       <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;图集主栏目：</td>
+            <td width="100">&nbsp;图集主栏目：</td>
             <td><?php
            	$typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
            	echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
@@ -205,7 +205,7 @@ if($cfg_need_typeid2=='Y') {
     <tr>
       <td height="24" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;图集副栏目：</td>
+            <td width="100">&nbsp;图集副栏目：</td>
             <td><span id='typeid2ct'></span>
               <input type='text' name='typeid2' id='typeid2' value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
               <img src='images/menusearch2.gif' style='cursor:pointer;' onClick="ShowCatMap(event, this, <?php echo $channelid; ?>, 'typeid2', '<?php echo $arcRow['typeid2']; ?>')" alt='选择副栏目' title='选择副栏目' /></td>
@@ -404,7 +404,7 @@ if($cfg_need_typeid2=='Y') {
     <tr id="zipff" style="display:none">
       <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0" height="100">
           <tr>
-            <td width="90">&nbsp;压缩包文件：</td>
+            <td width="100">&nbsp;压缩包文件：</td>
             <td><input type='text' name='zipfile' id='zipfile' style='width:300px'>
               <button name='addon_bt' type='button' class='btn btn-secondary btn-sm' onClick="SelectSoft('form1.zipfile')">浏览...</button>
               <label><input name="delzip" type="checkbox" id="delzip" value="1" checked="checked" />
@@ -477,7 +477,7 @@ if($cfg_need_typeid2=='Y') {
     <tr>
       <td height="24" colspan="4" class="bline" style="background:#F9FCEF;"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;<b>增加新图片：</b></td>
+            <td width="100">&nbsp;<b>增加新图片：</b></td>
             <td>
               <span class="btn btn-secondary btn-sm fileinput-button">
                 <i class="glyphicon glyphicon-plus"></i>

src/dede/templets/archives_add.htm

@@ -114,7 +114,7 @@
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td>
                 <?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
@@ -148,7 +148,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
+              <td width="90">&nbsp;Tag标签：</td>
               <td width="526">
                 <input name="tags" type="text" id="tags" value="" style="width:300px" />(','号分开，单个标签小于12字节)
               </td>
@@ -205,7 +205,7 @@
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文档主栏目：</td>
+              <td width="100">&nbsp;文档主栏目：</td>
               <td>
                 <span id='typeidct'>
                   <?php
@@ -233,7 +233,7 @@
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文档副栏目：</td>
+              <td width="100">&nbsp;文档副栏目：</td>
               <td>
                 <span id='typeid2ct'></span><input type='text' name='typeid2' id='typeid2' value=''
                   style='width:200px;' />

src/dede/templets/archives_edit.htm

@@ -35,7 +35,7 @@
   <script language="javascript">
     function checkSubmit() {
       if (document.form1.title.value == "") {
-        alert("<?php echo $cInfos['titlename']; ?>不能为空！");
+        ShowMsg("<?php echo $cInfos['titlename']; ?>不能为空！");
         document.form1.title.focus();
         return false;
       }
@@ -49,7 +49,7 @@
       <td width="65%" height="30"><IMG height=14 src="images/book1.gif" width=20>&nbsp;<a
           href="catalog_do.php?cid=<?php echo $arcRow['typeid']?>&channelid=<?php echo $channelid?>&dopost=listArchives"><u>文档列表</u></a>
         &gt;&gt; 更改文档</td>
-      <td width="30%" align='right'><?php echo $backurl; ?><a href="catalog_main.php">[<u>栏目管理</u>]</a>&nbsp;</td>
+      <td width="30%" align='right'><?php echo $backurl; ?><a href="catalog_main.php" class="btn btn-secondary btn-sm">栏目管理</a>&nbsp;</td>
     </tr>
   </table>
   <table width="98%" border="0" align="center" cellpadding="0" cellspacing="0" id="head1">
@@ -104,7 +104,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td>
                 <?php
                 $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
@@ -114,9 +114,9 @@
                     if($trow->att=='j') $jumpclick = " onclick='ShowUrlTr()'";
                     else $jumpclick = '';
                     if(preg_match("#".$trow->att."#", $arcRow['flag']))
-                    echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked' />{$trow->attname}[{$trow->att}]";
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}' {$jumpclick} checked='checked' /> {$trow->attname}[{$trow->att}]</label> ";
                     else
-                    echo "<input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} />{$trow->attname}[{$trow->att}]";
+                    echo "<label><input class='np' type='checkbox' name='flags[]' id='flags{$trow->att}' value='{$trow->att}'{$jumpclick} /> {$trow->attname}[{$trow->att}]</label> ";
                 }
             ?>
               </td>
@@ -142,7 +142,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
+              <td width="90">&nbsp;Tag标签：</td>
               <td>
                 <input name="tags" type="text" id="tags" value="<?php echo $tags; ?>"
                   style="width:300px" />(','号分开，单个标签小于12字节)
@@ -162,18 +162,18 @@
               <td width="90" height="81">
                 &nbsp;缩 略 图：<br />
                 &nbsp; </td>
-              <td width="560">
+              <td width="600">
                 <input name="picname" type="text" id="picname" style="width:300px"
-                  value="<?php echo $arcRow["litpic"]?>"><input type="button" name="Submit" value="浏览..."
-                  style="width:70px" onClick="SelectImage('form1.picname','');">
-                <input type='checkbox' class='np' name='ddisremote' value='1'>
-                远程
-                <span class="btn btn-success fileinput-button">
+                  value="<?php echo $arcRow["litpic"]?>"> <button class="btn btn-secondary" type="button" name="Submit"
+                  style="width:70px" onClick="SelectImage('form1.picname','');">浏览...</button>
+                <label><input type='checkbox' class='np' name='ddisremote' value='1'>
+                远程</label>
+                <span class="btn btn-secondary fileinput-button">
                   <i class="glyphicon glyphicon-plus"></i>
                   选择图片
                   <input type="file" name="files[]" id="iptAddImages">
                 </span>
-                <button id="btnClearAll" type="button" class="btn btn-danger delete">
+                <button id="btnClearAll" type="button" class="btn btn-secondary delete">
                   <i class="fa fa-trash-o"></i>
                   <span>清空</span>
                 </button>
@@ -199,7 +199,7 @@
         <td height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文档主栏目：</td>
+              <td width="100">&nbsp;文档主栏目：</td>
               <td>
                 <?php
             $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
@@ -222,7 +222,7 @@ if($cfg_need_typeid2=='Y') {
         <td height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文档副栏目：</td>
+              <td width="100">&nbsp;文档副栏目：</td>
               <td>
                 <span id='typeid2ct'></span>
                 <input type='text' name='typeid2' id='typeid2'
@@ -249,10 +249,10 @@ if($cfg_need_typeid2=='Y') {
             <tr>
               <td width="90">&nbsp;附加选项：</td>
               <td>
-                <input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
-                下载远程图片和资源
-                <input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" checked>
-                提取第一个图片为缩略图 </td>
+                <label><input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
+                下载远程图片和资源</label>
+                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>
+                提取第一个图片为缩略图</label> </td>
             </tr>
           </table>
         </td>
@@ -267,11 +267,11 @@ if($cfg_need_typeid2=='Y') {
             <tr>
               <td width="90" height="22" width="240">&nbsp;评论选项：</td>
               <td width="250">
-                <input type='radio' name='notpost' class='np' value='0'
-                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> />允许评论
+                <label><input type='radio' name='notpost' class='np' value='0'
+                  <?php if($arcRow['notpost']==0) echo " checked='1' "; ?> /> 允许评论</label>
                 &nbsp;
-                <input type='radio' name='notpost' class='np' value='1'
-                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> />禁止评论
+                <label><input type='radio' name='notpost' class='np' value='1'
+                  <?php if($arcRow['notpost']==1) echo " checked='1' "; ?> /> 禁止评论</label>
               </td>
               <td width="90">浏览次数：</td>
               <td>
@@ -288,12 +288,12 @@ if($cfg_need_typeid2=='Y') {
               <td width="90">&nbsp;文档来源：</td>
               <td width="250">
                 <input name="source" type="text" id="source" style="width:160" value="<?php echo $arcRow["source"]?>"
-                  size="16"><input name="selsource" type="button" id="selsource" value="选择"> </td>
+                  size="16"> <button name="selsource" type="button" id="selsource" class="btn btn-secondary btn-sm">选择</button> </td>
               <td width="90">作　者：</td>
               <td>
                 <input name="writer" type="text" id="writer" style="width:120px"
-                  value="<?php echo $arcRow["writer"]?>"><input name="selwriter" type="button" id="selwriter"
-                  value="选择"> </td>
+                  value="<?php echo $arcRow["writer"]?>"> <button class="btn btn-secondary btn-sm" name="selwriter" type="button" id="selwriter"
+                  >选择</button> </td>
             </tr>
           </table>
           <script language='javascript'>InitPage();</script>
@@ -318,8 +318,9 @@ if($cfg_need_typeid2=='Y') {
                 </select> </td>
               <td width="90">标题颜色：</td>
               <td><input name="color" type="text" id="color" style="width:120"
-                  value="<?php echo $arcRow["color"]?>"><input name="modcolor" type="button" id="modcolor" value="选取"
-                  onClick="ShowColor(event,this)"></td>
+                  value="<?php echo $arcRow["color"]?>">
+                  <button name="modcolor" type="button" id="modcolor" class="btn btn-secondary btn-sm"
+                  onClick="ShowColor(event,this)">选取</button></td>
             </tr>
           </table>
         </td>
@@ -343,12 +344,12 @@ if($cfg_need_typeid2=='Y') {
               ?>
                 </select> </td>
               <td width="90">发布选项：</td>
-              <td> <input name="ishtml" type="radio" class="np" value="1"
+              <td> <label><input name="ishtml" type="radio" class="np" value="1"
                   <?php if($arcRow["ismake"]!=-1) echo " checked";?>>
-                生成HTML
-                <input type="radio" name="ishtml" class="np" value="0"
+                生成HTML</label>
+                <label><input type="radio" name="ishtml" class="np" value="0"
                   <?php if($arcRow["ismake"]==-1) echo " checked";?>>
-                仅动态浏览 </td>
+                仅动态浏览</label> </td>
             </tr>
           </table>
         </td>
@@ -360,7 +361,7 @@ if($cfg_need_typeid2=='Y') {
               <td width="90">&nbsp;更新时间：</td>
               <td width="250"><?php
 			$nowtime = GetDateTimeMk(time());
-			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\">";
+			echo "<input name=\"pubdate\" value=\"$nowtime\" type=\"text\" id=\"pubdate\" class='datepicker'>";
 			?>
               </td>
               <td width="92">消费金币：</td>
@@ -397,7 +398,7 @@ if($cfg_need_typeid2=='Y') {
         <td height="24" colspan="4">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义文件名：</td>
+              <td width="120">&nbsp;自定义文件名：</td>
               <td width="449"><input type="text" name="filename" id="filename"
                   value="<?php echo $arcRow["filename"]?>" />（不包括后缀名如.html等）</td>
               <td width="261">&nbsp;</td>

src/dede/templets/archives_sg_add.htm

@@ -88,7 +88,7 @@ function checkSubmit()
       <td height="24" colspan="4" class="bline">
       	<table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;自定义属性：</td>
+            <td width="100">&nbsp;自定义属性：</td>
             <td>
             	<?php
             	$dsql->SetQuery("Select * From `#@__arcatt` where att<>'j' And att<>'p' order by sortid asc");
@@ -170,7 +170,7 @@ function checkSubmit()
       <td height="24" colspan="4" class="bline">
       	<table width="800" border="0" cellspacing="0" cellpadding="0">
         <tr>
-          <td width="90">&nbsp;文档主栏目：</td>
+          <td width="100">&nbsp;文档主栏目：</td>
           <td>
           	<span id='typeidct'>
        <?php

src/dede/templets/archives_sg_edit.htm

@@ -81,7 +81,7 @@ function checkSubmit()
       <td width="400%" height="24" class="bline">
       	<table width="800" border="0" cellspacing="0" cellpadding="0">
         <tr>
-          <td width="90">&nbsp;自定义属性：</td>
+          <td width="100">&nbsp;自定义属性：</td>
           <td>
             <?php
                 $dsql->SetQuery("SELECT * FROM `#@__arcatt` WHERE att<>'j' AND att<>'p' ORDER BY sortid ASC");
@@ -162,7 +162,7 @@ function checkSubmit()
     <tr>
       <td height="24" class="bline"> <table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
-            <td width="90">&nbsp;文档主栏目：</td>
+            <td width="100">&nbsp;文档主栏目：</td>
             <td>
             <?php
             $typeOptions = GetOptionList($addRow['typeid'],$cuserLogin->getUserChannel(),$channelid);

src/dede/templets/article_add.htm

@@ -135,7 +135,7 @@
         <td height="24" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td align="left">
                 <?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
@@ -234,7 +234,7 @@
         <td height="24" colspan="5" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章主栏目：</td>
+              <td width="100">&nbsp;文章主栏目：</td>
               <td>
                 <span id='typeidct'>
                   <?php

src/dede/templets/article_edit.htm

@@ -108,7 +108,7 @@
         <td width="400%" height="24" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td><?php
          $dsql->SetQuery("SELECT * FROM `#@__arcatt` ORDER BY sortid ASC");
          $dsql->Execute();
@@ -153,7 +153,7 @@
         <td width="400%" height="24" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
+              <td width="90">&nbsp;Tag标签：</td>
               <td><input name="tags" type="text" id="tags" value="<?php echo $tags; ?>" style="width:300px" />
                 (','号分开，单个标签小于12字节)</td>
               <td width="40">权重：</td>
@@ -213,7 +213,7 @@
         <td height="24" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章主栏目：</td>
+              <td width="100">&nbsp;文章主栏目：</td>
               <td><?php
             $typeOptions = GetOptionList($arcRow['typeid'],$cuserLogin->getUserChannel(),$channelid);
             echo "<select name='typeid' id='typeid' style='width:240px'>\r\n";
@@ -236,7 +236,7 @@ if($cfg_need_typeid2=='Y') {
         <td height="24" colspan="2" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章副栏目：</td>
+              <td width="100">&nbsp;文章副栏目：</td>
               <td><span id='typeid2ct'></span>
                 <input type='text' name='typeid2' id='typeid2'
                   value='<?php echo ($arcRow['typeid2']=='0' ? '' : $arcRow['typeid2']); ?>' style='width:200px;' />
@@ -264,7 +264,7 @@ if($cfg_need_typeid2=='Y') {
               <td>
                 <label><input name="remote" type="checkbox" class="np" id="remote" value="1" checked>
                 下载远程图片和资源</label>
-                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" checked>
+                <label><input name="autolitpic" type="checkbox" class="np" id="autolitpic" value="1" <?php if($cfg_arc_autopic=='Y') echo ' checked="1" '; ?>>
                 提取第一个图片为缩略图</label> </td>
             </tr>
           </table>

src/dede/templets/diy_main.htm

@@ -47,8 +47,8 @@
 			<td><a href="diy_list.php?action=list&diyid={dede:field.diyid/}"><u>{dede:field.name/}</u></a></td>
 			<td>{dede:field.table/}</td>
 			<td>
-				<a href='diy_edit.php?diyid={dede:field.diyid/}&dopost=edit' class="btn btn-secondary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 更改</a> |
-				<a href='diy_edit.php?diyid={dede:field.diyid/}&dopost=delete' class="btn btn-secondary btn-sm"> <i class="fa fa-trash" aria-hidden="true"></i> 删除 </a> |
+				<a href='diy_edit.php?diyid={dede:field.diyid/}&dopost=edit' class="btn btn-secondary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 更改</a>
+				<a href='diy_edit.php?diyid={dede:field.diyid/}&dopost=delete' class="btn btn-secondary btn-sm"> <i class="fa fa-trash" aria-hidden="true"></i> 删除 </a>
 				<a href="../plus/diy.php?action=list&diyid={dede:field.diyid/}" class="btn btn-secondary btn-sm" target="_blank"> <i class="fa fa-globe" aria-hidden="true"></i> 前台预览</a>
 			</td>
 		</tr>

src/dede/templets/index2.htm

@@ -69,7 +69,7 @@
 <div class="head">
   <div class="top">
     <div class="top_logo"> <img src="images/style<?php echo $cfg_admin_skin;?>/admin_top_logo.gif" width="200" height="37" alt="DedeCMS Logo" title="Welcome use DedeCMS" id="topdedelogo" /> </div>
-    <div class="top_version" style="padding-top: 18px;font-weight: bolder;color: white;float: left;margin-left: -10px;font-style:italic;">v6</div>
+    <div class="top_version" style="padding-top: 23px;font-weight: bolder;color: white;float: left;margin-left: -10px;font-style:italic;">v6</div>
     <div class="top_link">
       <ul>
         <li class="welcome">您好：<?php echo $cuserLogin->getUserName(); ?> ，欢迎使用DedeCMS！</li>

src/dede/templets/index_body.htm

@@ -44,6 +44,7 @@
             display: flex;
             flex-direction: column;
         }
+
         .footer {
             padding: 10px;
         }
@@ -84,7 +85,7 @@
                     </div>
                     <!--/.card-header-->
                     <div class="card-body" id="_systeminfo">
-                    正在载入中...
+                        正在载入中...
                     </div>
                     <!--/.card-body-->
                 </div>
@@ -141,7 +142,7 @@
                                 echo "信息采集员或其它管理员";
                             }
                         ?>
-                                <a href="javascript:showMore()" class="btn btn-secondary btn-sm">查看更多</a></td>
+                                    <a href="javascript:showMore()" class="btn btn-secondary btn-sm">查看更多</a></td>
                             </tr>
                             <tr>
                                 <td colspan="2" class='nline' id="allInfoTD" style="display:none">
@@ -393,12 +394,10 @@
         </div>
     </div>
 
-<?php
-if (defined('DEDEBIZ')) {
-?>
-<script>
-    $(document).ready(function () {
-        setInterval(function(){
+    <script>
+
+        // 加载服务信息
+        function LoadServer() {
             $.get("index_body.php?dopost=system_info", function (data) {
                 let rsp = JSON.parse(data);
                 if (rsp.code === 200) {
@@ -428,16 +427,17 @@ if (defined('DEDEBIZ')) {
                 } else {
                     $("#_systeminfo").html(`尚未启动Dede商业站点服务，<a class="btn btn-danger">去开启</a>`);
                 }
-                
-            })
-        }, 5000)
 
+            });
+        }
 
-    });
-</script>
-<?php
-}
-?>
+        $(document).ready(function () {
+            LoadServer();
+            setInterval(function () {
+                LoadServer();
+            }, 1000)
+        });
+    </script>
 </body>
 
 </html>

src/dede/templets/index_body_move.htm

@@ -1,288 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>DedeCMS Home</title>
-<base target="_self">
-<link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-<script language="javascript" src="../static/js/dedeajax2.js"></script>
-<script language="javascript" src="js/jquery.json-2.2.min.js"></script>
-<script language="javascript" src="js/indexbody.js"></script>
-</head>
-<body leftmargin="8" topmargin='8' bgcolor="#FFFFFF">
-<table width="98%" border="0" align="center" cellpadding="0" cellspacing="0">
-  <tr>
-    <td>
-     <div style='float:left'>
-       欢迎使用专业的PHP网站管理系统，轻松建站的首选利器 -- <?php echo $cfg_softname; ?>
-     </div>
-     <div id='' style='float:right;padding-right:8px;'>
-         <!--  //保留位置（顶右）  -->
-     </div>
-   </td>
-  </tr>
-  <tr>
-    <td height="1" background="images/sp_bg.gif" style='padding:0px'></td>
-  </tr>
-</table>
-
-<div id='mainmsg'>
-<?php
-$dtp = new DedeTagparse();
-$dtp->SetNameSpace("menu","<",">");
-$dtp->LoadTemplet($myIcoFile);
-if(is_array($dtp->CTags)){
-	$menu = "";
-    foreach($dtp->CTags as $ctag){
-        $title = $ctag->GetAtt("title");
-        $ico = $ctag->GetAtt("ico");
-        $link = $ctag->GetAtt("link");
-        $menu .= '<div class="icoitem" style="background:url('.$ico.') 10px 3px no-repeat;"><a href='.$link.'>'.$title.'</a></div>';
-    }
-}
-//
-if($cuserLogin->getUserType()==10) {
-    $adminname = "总管理员";
-} else if($cuserLogin->getUserType()==5) {
-    $adminname = "频道总编";
-} else {
-    $adminname = "信息采集员或其它管理员";
-}
-//
-if($isSafeMode) {
-    $safe = '<br><font color="blue">由于您的系统以安全模式运行，为了确保程序兼容性，第一次进入本系统时请更改“<a href="sys_info.php"><u>更改系统参数</u></a>”里的FTP选项，并选择用FTP形式创建目录，完成后：<a href="testenv.php" style="color:red"><u>点击此进行一次DedeCMS目录权限检测&gt;&gt;</u></a></font>';
-} else {
-    $safe =  '<a href="testenv.php" style="color:blue"><u>DedeCMS目录权限检测&gt;&gt;</u></a></font>';
-}
-//
-$needfunc = array("dir","phpinfo");
-$n = 0;
-foreach($needfunc as $k) {
-    if(!function_exists($k)) {
-        echo '<font color="red">[{$k}×]</font>';
-        $n++;
-    }
-}
-if($n==0) {
-    $need = "符合要求";
-} else {
-    $need =  "被禁用的函数可能导致部份功能无法使用！";
-}
-//
-$phpversion = @phpversion();
-$gdversion = @gdversion();
-$isSafeMode  = $isSafeMode ? "On" : "Off";
-$regblo = ini_get("register_globals") ? "On" : "Off";
-$magquo = ini_get("magic_quotes_gpc") ? "On" : "Off";
-$post_msize = ini_get("post_max_size");
-$alluf = ini_get("allow_url_fopen") ? "支持" : "不支持";
-
-$query = "SELECT arc.id, arc.arcrank, arc.title, arc.channel, ch.editcon  FROM `#@__archives` arc
-        LEFT JOIN `#@__channeltype` ch ON ch.id = arc.channel
-         WHERE arc.arcrank<>-2 ORDER BY arc.id DESC LIMIT 0, 6 ";
-$arcArr = array();
-$dsql->Execute('m', $query);
-while($row = $dsql->GetArray('m'))
-{
-    $arcArr[] = $row;
-}
-$latestNews = '<table width="100%" class="dboxtable">';
-foreach($arcArr as $row)
-{
-    if(trim($row['editcon'])=='') {
-        $row['editcon'] = 'archives_edit.php';
-    }
-    $linkstr = "·<a href='{$row['editcon']}?aid={$row['id']}&channelid={$row['channel']}'>{$row['title']}</a>";
-    if($row['arcrank']==-1) $linkstr .= "<font color='red'>(未审核)</font>";
-    $latestNews .= '    <tr>
-        <td class=\'nline\'>'.$linkstr;
-    $latestNews .= '        </td>
-    </tr>';
-}
-$latestNews .= '</table>';
-
-$drgonIterm = array(
-            'item1' => '<dt class="lside"><span class="l">'.$cfg_soft_enname.';更新消息</span></dt>
-                        <dd>
-                            <div id="updatetest">
-                                <div id="updateinfos">
-                                      <div class="updatedvt"><b>您系统版本最后更新时间为：'.$oktime.' </b><br/>
-                                      <a href="javascript:LoadUpdateInfos();" class="np coolbg">进行在线更新</a> &nbsp
-                                       <a href="sys_repair.php" class="np coolbg">系统错误修复</a></div>
-                                       <iframe name="stafrm" src="'.$offUrl.'&uptime='.$oktime.'" frameborder="0" id="stafrm" width="98%" height="50"></iframe>
-                                </div>
-                             </div>
-                        </dd>',
-            'item2' => '<dt class="lside"><span class="l">商业授权查询</span></dt>
-                        <dd>
-                            <div class="biz">
-                                <script type="text/javascript" src="'.UPDATEHOST.'/dedecms/authorization.'.$cfg_soft_lang.'.js"></script>
-                            </div>
-                        </dd>',
-            'item3' => '<dt class="lside">
-                                <div class="l">快捷操作</div>
-                                <div class="r"><a href="#" onClick="AddNew()"><b>【新增】</b></a><a href="#" onClick="ListAll()"><b>【管理】</b></a></div>
-                            </dt>
-                            <dd>
-                                <div id="quickmenu">'.$menu .'
-                                </div>
-                            </dd> ',
-            'item4' => '<dt class="lside"><div class="l">系统基本信息</div></dt>
-                        <dd class="intable">
-                            <table width="98%" class="dboxtable">
-                                <tr>
-                                    <td width="25%" class="nline">您的级别：</td>
-                                    <td class="nline">'.$adminname.'
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td rowspan="5" class="nline">PHP环境摘要：</td>
-                                    <td class="nline"> PHP版本：'.$phpversion.'&nbsp;GD版本：'.$gdversion.'</td>
-                                </tr>
-                                <tr>
-                                    <td class="nline">是否安全模式：<font color="red">'.$isSafeMode .'</font> '.$safe.'
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="nline">
-                                        Register_Globals：<font color="red">'.$regblo.'</font> &nbsp;
-                                        Magic_Quotes_Gpc：<font color="red">'.$magquo.'</font>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="nline">支持上传的最大文件：'.$post_msize.'</td>
-                                </tr>
-                                <tr>
-                                    <td class="nline">是否允许打开远程连接：'.$alluf .'</td>
-                                </tr>
-                                <tr>
-                                    <td class="nline"> 其它必须函数检测：</td>
-                                    <td class="nline">'.$need.'
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td class="nline"> 软件版本信息： </td>
-                                    <td class="nline"> 版本名称：'.$cfg_soft_enname.'&nbsp;版本号：'.$cfg_version.'</td>
-                                </tr>
-                            </table>
-                        </dd>',
-
-            'item5' => '<dt class="lside"><div class="l">开发团队</div></dt>
-                        <dd class="intable">
-                            <table width="98%" class="dboxtable">
-                                <tr>
-                                    <td width="25%" height="36" class="nline"> 主程序开发： </td>
-                                    <td class="nline">天涯、IT柏拉图、沙羡、蓝色随想、Niap、木匠、cha369</td>
-                                </tr>
-                                <tr>
-                                    <td height="36" class="nline">界面及交互设计：</td>
-                                    <td class="nline">like、猪头心宇、方域、小王</td>
-                                </tr>
-                                <tr>
-                                    <td height="36" class="nline">官方论坛协助：</td>
-                                    <td class="nline">感谢以下站长（排名不分先后）:疯狂的锤子、木木/阿杰</td>
-                                </tr>
-            
-                            </table>
-                        </dd>',
-
-            'item6' => '<dt class="lside"><div class="l">信息统计</div></dt>
-                        <dd id=\'listCount\'>
-                            正在载入...
-                        </dd>',
-            'item7' => '<dt class="lside"><div class="l">最新文档</div></dt>
-                        <dd id=\'listNews\'>
-                            ' .$latestNews. '
-                        </dd>',
-                        
-            'item8' => '<dt class="lside"><div class="l">官方动态</div></dt>
-                        <dd>
-                            <table width="98%" class="dboxtable">
-                                <tr>
-                                    <td width="25%" height="36" class="nline"> 会员数：</td>
-                                    <td class="nline">22</td>
-                                </tr>
-                                <tr>
-                                    <td height="36" class="nline">文档数：</td>
-                                    <td class="nline">433</td>
-                                </tr>
-                                <tr>
-                                    <td height="36" class="nline">普通文章：</td>
-                                    <td class="nline">235</td>
-                                </tr>
-                            </table>
-                        </dd>',                        
-)
-?>
-    <div class="column" id="column1"><!--左侧开始-->
-        <?php foreach ($column1 as $row) {        ?>
-        <dl class="dbox" id="<?php echo $row ?>">
-             <?php echo $drgonIterm[$row]; ?>
-        </dl>
-        <?php } ?>
-    </div><!--左侧结束-->
-    <div class="column" id="column2" ><!-- //右边的快捷消息开始 -->
-        <?php foreach ($column2 as $row) {        ?>
-        <dl class="dbox" id="<?php echo $row ?>">
-             <?php echo $drgonIterm[$row]; ?>
-        </dl>
-        <?php } ?> 
-    </div>
-</div>
-<br style='clear:both'/>
-<!-- //底部 -->
-<div align="center" class="footer">
-Copyright &copy; 2004-2020 <a href='http://www.dedecms.com' target='_blank'><u>DedeCMS</u></a>. 织梦科技 版权所有
-</div>
-
-<!--  下面是隐藏的项目  -->
-<div id='loaddiv' style='display:none'>
-    <p align='center' style='padding-top:200px'><img src='images/loadinglit.gif' /> 请稍后，正在下载更新文件列表...</p>
-</div>
-<div id="editTab">
-<span id='editTabBody'>请稍候，正在载入...</span>
-</div>
-<div id="addTab">
-<form name='addform' action='index_body.php'>
-<input type='hidden' name='dopost' value='addnew' />
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-   <tr>
-     <td height='28' colspan='3' background="images/tbg.gif">
-       <div style='float:left'><b>增加快捷操作项</b></div>
-      <div style='float:right;padding:3px 10px 0 0;'>
-         <a href="javascript:CloseTab('addTab')"><img src="images/close.gif" width="12" height="12" border="0" /></a>
-      </div>
-     </td>
-   </tr>
-      <tr><td style="height:6px;font-size:1px;border-top:1px solid #8DA659" colspan="2">&nbsp;</td></tr>
-   <tr>
-     <td width="20%" height="28">链接标题：</td>
-     <td width="70%">
-         <input name="title" type="text" id="title" class='pubinputs' />
-     </td>
-   </tr>
-   <tr>
-     <td height="28" width="20%">ICO图片：</td>
-     <td width="70%">
-         <input name="ico" type="text" id="ico" class='pubinputs' />
-     </td>
-   </tr>
-   <tr>
-     <td height="28" width="20%">链接网址：</td>
-     <td width="70%">
-         <input name="link" type="text" id="link" class='pubinputs' />
-     </td>
-   </tr>
-   <tr>
-     <td height="45">&nbsp;</td>
-     <td>
-         <input type="submit" name="Submit" value="保存项目" class="np coolbg" style="width:80px;cursor:pointer" />
-     </td>
-   </tr>
-  </table>
-</form>
-</div>
-
-</body>
-</html>

src/dede/templets/index_body_showad.htm

@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>DedeCMS Home</title>
-<link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-</head>
-<body>
-<div class="dboxtable1">
-  <ul>
-    <script type="text/javascript" src="<?php echo UPDATEHOST;?>/dedecms/admincpad.<?php echo $cfg_soft_lang; ?>.js"></script>
-  </ul>
-</div>
-</body>
-</html>

src/dede/templets/index_body_showauth.htm

@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>DedeCMS Home</title>
-<link rel="stylesheet" type="text/css" href="css/base.css" />
-<link rel="stylesheet" type="text/css" href="css/indexbody.css" />
-</head>
-<body>
-<div class="biz">
-  <script type="text/javascript" src="<?php echo UPDATEHOST;?>/dedecms/authorization.<?php echo $cfg_soft_lang; ?>.js"></script>
-</div>
-</body>
-</html>

src/dede/templets/index_menu2.htm

@@ -18,7 +18,7 @@ echo "<script language='javascript'>var curopenItem = '$openitem';</script>\r\n"
 		}
 
 		.sitemu a {
-			font-size: 90%;
+			font-size: 13px;
 			color: rgba(0,0,0,.65);
 		}
 

src/dede/templets/mychannel_field_add.htm

@@ -222,10 +222,10 @@ class="table maintable table-bordered mt-3">
           <tr> 
             <td width="26%" height="45">&nbsp;</td>
             <td width="10%">
-            <button type="submit" name="button1" id="button1" class="btn btn-secondary btn-sm">确定</button>
+            <button type="submit" name="button1" id="button1" class="btn btn-secondary">确定</button>
             </td>
             <td>
-            <button type="reset" name="button2" id="button2" class="btn btn-secondary btn-sm">重置</button>
+            <button type="reset" name="button2" id="button2" class="btn btn-secondary">重置</button>
             </td>
           </tr>
         </table>

src/dede/templets/mychannel_field_edit.htm

@@ -221,9 +221,9 @@
           <table width="100%" border="0" cellspacing="0" cellpadding="0" class="table table-borderless">
             <tr>
               <td width="26%" height="45">&nbsp;</td>
-              <td width="10%"><button type="submit" name="button1" id="button1" class="btn btn-secondary btn-sm">确定</button>
+              <td width="10%"><button type="submit" name="button1" id="button1" class="btn btn-secondary">确定</button>
               </td>
-              <td><button type="reset" name="button3" id="button3" class="btn btn-secondary btn-sm">重置</button>
+              <td><button type="reset" name="button3" id="button3" class="btn btn-secondary">重置</button>
               </td>
             </tr>
           </table>

src/dede/templets/soft_add.htm

@@ -121,7 +121,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td><?php
           $dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
           $dsql->Execute();
@@ -152,11 +152,11 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="89">&nbsp;TAG标签：</td>
-              <td width="516">
+              <td width="89">&nbsp;Tag标签：</td>
+              <td width="540">
                 <input name="tags" type="text" id="tags" value="" style="width:300px" />
-                (','号分开，单个标签小于12字节</td>
-              <td width="37">权重：</td>
+                (','号分开，单个标签小于12字节)</td>
+              <td width="50">权重：</td>
               <td width="158"><input name="weight" type="text" id="weight" style="width:50px"
                   value="<?php echo $maxWright['cc'];?>" />(越小越靠前)</td>
             </tr>
@@ -215,7 +215,7 @@
         <td height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;软件主栏目：</td>
+              <td width="100">&nbsp;软件主栏目：</td>
               <td>
                 <span id='typeidct'>
                   <?php
@@ -365,7 +365,7 @@
         <td height="24" class="bline">
           <table width="800" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="90" height="30">&nbsp;需会员权限：</td>
+              <td width="100" height="30">&nbsp;需会员权限：</td>
               <td width="179" align="left">
                 <select name="daccess" id="daccess" style="width:90px">
                   <?php
@@ -385,7 +385,7 @@
                   size="8" />个 </td>
             </tr>
             <tr>
-              <td height="26" colspan="4" style="border-top:1px dashed #8EAF61">&nbsp; <span
+              <td height="26" colspan="4" style="border-top:1px dashed #8EAF61" class="py-3">&nbsp; <span
                   class="STYLE1">（如果设定了下载限制，<a class='btn btn-secondary btn-sm' href="soft_config.php"
                     target="_blank">软件频道设置</a>中“附件下载方式：”必须选择“链接到跳转页面”） </span></td>
             </tr>

src/dede/templets/soft_edit.htm

@@ -108,7 +108,7 @@
         <td width="400%" height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td>
                 <?php
 		    $dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
@@ -144,7 +144,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;TAG标签：</td>
+              <td width="90">&nbsp;Tag标签：</td>
               <td>
                 <input name="tags" type="text" id="tags" value="<?php echo $tags; ?>"
                   style="width:300px" />(','号分开，单个标签小于12字节) </td>
@@ -207,7 +207,7 @@
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;文章主栏目：</td>
+              <td width="100">&nbsp;文章主栏目：</td>
               <td>
                 <?php
           $typeOptions = GetOptionList($arcRow["typeid"],$cuserLogin->getUserChannel(),$channelid);
@@ -231,7 +231,7 @@ if($cfg_need_typeid2=='Y') {
         <td height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;软件副栏目：</td>
+              <td width="100">&nbsp;软件副栏目：</td>
               <td>
                 <span id='typeid2ct'></span>
                 <input type='text' name='typeid2' id='typeid2'
@@ -362,9 +362,9 @@ if($cfg_need_typeid2=='Y') {
         <td height="24" class="bline">
           <table width="800" border="0" cellpadding="0" cellspacing="0">
             <tr>
-              <td width="90" height="30">&nbsp;需会员权限：</td>
+              <td width="100" height="30">&nbsp;需会员权限：</td>
               <td width="179" align="center">
-                <select name="daccess" id="daccess" style="width:90px">
+                <select name="daccess" id="daccess" style="width:100px">
                   <?php
                 $dsql->SetQuery("Select * from `#@__arcrank` where rank>=0 ");
                 $dsql->Execute();
@@ -384,7 +384,7 @@ if($cfg_need_typeid2=='Y') {
             </tr>
             <tr>
               <td height="26" colspan="4" style="border-top:1px dashed #8EAF61">&nbsp; <span
-                  class="STYLE1">（如果设定了下载限制，<a href="soft_config.php"
+                  class="STYLE1 py-3">（如果设定了下载限制，<a href="soft_config.php"
                     target="_blank"><u>软件频道设置</u></a>中“附件下载方式：”必须选择“链接到跳转页面”） </span></td>
             </tr>
           </table>
@@ -397,7 +397,7 @@ if($cfg_need_typeid2=='Y') {
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="72">&nbsp;其它地址：</td>
+              <td width="90">&nbsp;其它地址：</td>
               <td>
                 <input name="picnum" type="text" id="picnum" size="8" value="5" />
                 <button class='btn btn-secondary btn-sm' name='kkkup' type='button' id='kkkup2' onClick="MakeUpload();">增加数量</button>

src/dede/templets/spec_add.htm

@@ -138,7 +138,7 @@
         <td height="24" colspan="4" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td><?php
             	$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");
             	$dsql->Execute();

src/dede/templets/spec_edit.htm

@@ -151,7 +151,7 @@
         <td width="400%" height="24" class="bline">
           <table width="800" border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="90">&nbsp;自定义属性：</td>
+              <td width="100">&nbsp;自定义属性：</td>
               <td>
                 <?php
 				$dsql->SetQuery("Select * From `#@__arcatt` order by sortid asc");

src/dede/templets/sys_data_replace.htm

@@ -127,7 +127,8 @@
                       <input type="text" name="validate" class="alltxt" style="width:80px;text-transform: uppercase;" />
                     </td>
                     <td>
-                      <img src='../plus/vdimgck.php' />
+                      <img src='../plus/vdimgck.php'  style="cursor:pointer;"
+                      onclick="this.src='../plus/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)"/>
                     </td>
                   </tr>
                 </table>

src/dede/templets/sys_payment_install.htm

@@ -1,56 +1,71 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>安装支付接口</title>
-<link href="css/base.css" rel="stylesheet" type="text/css" />
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>安装支付接口</title>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="css/base.css" rel="stylesheet" type="text/css" />
 </head>
 <style>
-.npvar {
-	width:90%
-}
+  .npvar {
+    width: 90%
+  }
 </style>
+
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
-<center>
-  <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6">
-    <tr>
-      <td height="28" background="images/tbg.gif">&nbsp;<b><a href="sys_payment.php"><u>支付接口列表</u></a></b> &gt;&gt; 安装支付接口 </td>
-    </tr>
-    <tr>
-      <td height="200" bgcolor="#FFFFFF" valign="top"><table width="100%" border="0" cellspacing="4" cellpadding="4">
-          <form action="sys_payment.php" method="post" enctype="multipart/form-data" name="form1">
-            <input type='hidden' name='pid' value='<?php echo $row['id'];?>'>
-            <input type='hidden' name='pm' value='<?php echo $pm;?>'>
-            <input type='hidden' name='dopost' value='config'>
-            <tr>
-              <td height="25" align="center">支付名称：</td>
-              <td width="85%"><input name="pay_name" type="text" class='iptxt' id="pay_name" value="<?php echo $row['name'];?>" size="30" /></td>
-            </tr>
-            <tr>
-              <td width="15%" height="108" align="center">支付描述：</td>
-              <td><textarea name="pay_desc" cols="75" id="pay_desc" style="height:100"><?php echo $row['description'];?></textarea></td>
-            </tr>
-            <?php echo $reval ?>
-            <tr>
-              <td height="25" align="center">手续费：</td>
-              <td><input name="pay_fee" type="text" class='iptxt' id="pay_fee" size="10" value="<?php echo $row['fee'];?>"/> 元</td>
-            </tr>
-            <tr>
-              <td height="25" align="center">货到付款：</td>
-              <td><?php echo ($row['cod']==0)? '否':'是';?></td>
-            </tr>
-            <tr>
-              <td height="25" align="center">在线支付：</td>
-              <td><?php echo ($row['online']==0)? '否':'是';?></td>
-            </tr>
-            <tr>
-              <td height="53" align="center">&nbsp;</td>
-              <td><input name="imageField"  type="submit" class="np coolbg" value="确定"/></td>
-            </tr>
-          </form>
-        </table></td>
-    </tr>
-  </table>
-</center>
+  <center>
+    <table width="98%" border="0" align="center" cellpadding="3" cellspacing="1" bgcolor="#D6D6D6"
+      class="table maintable table-bordered mt-3">
+      <tr>
+        <td height="28" background="images/tbg.gif">&nbsp;<b><a href="sys_payment.php"><u>支付接口列表</u></a></b> &gt;&gt;
+          安装支付接口 </td>
+      </tr>
+      <tr>
+        <td height="200" bgcolor="#FFFFFF" valign="top">
+          <table width="100%" border="0" cellspacing="4" cellpadding="4" class="table table-borderless">
+            <form action="sys_payment.php" method="post" enctype="multipart/form-data" name="form1">
+              <input type='hidden' name='pid' value='<?php echo $row['id'];?>'>
+              <input type='hidden' name='pm' value='<?php echo $pm;?>'>
+              <input type='hidden' name='dopost' value='config'>
+              <tr>
+                <td height="25" align="center">支付名称：</td>
+                <td width="85%"><input name="pay_name" type="text" class='iptxt' id="pay_name"
+                    value="<?php echo $row['name'];?>" size="30" /></td>
+              </tr>
+              <tr>
+                <td width="15%" height="108" align="center">支付描述：</td>
+                <td><textarea name="pay_desc" cols="75" id="pay_desc"
+                    style="height:100px"><?php echo $row['description'];?></textarea></td>
+              </tr>
+              <?php echo $reval ?>
+              <tr>
+                <td height="25" align="center">手续费：</td>
+                <td><input name="pay_fee" type="text" class='iptxt' id="pay_fee" size="10"
+                    value="<?php echo $row['fee'];?>" /> 元</td>
+              </tr>
+              <tr>
+                <td height="25" align="center">货到付款：</td>
+                <td><?php echo ($row['cod']==0)? '否':'是';?></td>
+              </tr>
+              <tr>
+                <td height="25" align="center">在线支付：</td>
+                <td><?php echo ($row['online']==0)? '否':'是';?></td>
+              </tr>
+              <tr>
+                <td height="53" align="center">&nbsp;</td>
+                <td>
+                  <button type="submit" class="btn btn-secondary">确定</button>
+                </td>
+              </tr>
+            </form>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </center>
 </body>
+
 </html>

src/dede/templets/templets_one.htm

@@ -88,7 +88,6 @@
             <td>
                <a href='templets_one_edit.php?aid={dede:field.aid /}&dopost=edit' class="btn btn-secondary btn-sm"> <i class="fa fa-pencil-square-o" aria-hidden="true"></i> 更改</a>
                <a href="templets_one_edit.php?aid={dede:field.aid /}&dopost=view" target='_blank' class="btn btn-secondary btn-sm"> <i class="fa fa-globe" aria-hidden="true"></i> 预览</a>
-               &nbsp;|&nbsp;
                <a href='templets_one_edit.php?aid={dede:field.aid /}&dopost=delete' class="btn btn-secondary btn-sm"> <i class="fa fa-trash" aria-hidden="true"></i>  删除</a>
             </td>
          </tr>

src/include/archives.func.php

@@ -5,16 +5,3 @@
 // 在开发过程中直接使用helper('archive');即可
 
 helper('archive');
-
-function IndexSub($idx, $num) {
-    return intval($idx - $num) == 0? '0 ' : intval($idx - $num);
-}
-
-// 用来返回index的active
-function IndexActive($idx){
-    if ($idx == 1) {
-        return ' active';
-    } else {
-        return '';
-    }
-}

src/include/autoload.inc.php

@@ -1,9 +1,16 @@
 <?php
 if(!defined('DEDEINC')) exit("Request Error!");
+/**
+ * @version        $Id: autoload.inc.php 1 17:44 2020-09-22 tianya $
+ * @package        DedeCMS.Libraries
+ * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
+ * @license        http://help.dedecms.com/usersguide/license.html
+ * @link           http://www.dedecms.com
+ */
 
 function __autoload($classname)
 {
-    global $cfg_soft_lang;
     $classname = preg_replace("/[^0-9a-z_]/i", '', $classname);
     if( class_exists ( $classname ) )
     {

src/include/autoload7.inc.php

@@ -1,9 +1,16 @@
 <?php
 if(!defined('DEDEINC')) exit("Request Error!");
+/**
+ * @version        $Id: autoload7.inc.php 1 17:44 2020-09-22 tianya $
+ * @package        DedeCMS.Libraries
+ * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
+ * @license        http://help.dedecms.com/usersguide/license.html
+ * @link           http://www.dedecms.com
+ */
 
 function dede_autoloader($classname)
 {
-    global $cfg_soft_lang;
     $classname = preg_replace("/[^0-9a-z_]/i", '', $classname);
     if( class_exists ( $classname ) )
     {

src/include/channelunit.class.php

@@ -4,6 +4,7 @@
  * @version        $Id: channelunit.class.php 2 17:32 2010年7月6日Z tianya $
  * @package        DedeCMS.Libraries
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */

src/include/channelunit.func.php

@@ -5,6 +5,7 @@
  * @version        $Id: channelunit.func.php 2 16:46 2010年7月6日Z tianya $
  * @package        DedeCMS.Helpers
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */

src/include/charset.func.php

@@ -1,5 +1,14 @@
 <?php
 if(!defined('DEDEINC')) exit('dedecms');
+/**
+ * @version        $Id: charset.func.php 1 17:44 2020-09-22 tianya $
+ * @package        DedeCMS.Libraries
+ * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
+ * @license        http://help.dedecms.com/usersguide/license.html
+ * @link           http://www.dedecms.com
+ */
+
 // ------------------------------------------------------------------------
 // 字符编码转换的小助手
 // 这里仅做一个映射

src/include/common.func.php

@@ -364,6 +364,18 @@ function ResetVdValue()
     $_SESSION['securimage_code_value'] = '';
 }
 
+function IndexSub($idx, $num) {
+    return intval($idx - $num) == 0? '0 ' : intval($idx - $num);
+}
+
+// 用来返回index的active
+function IndexActive($idx){
+    if ($idx == 1) {
+        return ' active';
+    } else {
+        return '';
+    }
+}
 
 // 自定义函数接口
 // 这里主要兼容早期的用户扩展,v5.7之后我们建议使用小助手helper进行扩展

src/install/sql-dfdata.txt

@@ -4037,9 +4037,9 @@ INSERT INTO `#@__sysconfig` VALUES('1','cfg_basehost','站点根网址','1','str
 ('223','cfg_smtp_port','smtp服务器端口','2','string','25'),
 ('221','cfg_sendmail_bysmtp','是否启用smtp方式发送邮件','2','bool','Y'),
 ('222','cfg_smtp_server','smtp服务器','2','string','smtp.qq.com'),
-('224','cfg_smtp_usermail','SMTP服务器的用户邮箱','2','string','desdev@vip.qq.com'),
-('225','cfg_smtp_user','SMTP服务器的用户帐号','2','string','desdev'),
-('226','cfg_smtp_password','SMTP服务器的用户密码','2','string','7260444huxiao'),
+('224','cfg_smtp_usermail','SMTP服务器的用户邮箱','2','string','tianya@dedebiz.com'),
+('225','cfg_smtp_user','SMTP服务器的用户帐号','2','string','tianya'),
+('226','cfg_smtp_password','SMTP服务器的用户密码','2','string','tianya'),
 ('96','cfg_updateperi','百度新闻xml更新时间 （单位：分钟）','8','string','15'),
 ('227','cfg_online_type','在线支付网关类型','2','string','nps'),
 ('706','cfg_upload_switch','删除文章文件同时删除相关附件文件','2','bool','Y'),

src/install/sql-dftables.txt

@@ -39,7 +39,7 @@ CREATE TABLE `#@__addoninfos` (
   `mid` mediumint(8) unsigned NOT NULL default '0',
   `click` int(10) unsigned NOT NULL default '0',
   `title` varchar(60) NOT NULL default '',
-  `litpic` varchar(60) NOT NULL default '',
+  `litpic` varchar(120) NOT NULL default '',
   `userip` varchar(15) NOT NULL default ' ',
   `senddate` int(11) NOT NULL default '0',
   `flag` set('c','h','p','f','s','j','a','b') default NULL,

src/static/css/dede.css

@@ -616,6 +616,10 @@ nav.location .dede li.active .nav-link {
     color: #008E38;
 }
 
+#body-pic img {
+    max-width: 40%!important;
+}
+
 @media only screen and (max-width: 1199px) {
     .ddcard > .card-header .caption span {
         font-size: 14px;

src/templets/default/article_shop.htm

@@ -1,198 +1,126 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
-<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
-<meta name="keywords" content="{dede:field.keywords/}" />
-<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
-<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
-<script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
-<script language="javascript" type="text/javascript">
-<!--
-	function CheckLogin(){
-	  var taget_obj = document.getElementById('_ajax_feedback');
-	  myajax = new DedeAjax(taget_obj,false,false,'','','');
-	  myajax.SendGet2("{dede:global.cfg_cmsurl/}/member/ajax_feedback.php");
-	  DedeXHTTP = null;
-	}
-	function postBadGood(ftype,fid)
-	{
-		var taget_obj = document.getElementById(ftype+fid);
-		var saveid = GetCookie('badgoodid');
-		if(saveid != null)
-		{
-			 var saveids = saveid.split(',');
-			 var hasid = false;
-			 saveid = '';
-			 j = 1;
-			 for(i=saveids.length-1;i>=0;i--)
-			 {
-			 	  if(saveids[i]==fid && hasid) continue;
-			 	  else {
-			 	  	if(saveids[i]==fid && !hasid) hasid = true;
-			 	  	saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-			 	  	j++;
-			 	  	if(j==10 && hasid) break;
-			 	  	if(j==9 && !hasid) break;
-			 	  }
-			 }
-	     if(hasid) { alert('您刚才已表决过了喔！'); return false;}
-	     else saveid += ','+fid;
-			 SetCookie('badgoodid',saveid,1);
-		}
-		else
-		{
-			SetCookie('badgoodid',fid,1);
-		}
-		//document.write("feedback.php?action="+ftype+"&fid="+fid);
-		//return;
-	  myajax = new DedeAjax(taget_obj,false,false,'','','');
-	  myajax.SendGet2("{dede:global.cfg_phpurl/}/feedback.php?aid="+fid+"&action="+ftype+"&fid="+fid);
-	  DedeXHTTP = null;
-	}
--->
-</script>
+	<meta charset="{dede:global.cfg_soft_lang/}">
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<script>
+		const PHPURL='{dede:field name="phpurl"/}';
+	</script>
+	<script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
+	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
+	<link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+	<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
+	<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+	<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
+	<meta name="keywords" content="{dede:field.keywords/}" />
+	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
 </head>
-<body class="productview">
-{dede:include filename="head2.htm"/}
-<!-- /header -->
-<div class="w960 center clear mt1">
-	<div class="pleft">
-		<div class="place">
-			<strong>当前位置:</strong> {dede:field name='position'/}
-		</div><!-- /place -->
-		<div class="viewbox">
-			<div class="title">
-				<h2>{dede:field name='title'/}</h2>
-			</div><!-- /title -->
-			<div class="infolist">
-                <small>信息类型：</small><span>{dede:field.infotype/}</span>
-                <small>测试：</small><span>{dede:field.vocation/}</span>
-				<small>商品原价：</small><span>{dede:field.price/}元</span>
-				<small>优惠价格：</small><span class="fc-f60">{dede:field.trueprice/}元</span>
-				<small>品牌：</small><span>{dede:field.brand/}</span>
-                <small>单位：</small><span>{dede:field.units/}</span>
-				<small>上架日期：</small><span>{dede:field.pubdate function="MyDate('y-m-d H:i',@me)"/}</span>
-				<small>人气：</small><span><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}" type='text/javascript' language="javascript"></script></span>
-                <form id="formcar" name="formcar" method="post" action="{dede:field name='phpurl'/}/posttocar.php">
-                <input type="hidden" name="id" value="{dede:field.id/}" />
-                <input type="hidden" name="title" value="{dede:field.title/}" />
-                <input type="hidden" name="price" value="{dede:field.trueprice/}" />
-                <input type="hidden" name="units" value="{dede:field.units/}" />
-                <small>购物车：</small><span><a href="{dede:field name='phpurl'/}/car.php" target="_blank">查看购物车</a></span>
-                <small>购买：</small><span><button type="submit" name="button" class="btn-2">放入购物车</button></span>
-                </form>
-
-			</div><!-- /info -->
-			<div class="picview">
-				<img src={dede:field.litpic/}>
-			</div><!-- /info -->
-			<div class="labeltitle">
-				<strong>商品介绍</strong>
-			</div>
-			<div class="content">
-                 <div id="contentMidPicAD" style="float:right; clear:both; top:0; vertical-align:top;">{dede:myad name='contentMidPicAD'/}</div>
-			　　{dede:field.body/}
-			</div>
-			<div class="boxoff">
-				<strong>------分隔线----------------------------</strong>
-			</div>
-			<div class="handle">
-				<div class="context">
-					<ul>
-						<li>{dede:prenext get='pre'/}</li>
-						<li>{dede:prenext get='next'/}</li>
-					</ul>
-				</div><!-- /context -->
-				<div class="actbox">
-					<ul>
-						<li id="act-fav"><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-						<li id="act-err"><a href="{dede:field name='phpurl'/}/erraddsave.php?aid={dede:field.id/}&title={dede:field.title/}" target="_blank">挑错</a></li>
-						<li id="act-pus"><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-						<li id="act-pnt"><a href="#" target="_blank" onClick="window.print();">打印</a></li>
-					</ul>
-				</div><!-- /actbox -->
-			</div><!-- /handle -->
-		</div><!-- viewbox -->
-
-<!-- //AJAX评论区 -->
-{dede:include file='ajaxfeedback.htm' /}
-
-	</div><!-- /pleft -->
-
-	<div class="pright">
-        <div>
-          <dl class="tbox">
-				<dt><strong>栏目列表</strong></dt>
-				<dd>
-					<ul class="d6">
-                      {dede:channel type='son' currentstyle="<li><a href='~typelink~' class='thisclass'>~typename~</a></li>"}
-		<li><a href='[field:typeurl/]'>[field:typename/]</a></li>{/dede:channel}
-					</ul>
-				</dd>
-			</dl>
-        </div>
-        	<div class="infos_userinfo">
- 			{dede:memberinfos}
-			<dl class="tbox">
-				<dt><strong>发布者资料</strong></dt>
-				<dd>
-					<a href="[field:spaceurl /]" class="userface"><img src="[field:face/]" width="52" height="52" /></a>
-					<a href='[field:spaceurl /]' class="username">[field:uname/]</a>
-					<span class="useract">
-						<a href="[field:spaceurl /]" class="useract-vi">查看详细资料</a>
-                        <a href="[field:spaceurl /]&action=guestbook" class="useract-pm">发送留言</a>
-						<a href="[field:spaceurl /]&action=newfriend" class="useract-af">加为好友</a>
-					</span>
-					<span class="userinfo-sp"><small>用户等级:</small>[field:rankname /]</span>
-					<span class="userinfo-sp"><small>注册时间:</small>[field:jointime function="MyDate('Y-m-d H:m',@me)"/]</span>
-					<span class="userinfo-sp"><small>最后登录:</small>[field:logintime function="MyDate('Y-m-d H:m',@me)"/]</span>
-				</dd>
-			</dl>
-			{/dede:memberinfos}
-   	 	</div>
-         
-		<div class="productrange mt1">
-			<dl class="tbox">
-				<dt><strong>推荐商品</strong></dt>
-				<dd>
-					<ul class="f1">
-                    {dede:arclist flag='c' titlelen=42 row=8}
-						<li>
-							<a href="[field:arcurl/]">[field:title/]</a>
-							<span><small>好评:</small>[field:scores/]</span>
-							<span><small>人气:</small>[field:click/]</span>
-						</li>
-                    {/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
+
+<body>
+	{dede:include filename="top.htm"/}
+
+	{dede:include filename="header.htm"/}
+
+	{dede:include filename="navbar.htm"/}
+
+	<div class="container">
+		<div class="position">
+			<nav aria-label="breadcrumb">
+				<ol class="breadcrumb mb-0">
+					<li class="breadcrumb-item">当前位置</li>
+					{dede:field name='position'/}
+				</ol>
+			</nav>
 		</div>
-        
-		<div class="comment mt1">
-			<dl class="tbox">
-				<dt><strong>热门商品</strong></dt>
-				<dd>
-					<ul class="e3">
-                    {dede:arclist row=10 orderby=click type='image.'}
-						<li>
-							<a href="[field:arcurl/]" class="preview"><img src="[field:litpic/]" alt="[field:title function='html2text(@me)'/]"/></a>
-							<a href="[field:arcurl/]" class="title">[field:title/]</a>
-							<span class="intro">人气:<span class="fc-f90">[field:click/]</span></span>
-						</li>
-                    {/dede:arclist}
-
-					</ul>
-				</dd>
-			</dl>
+		<!-- /.position -->
+	</div>
+
+	<main class="container">
+		<div class="row">
+			<div class="col-md-8 article-main">
+				<h2 class="mt-0 mb-3 zixue">{dede:field.title/}</h2>
+				<div class="body py-2">
+					<div class="float-lg-right text-lg-right mr-5" id="body-pic">{dede:field name='image'/}</div>
+					<p><small>商品原价：</small><span>{dede:field.price/}</span></p>
+					<p><small>优惠价格：</small><span>{dede:field.trueprice/}</span></p>
+					<p><small>品牌：</small><span>{dede:field.brand/}</span></p>
+					<p><small>上架日期：</small><span>{dede:field.pubdate function="MyDate('y-m-d H:i',@me)"/}</span></p>
+					<p><small>人气：</small><span><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}" type='text/javascript' language="javascript"></script></span></p>
+					<form id="formcar" name="formcar" method="post" action="{dede:field name='phpurl'/}/posttocar.php">
+						<input type="hidden" name="id" value="{dede:field.id/}" />
+						<input type="hidden" name="title" value="{dede:field.title/}" />
+						<input type="hidden" name="price" value="{dede:field.trueprice/}" />
+						<input type="hidden" name="units" value="{dede:field.units/}" />
+						<p><small>购物车：</small><span><a href="{dede:field name='phpurl'/}/car.php" target="_blank">查看购物车</a></span></p>
+						<p><small>购买：</small><span><button type="submit" name="button" class="btn btn-warning">放入购物车</button></span></p>
+					</form>
+					<p>商品介绍</p>
+					<div role="alert">
+						{dede:field.body/}
+					</div>
+				</div>
+				<!-- /.body -->
+
+				<div class="clearfix"></div>
+
+				{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+
+				<div class="row">
+					<div class="col-md-4 prenext pt-2">
+						<div class="pagination-previous">{dede:prenext get='pre'/}</div>
+						<div class="pagination-next mt-2">{dede:prenext get='next'/}</div>
+					</div>
+					<div class="col-md-8">
+						<div class="row actbox">
+							<ul>
+								<li><i class="fa fa-star-o" aria-hidden="true"></i> <a
+										href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}"
+										target="_blank">收藏</a></li>
+								<li><i class="fa fa-bug" aria-hidden="true"></i> <a
+										href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a>
+								</li>
+								<li><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <a
+										href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}"
+										target="_blank">推荐</a></li>
+								<li><i class="fa fa-print" aria-hidden="true"></i> <a href="#"
+										onClick="window.print();">打印</a></li>
+							</ul>
+						</div><!-- /actbox -->
+					</div>
+				</div>
+
+				{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+
+			</div>
+			<!-- /.article-main -->
+
+			<aside class="col-md-4 article-sidebar">
+
+				{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
+
+				{dede:include comment='热点内容' filename="widget_hot.htm"/}
+
+			</aside>
+			<!-- /.article-sidebar -->
+
 		</div>
+	</main>
+	<!-- /main -->
 
-	</div><!-- /pright -->
-</div>
-{dede:include filename="footer.htm"/}
-<!-- /footer -->
+	{dede:include filename="footer.htm"/}
+	<script>
 
+
+		// 页面加载触发
+		$(document).ready(function () {
+			// 获取文档点击数统计
+			$.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1", function (data) {
+				let result = JSON.parse(data);
+				$("#_count").html(result.data.click);
+			})
+		});
+	</script>
 </body>
-</html>
+
+</html>

src/templets/default/article_soft.htm

@@ -115,8 +115,6 @@
 
 	{dede:include filename="footer.htm"/}
 	<script>
-
-
 		// 页面加载触发
 		$(document).ready(function () {
 			// 获取文档点击数统计

src/templets/default/head.htm

@@ -1,49 +0,0 @@
-<div class="header_top">  
-    <div class="w960 center">  
-     <span id="time" class="time">织梦CMS - 轻松建站从此开始！</span>
-     <div class="toplinks"><a href="{dede:global.cfg_cmsurl/}/plus/heightsearch.php" target="_blank">高级搜索</a>|<a href="{dede:global.cfg_cmsurl/}/data/sitemap.html" target="_blank">网站地图</a>|<a href="{dede:global.cfg_cmsurl/}/tags.php">TAG标签</a><a href="{dede:global.cfg_dataurl/}/rssmap.html" class="rss">RSS订阅</a><span>[<a href=""onclick="this.style.behavior='url(#default#homepage)';this.setHomePage('{dede:global.cfg_basehost/}');">设为首页</a>] [<a href="javascript:window.external.AddFavorite('{dede:global.cfg_basehost/}','{dede:global.cfg_webname/}')">加入收藏</a>]</span></div>
-    </div> 
-</div>
-<div class="header">
-	<div class="top w960 center">
-      <div class="title">
-        <h1><a href="{dede:global.cfg_basehost/}"><img src="{dede:global.cfg_templets_skin/}/images/logo.gif" height="54" width="216" alt="{dede:global.cfg_webname/}"/></a> </h1>
-      </div>
-	</div><!-- //top -->
-	<!-- //菜单 -->
-	<div class="module blue mT10 wrapper w963">
-  	<div class="top">
-    	<!-- //如果不使用currentstyle，可以在channel标签加入 cacheid='channeltoplist' 属性提升性能 -->
-    <div id="navMenu">
-    	<ul>
-      	<li><a href='{dede:global.cfg_cmsurl/}/'><span>主页</span></a></li>
-      	{dede:channel type='top' row='10' currentstyle="<li class='hover'><a href='~typelink~' ~rel~><span>~typename~</span></a></li>"}
-      	<li><a href='[field:typeurl/]' [field:rel/]><span>[field:typename/]</span></a></li>
-      	{/dede:channel}
-    	</ul>
-    </div>	
-    <div class="search">
-      <form  name="formsearch" action="{dede:global.cfg_cmsurl/}/plus/search.php">
-        <div class="form">
-          <h4>搜索</h4>
-           <input type="hidden" name="kwtype" value="0" />
-           <input name="q" type="text" class="search-keyword" id="search-keyword" value="在这里搜索..." onfocus="if(this.value=='在这里搜索...'){this.value='';}"  onblur="if(this.value==''){this.value='在这里搜索...';}" />
-           <select name="searchtype" class="search-option" id="search-option">
-               <option value="title" selected='1'>检索标题</option>
-               <option value="titlekeyword">智能模糊</option>
-           </select>
-          <button type="submit" class="search-submit">搜索</button>
-        </div>
-        </form>
-        <div class="tags">
-          <h4>热门标签:</h4>
-          <ul>
-          {dede:tag row='10' getall='1' sort='month'}
-            <li><a href='[field:link/]'>[field:tag /]</a></li>
-          {/dede:tag}
-          </ul>
-        </div>
-    </div><!-- //search -->
-		</div>
-	</div>
-</div><!-- //header -->

src/templets/default/images/photo/album.css

@@ -1,552 +0,0 @@
-h2 {
-	color:#666;
-}
-.clearit {
-	CLEAR: both; FONT-SIZE: 0px; LINE-HEIGHT: 0; HEIGHT: 0px
-}
-.cC00 {
-	COLOR: #c00
-}
-#wrap {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 5px; MARGIN: 0px auto; WIDTH: 960px; PADDING-TOP: 5px; TEXT-ALIGN: left
-}
-.nInfo {
-	Z-INDEX: 101; BORDER-BOTTOM: #e5e6e6 1px solid; ZOOM: 1; POSITION: relative; HEIGHT: 34px
-}
-.nPath {
-	FLOAT: left; COLOR: #3e7cbf; LINE-HEIGHT: 34px
-}
-.nPath A:link {
-	COLOR: #3e7cbf
-}
-.nPath A:visited {
-	COLOR: #3e7cbf
-}
-.nPath A:hover {
-	COLOR: #f00
-}
-.nMore {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FLOAT: right; PADDING-BOTTOM: 0px; PADDING-TOP: 7px
-}
-.eTitle {
-	HEIGHT: 49px
-}
-.eTitle H1 {
-	FONT: 18px/30px '微软雅黑','黑体'; MARGIN-RIGHT: 50px; PADDING-TOP: 7px; TEXT-ALIGN: center
-}
-.eTitle #total {
-	PADDING-LEFT: 6px; FONT-SIZE: 13px; FONT-FAMILY: Verdana
-}
-.eControl {
-	MARGIN-TOP: -49px; Z-INDEX: 100; MARGIN-LEFT: 660px; POSITION: relative; HEIGHT: 49px
-}
-.ecCont {
-	FLOAT: right; PADDING-TOP: 9px
-}
-.buttonCont {
-	BACKGROUND: url(e_m_01.png) no-repeat 1000px 1000px; WIDTH: 100%; HEIGHT: 100%
-}
-#ecbSpeed {
-	FONT-WEIGHT: bold; FONT-SIZE: 14px; BACKGROUND: url(e_m_01.png) no-repeat 0px -50px; FLOAT: left; WIDTH: 43px; CURSOR: default; COLOR: #4c4c4c; LINE-HEIGHT: 28px; HEIGHT: 28px
-}
-#ecbSpeed .buttonCont {
-	PADDING-RIGHT: 6px; WIDTH: 37px; TEXT-ALIGN: center; font-size:12px
-}
-.hover#ecbSpeed .buttonCont {
-	COLOR: #666
-}
-.active#ecbSpeed .buttonCont {
-	PADDING-RIGHT: 6px; BACKGROUND-POSITION: 0px -100px; WIDTH: 37px; COLOR: #196cc8
-}
-#ecbPre {
-	BACKGROUND: url(e_m_01.png) no-repeat -50px -50px; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbPre .buttonCont {
-	BACKGROUND-POSITION: -50px -100px
-}
-.active#ecbPre .buttonCont {
-	BACKGROUND-POSITION: -50px -150px
-}
-#ecbPlay {
-	FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-#ecbPlay .stop {
-	BACKGROUND: url(e_m_01.png) no-repeat -100px -50px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbPlay .stop {
-	BACKGROUND-POSITION: -100px -100px
-}
-.active#ecbPlay .stop {
-	BACKGROUND-POSITION: -100px -150px
-}
-#ecbPlay .play {
-	BACKGROUND: url(e_m_01.png) no-repeat -350px -50px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbPlay .play {
-	BACKGROUND-POSITION: -350px -100px
-}
-.active#ecbPlay .play {
-	BACKGROUND-POSITION: -350px -150px
-}
-#ecbNext {
-	BACKGROUND: url(e_m_01.png) no-repeat -150px -50px; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbNext .buttonCont {
-	BACKGROUND-POSITION: -150px -100px
-}
-.active#ecbNext .buttonCont {
-	BACKGROUND-POSITION: -150px -150px
-}
-#ecbComm {
-	BACKGROUND: url(e_m_01.png) no-repeat -200px -50px; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbComm .buttonCont {
-	BACKGROUND-POSITION: -200px -100px
-}
-.active#ecbComm .buttonCont {
-	BACKGROUND-POSITION: -200px -150px
-}
-#ecbMode {
-	BACKGROUND: url(e_m_01.png) no-repeat -250px -50px; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbMode .buttonCont {
-	BACKGROUND-POSITION: -250px -100px
-}
-.active#ecbMode .buttonCont {
-	BACKGROUND-POSITION: -250px -150px
-}
-#ecbModeReturn {
-	DISPLAY: none; BACKGROUND: url(e_m_01.png) no-repeat -400px -50px; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbModeReturn .buttonCont {
-	BACKGROUND-POSITION: -400px -100px
-}
-.active#ecbModeReturn .buttonCont {
-	BACKGROUND-POSITION: -400px -150px
-}
-#ecbFullScreen {
-	BACKGROUND: url(e_m_01.png) no-repeat -300px -50px; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 31px; HEIGHT: 28px
-}
-.hover#ecbFullScreen .buttonCont {
-	BACKGROUND-POSITION: -300px -100px
-}
-.active#ecbFullScreen .buttonCont {
-	BACKGROUND-POSITION: -300px -150px
-}
-#ecbLine {
-	BACKGROUND: #d1d1d1; FLOAT: left; MARGIN-LEFT: 8px; WIDTH: 1px; HEIGHT: 28px
-}
-#SpeedBox {
-	DISPLAY: none; Z-INDEX: 100; LEFT: 0px; OVERFLOW: hidden; WIDTH: 43px; POSITION: absolute; TOP: 37px; HEIGHT: 126px
-}
-#SpeedCont {
-	MARGIN-TOP: -126px; BACKGROUND: url(e_m_01.png) no-repeat 0px -128px; WIDTH: 43px; POSITION: relative; HEIGHT: 126px
-}
-.speedStep_1 {
-	MARGIN-TOP: -90px! important
-}
-.speedStep_2 {
-	MARGIN-TOP: -60px! important
-}
-.speedStep_3 {
-	MARGIN-TOP: -30px! important
-}
-.speedStep_4 {
-	MARGIN-TOP: -10px! important
-}
-.speedStep_5 {
-	MARGIN-TOP: -3px! important
-}
-.speedStep_6 {
-	MARGIN-TOP: 0px! important
-}
-#SpeedSlide {
-	LEFT: 17px; WIDTH: 10px; POSITION: absolute; TOP: 4px; HEIGHT: 110px
-}
-#SpeedNonius {
-	BACKGROUND: url(e_m_01.png) no-repeat -50px -200px; LEFT: 11px; WIDTH: 23px; POSITION: absolute; TOP: 2px; HEIGHT: 9px
-}
-#CommFormTopBox {
-	DISPLAY: none; Z-INDEX: 100; RIGHT: 0px; OVERFLOW: hidden; WIDTH: 247px; POSITION: absolute; TOP: 37px
-}
-#CommFormTopCont {
-	MARGIN-TOP: -138px; BACKGROUND: url(e_m_01.png) no-repeat 0px -450px; WIDTH: 247px; POSITION: relative; HEIGHT: 138px
-}
-A#cftClose {
-	FONT-SIZE: 0px; RIGHT: 13px; BACKGROUND: url(e_m_01.png) no-repeat -450px -50px; OVERFLOW: hidden; WIDTH: 8px; CURSOR: default; POSITION: absolute; TOP: 23px; HEIGHT: 8px
-}
-A#cftClose:hover {
-	BACKGROUND-POSITION: -450px -75px
-}
-A#cftClose:unknown {
-	outline: 0
-}
-.commTopStep_1 {
-	MARGIN-TOP: -100px! important
-}
-.commTopStep_2 {
-	MARGIN-TOP: -60px! important
-}
-.commTopStep_3 {
-	MARGIN-TOP: -20px! important
-}
-.commTopStep_4 {
-	MARGIN-TOP: -10px! important
-}
-.commTopStep_5 {
-	MARGIN-TOP: -3px! important
-}
-.commTopStep_6 {
-	MARGIN-TOP: 0px! important
-}
-#cftTextarea {
-	BORDER-RIGHT: #ccc 1px solid; BORDER-TOP: #ccc 1px solid; BACKGROUND: url(e_m_06.png) #fff no-repeat 0px 0px; LEFT: 10px; BORDER-LEFT: #ccc 1px solid; WIDTH: 224px; COLOR: #666; BORDER-BOTTOM: #ccc 1px solid; POSITION: absolute; TOP: 44px; HEIGHT: 54px
-}
-#cftSubmit {
-	RIGHT: 10px; BACKGROUND: url(e_m_01.png) no-repeat -300px -450px; WIDTH: 69px; COLOR: #fff; BORDER-TOP-STYLE: none; BOTTOM: 8px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; POSITION: absolute; HEIGHT: 21px; BORDER-BOTTOM-STYLE: none
-}
-#CommFormBottomBox {
-	Z-INDEX: 100; RIGHT: 0px; OVERFLOW: hidden; WIDTH: 247px; BOTTOM: 147px; POSITION: absolute
-}
-#CommFormBottomCont {
-	BACKGROUND: url(e_m_01.png) no-repeat 0px -900px; MARGIN-BOTTOM: -138px; WIDTH: 247px; POSITION: relative; HEIGHT: 133px
-}
-A#cfbClose {
-	FONT-SIZE: 0px; RIGHT: 13px; BACKGROUND: url(e_m_01.png) no-repeat -450px -50px; OVERFLOW: hidden; WIDTH: 8px; CURSOR: default; POSITION: absolute; TOP: 10px; HEIGHT: 8px
-}
-A#cfbClose:hover {
-	BACKGROUND-POSITION: -450px -75px
-}
-A#cfbClose:unknown {
-	outline: 0
-}
-.commBottomStep_1 {
-	MARGIN-BOTTOM: -100px! important
-}
-.commBottomStep_2 {
-	MARGIN-BOTTOM: -60px! important
-}
-.commBottomStep_3 {
-	MARGIN-BOTTOM: -20px! important
-}
-.commBottomStep_4 {
-	MARGIN-BOTTOM: -10px! important
-}
-.commBottomStep_5 {
-	MARGIN-BOTTOM: -3px! important
-}
-.commBottomStep_6 {
-	MARGIN-BOTTOM: 0px! important
-}
-#cfbTextarea {
-	BORDER-RIGHT: #ccc 1px solid; BORDER-TOP: #ccc 1px solid; BACKGROUND: url(e_m_06.png) #fff no-repeat 0px 0px; LEFT: 10px; BORDER-LEFT: #ccc 1px solid; WIDTH: 224px; COLOR: #666; BORDER-BOTTOM: #ccc 1px solid; POSITION: absolute; TOP: 28px; HEIGHT: 50px
-}
-#cfbSubmit {
-	RIGHT: 10px; BACKGROUND: url(e_m_01.png) no-repeat -300px -450px; WIDTH: 69px; COLOR: #fff; BORDER-TOP-STYLE: none; BOTTOM: 26px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; POSITION: absolute; HEIGHT: 21px; BORDER-BOTTOM-STYLE: none
-}
-#eFramePic {
-	BACKGROUND: url(e_m_03.gif) repeat-y 0px 0px; ZOOM: 1; POSITION: relative; 
-}
-#efpClew {
-	Z-INDEX: 10; BACKGROUND: url(e_m_02.png) no-repeat 0px 0px; LEFT: 0px; WIDTH: 150px; POSITION: absolute; TOP: 0px; HEIGHT: 0px
-}
-#efpClewClose {
-	Z-INDEX: 2; RIGHT: 5px; OVERFLOW: hidden; WIDTH: 5px; CURSOR: pointer; POSITION: absolute; TOP: 4px; HEIGHT: 5px
-}
-.efpClewStep_1 {
-	TOP: -5px! important; HEIGHT: 5px! important
-}
-.efpClewStep_2 {
-	TOP: -10px! important; HEIGHT: 10px! important
-}
-.efpClewStep_3 {
-	TOP: -15px! important; HEIGHT: 15px! important
-}
-.efpClewStep_4 {
-	TOP: -18px! important; HEIGHT: 18px! important
-}
-.efpClewStep_5 {
-	TOP: -21px! important; HEIGHT: 21px! important
-}
-#efpBigPic {
-	BORDER-TOP: #e5e6e6 1px solid; WIDTH: 960px; ZOOM: 1; POSITION: relative; TEXT-ALIGN: center
-}
-#efpLeftArea {
-	Z-INDEX: 9; BACKGROUND: #fff; FILTER:Alpha(Opacity=0); LEFT: 0px; WIDTH: 50%; POSITION: absolute; TOP: 0px; HEIGHT: 100%; opacity: 0
-}
-#efpRightArea {
-	Z-INDEX: 9; RIGHT: 0px; BACKGROUND: #fff; FILTER:Alpha(Opacity=0); WIDTH: 50%; POSITION: absolute; TOP: 0px; HEIGHT: 100%; opacity: 0
-}
-.arrLeft {
-	CURSOR: url(arr_left.cur),auto
-}
-.arrRight {
-	CURSOR: url(arr_right.cur),auto
-}
-#efpTxt {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 12px; PADDING-TOP: 8px
-}
-#d_BigPic {
-	MIN-HEIGHT: 300px; OVERFLOW-X: hidden; WIDTH: 960px;
-}
-.loading {
-	BACKGROUND: url(loading_01.gif) no-repeat center center
-}
-#d_picTit {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 5px; FONT: 16px/24px '微软雅黑','体体'; PADDING-TOP: 5px; TEXT-ALIGN: center
-}
-#d_picTime {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 12px; PADDING-BOTTOM: 5px; COLOR: #999; LINE-HEIGHT: 24px; PADDING-TOP: 5px; FONT-FAMILY: Verdana, Geneva, sans-serif; TEXT-ALIGN: center
-}
-#d_picIntro {
-	MARGIN: 0px auto; WIDTH: 750px; COLOR: #666; TEXT-INDENT: 2em; LINE-HEIGHT: 23px
-}
-#efpTxt .others {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px auto; WIDTH: 750px; COLOR: #666; PADDING-TOP: 5px; HEIGHT: 25px; TEXT-ALIGN: center
-}
-#efpTxt .others .tblog_bg {
-	PADDING-LEFT: 20px; FLOAT: right; PADDING-TOP: 10px; HEIGHT: 15px
-}
-.others A:link {
-	MARGIN: 0px 3px; COLOR: #3e7cbf
-}
-.others A:visited {
-	MARGIN: 0px 3px; COLOR: #3e7cbf
-}
-.others A:hover {
-	COLOR: #f00
-}
-#efpContent {
-	background-color:#FFF;BORDER-RIGHT: #e5e6e6 1px solid;OVERFLOW: hidden; BORDER-LEFT: #e5e6e6 1px solid; color:#666; font-size:13px; line-height:20px
-}
-#efpContent p{
-	padding-left:10px; padding-right:10px
-}
-#efpPicList {
-	BORDER-RIGHT: #e5e6e6 1px solid; BORDER-TOP: #e5e6e6 1px solid; BACKGROUND: url(e_m_05.gif) repeat-x 0px 0px; OVERFLOW: hidden; BORDER-LEFT: #e5e6e6 1px solid; BORDER-BOTTOM: #e5e6e6 1px solid; HEIGHT: 117px
-}
-#efpPreGroup {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 31px; FLOAT: left; PADDING-BOTTOM: 0px; WIDTH: 129px; PADDING-TOP: 11px
-}
-#efpPreGroup IMG{
-	width:80px; height:61px;
-}
-#efpNextGroup IMG{
-	width:80px; height:61px;
-}
-#efpPrePic {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 11px; BACKGROUND: url(e_m_01.png) no-repeat 0px -350px; PADDING-BOTTOM: 0px; WIDTH: 99px; PADDING-TOP: 9px; HEIGHT: 72px
-}
-#efpPrePic TD {
-	WIDTH: 94px; HEIGHT: 68px; TEXT-ALIGN: center
-}
-#efpPrePic IMG {
-	BORDER: #e7e4df 1px solid;
-}
-#efpPreTxt {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 11px; PADDING-BOTTOM: 0px; WIDTH: 91px; PADDING-TOP: 3px; TEXT-ALIGN: center
-}
-.selected#efpPrePic {
-	BACKGROUND-POSITION: -250px -350px
-}
-.selected#efpPrePic IMG {
-	BORDER-LEFT-COLOR: #ff9845; BORDER-BOTTOM-COLOR: #ff9845; BORDER-TOP-COLOR: #ff9845; BORDER-RIGHT-COLOR: #ff9845
-}
-#efpNextGroup {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 20px; FLOAT: left; PADDING-BOTTOM: 0px; PADDING-TOP: 11px;WIDTH: 129px;
-}
-#efpNextPic {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 5px; BACKGROUND: url(e_m_01.png) no-repeat -125px -350px; PADDING-BOTTOM: 0px; WIDTH: 105px; PADDING-TOP: 9px; HEIGHT: 72px
-}
-#efpNextPic TD {
-	WIDTH: 94px; HEIGHT: 68px; TEXT-ALIGN: center
-}
-#efpNextPic IMG {
-	BORDER: #e7e4df 1px solid;
-}
-#efpNextTxt {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 11px; PADDING-BOTTOM: 0px; WIDTH: 91px; PADDING-TOP: 3px; TEXT-ALIGN: center
-}
-.selected#efpNextPic {
-	BACKGROUND-POSITION: -375px -350px
-}
-.selected#efpNextPic IMG {
-	BORDER-LEFT-COLOR: #ff9845; BORDER-BOTTOM-COLOR: #ff9845; BORDER-TOP-COLOR: #ff9845; BORDER-RIGHT-COLOR: #ff9845
-}
-#efpListLeftArr {
-	BACKGROUND: url(e_m_01.png) no-repeat -100px -200px; FLOAT: left; WIDTH: 42px; HEIGHT: 117px
-}
-.selected#efpListLeftArr {
-	BACKGROUND-POSITION: -200px -200px
-}
-#efpListRightArr {
-	BACKGROUND: url(e_m_01.png) no-repeat -150px -200px; FLOAT: left; WIDTH: 42px; HEIGHT: 117px
-}
-.selected#efpListRightArr {
-	BACKGROUND-POSITION: -250px -200px
-}
-#efpPicListCont {
-	BACKGROUND: url(e_m_05.gif) repeat-x 0px -150px; FLOAT: left; OVERFLOW: hidden; WIDTH: 545px; HEIGHT: 117px
-}
-#efpPicListCont TABLE {
-	MARGIN: 0px auto
-}
-#efpPicListCont .pic {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FLOAT: left; PADDING-BOTTOM: 0px; WIDTH: 109px; PADDING-TOP: 8px; TEXT-ALIGN: center
-}
-#efpPicListCont .picOn {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FLOAT: left; PADDING-BOTTOM: 0px; WIDTH: 109px; PADDING-TOP: 8px; TEXT-ALIGN: center
-}
-#efpPicListCont .picCont {
-	WIDTH: 100px; HEIGHT: 100px
-}
-#efpPicListCont .pic IMG {
-	BORDER-RIGHT: #b4b4b4 1px solid; BORDER-TOP: #b4b4b4 1px solid; BORDER-LEFT: #b4b4b4 1px solid; BORDER-BOTTOM: #b4b4b4 1px solid
-}
-.pb_01 {
-	WIDTH: 4px; HEIGHT: 4px
-}
-.pb_03 {
-	WIDTH: 4px; HEIGHT: 4px
-}
-.pb_06 {
-	WIDTH: 4px; HEIGHT: 4px
-}
-.pb_08 {
-	WIDTH: 4px; HEIGHT: 4px
-}
-.picOn IMG {
-	BORDER-LEFT-COLOR: #ffb96c; BORDER-BOTTOM-COLOR: #ffb96c; BORDER-TOP-COLOR: #ffb96c; BORDER-RIGHT-COLOR: #ffb96c
-}
-.picOn .pb_02 {
-	BACKGROUND: #ff8c00
-}
-.picOn .pb_04 {
-	BACKGROUND: #ff8c00
-}
-.picOn .pb_05 {
-	BACKGROUND: #ff8c00
-}
-.picOn .pb_07 {
-	BACKGROUND: #ff8c00
-}
-.picOn .pb_01 {
-	BACKGROUND: url(e_m_01.png) no-repeat 0px -275px
-}
-.picOn .pb_03 {
-	BACKGROUND: url(e_m_01.png) no-repeat -25px -275px
-}
-.picOn .pb_06 {
-	BACKGROUND: url(e_m_01.png) no-repeat -50px -275px
-}
-.picOn .pb_08 {
-	BACKGROUND: url(e_m_01.png) no-repeat -75px -275px
-}
-#endSelect {
-	BORDER-RIGHT: #8a8a8a 1px solid; BORDER-TOP: #8a8a8a 1px solid; DISPLAY: none; Z-INDEX: 20; LEFT: 359px; BORDER-LEFT: #8a8a8a 1px solid; WIDTH: 230px; BORDER-BOTTOM: #8a8a8a 1px solid; POSITION: absolute; TOP: 245px; HEIGHT: 71px
-}
-
-#endSelect .E_Cont {
-	FONT-SIZE: 14px; LEFT: 26px; COLOR: #fff; POSITION: absolute; TOP: 10px
-}
-#endSelect .E_Cont P {
-	PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 4px; OVERFLOW: hidden; PADDING-TOP: 4px; ZOOM: 1
-}
-#rePlayBut {
-	BACKGROUND: url(e_m_01.png) no-repeat -300px -900px; FLOAT: left; WIDTH: 69px; HEIGHT: 23px
-}
-#nextPicsBut {
-	BACKGROUND: url(e_m_01.png) no-repeat -400px -900px; FLOAT: left; MARGIN-LEFT: 10px; WIDTH: 97px; HEIGHT: 23px
-}
-#endSelect #endSelClose {
-	Z-INDEX: 2; RIGHT: 3px; BACKGROUND: url(e_m_01.png) no-repeat -300px -950px; OVERFLOW: hidden; WIDTH: 11px; CURSOR: pointer; POSITION: absolute; TOP: 3px; HEIGHT: 11px
-}
-.buttonBg {
-	Z-INDEX: 2; BACKGROUND: url(e_m_01.png) no-repeat 100px 100px; WIDTH: 43px; POSITION: absolute; HEIGHT: 40px
-}
-.bBgS_1 {
-	BACKGROUND-POSITION: -200px 0px
-}
-.bBgS_2 {
-	BACKGROUND-POSITION: -300px 0px
-}
-.bBgS_3 {
-	BACKGROUND-POSITION: -400px 0px
-}
-.buttonBg1 {
-	Z-INDEX: 2; BACKGROUND: url(e_m_01.png) no-repeat 100px 100px; WIDTH: 55px; POSITION: absolute; HEIGHT: 40px
-}
-.bBg1S_1 {
-	BACKGROUND-POSITION: -300px -200px
-}
-.bBg1S_2 {
-	BACKGROUND-POSITION: -400px -200px
-}
-.bBg1S_3 {
-	BACKGROUND-POSITION: -300px -250px
-}
-#d_BigPic IMG {
-	FILTER:blendTrans(Duration=0.4)
-}
-#ePicList {
-	DISPLAY: none; MARGIN-LEFT: -10px; OVERFLOW: hidden; ZOOM: 1
-}
-.picBox {
-	DISPLAY: inline; BACKGROUND: url(e_m_01.png) no-repeat 0px -600px; FLOAT: left; MARGIN: 0px 0px 10px 10px; OVERFLOW: hidden; WIDTH: 230px; CURSOR: pointer; HEIGHT: 182px; TEXT-ALIGN: center
-}
-.picBox TD {
-	PADDING-RIGHT: 2px; PADDING-LEFT: 2px; PADDING-BOTTOM: 0px; WIDTH: 226px; PADDING-TOP: 2px; HEIGHT: 180px
-}
-.picBox TD IMG {
-	BORDER-RIGHT: #b4b4b4 1px solid; BORDER-TOP: #b4b4b4 1px solid; BORDER-LEFT: #b4b4b4 1px solid; BORDER-BOTTOM: #b4b4b4 1px solid
-}
-.picBox H3 {
-	PADDING-RIGHT: 4px; PADDING-LEFT: 4px; FONT-WEIGHT: normal; FONT-SIZE: 12px; MIN-HEIGHT: 20px; PADDING-BOTTOM: 0px; COLOR: #858585; LINE-HEIGHT: 14px; PADDING-TOP: 4px; HEIGHT: 20px
-}
-.picBox .time {
-	PADDING-RIGHT: 0px; BORDER-TOP: #e6e6e6 1px solid; PADDING-LEFT: 0px; FONT-SIZE: 11px; PADDING-BOTTOM: 0px; MARGIN: 0px auto; WIDTH: 188px; COLOR: #b6b6b6; LINE-HEIGHT: 20px; PADDING-TOP: 2px
-}
-.selected {
-	BACKGROUND-POSITION: -250px -600px
-}
-.selected TD IMG {
-	BORDER-LEFT-COLOR: #ff9845; BORDER-BOTTOM-COLOR: #ff9845; BORDER-TOP-COLOR: #ff9845; BORDER-RIGHT-COLOR: #ff9845
-}
-.selected H3 {
-	COLOR: #ff8c46
-}
-.selected .time {
-	BORDER-LEFT-COLOR: #ffe2cb; BORDER-BOTTOM-COLOR: #ffe2cb; COLOR: #ffad84; BORDER-TOP-COLOR: #ffe2cb; BORDER-RIGHT-COLOR: #ffe2cb
-}
-.s_select_01 {
-	Z-INDEX: 200; BACKGROUND: url(e_m_07.gif) no-repeat 0px 0px; CURSOR: default; LINE-HEIGHT: 20px; POSITION: absolute; HEIGHT: 20px; TEXT-ALIGN: left
-}
-.s_select_01 .ds_cont {
-	COLOR: #9d9d9d
-}
-.s_select_01 .ds_title {
-	PADDING-LEFT: 3px; FLOAT: left
-}
-.s_select_01 .ds_button {
-	DISPLAY: inline; BACKGROUND: url(e_m_07.gif) no-repeat 100% -25px; FLOAT: right; WIDTH: 20px; HEIGHT: 20px
-}
-.s_select_01 .ds_list {
-	BACKGROUND: #fff; LEFT: 0px; WIDTH: 100%; POSITION: absolute; TOP: 19px
-}
-.s_select_01 .dsl_cont {
-	BORDER-RIGHT: #ccc 1px solid; BORDER-TOP: #ccc 1px solid; BORDER-LEFT: #ccc 1px solid; BORDER-BOTTOM: #ccc 1px solid
-}
-.s_select_01 .ds_list P {
-	PADDING-LEFT: 2px; BACKGROUND: #fff; MARGIN: 1px; COLOR: #666; LINE-HEIGHT: 20px
-}
-.s_select_01 .ds_list P.selected {
-	BACKGROUND: #e2e2ff; COLOR: #333
-}
-#commNumBox {
-	DISPLAY: none
-}
-A.videoNewsLeft {
-	PADDING-LEFT: 20px; BACKGROUND: url(unfcn_mj_01.png) no-repeat -19982px 50%
-}
-
-