Merge branch 'adminstyle' into develop

src/admin/templets/mychannel_add.htm

@@ -84,7 +84,7 @@
 											$dsql->Execute();
 											while($row3 = $dsql->GetObject())
 											{
-												echo "<label><input type='radio' name='usertype' value=".$row3->name."> ".$row3->name."</label>";
+												echo "<label><input type='radio' name='usertype' value=".$row3->name."> ".$row3->name."</label> ";
 											}
 											?>
 											<label><input type="radio" name="usertype" checked> 不限</label>

src/system/archive/sglistview.class.php

@@ -972,23 +972,19 @@ class SgListView
             $nowurls = explode("?", $nowurls);
             $purl = $nowurls[0];
         }
-        $geturl = "&TotalResult=".$this->TotalResult."&nativeplace=$nativeplace&infotype=$infotype&keyword=".urlencode($keyword)."&";
-        $hidenform = "<input type='hidden' name='tid' value='".$this->TypeID."' />";
-        $hidenform = "<input type='hidden' name='nativeplace' value='$nativeplace' />";
-        $hidenform = "<input type='hidden' name='infotype' value='$infotype' />";
-        $hidenform = "<input type='hidden' name='keyword' value='$keyword' />";
-        $hidenform .= "<input type='hidden' name='TotalResult' value='".$this->TotalResult."' />";
-        $purl .= "?tid=".$this->TypeID."&";
+        $geturl = "tid=".$this->TypeID."&TotalResult=".$this->TotalResult."&";
+        $purl .= '?'.$geturl;
+        $optionlist = '';
         //获得上页和下页的链接
         if ($this->PageNo != 1) {
-            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=$prepagenum{$geturl}' class='page-link'>上页</a></li>";
-            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1{$geturl}' class='page-link'>首页</a></li>";
+            $prepage .= "<li class='page-item'><a href='".$purl."PageNo=$prepagenum' class='page-link'>上页</a></li>";
+            $indexpage = "<li class='page-item'><a href='".$purl."PageNo=1' class='page-link'>首页</a></li>";
         } else {
             $indexpage = "<li class='page-item disabled'><span class='page-link'>首页</span></li>";
         }
         if ($this->PageNo != $totalpage && $totalpage > 1) {
-            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=$nextpagenum{$geturl}' class='page-link'>下页</a></li>";
-            $endpage = "<li class='page-item'><a href='".$purl."PageNo=$totalpage{$geturl}' class='page-link'>末页</a></li>";
+            $nextpage .= "<li class='page-item'><a href='".$purl."PageNo=$nextpagenum' class='page-link'>下页</a></li>";
+            $endpage = "<li class='page-item'><a href='".$purl."PageNo=$totalpage' class='page-link'>末页</a></li>";
         } else {
             $endpage = "<li class='page-item disabled'><span class='page-link'>末页</span></li>";
         }
@@ -1011,7 +1007,7 @@ class SgListView
             if ($j == $this->PageNo) {
                 $listdd .= "<li class='page-item active'><span class='page-link'>$j</span></li>";
             } else {
-                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=$j{$geturl}' class='page-link'>$j</a></li>";
+                $listdd .= "<li class='page-item'><a href='".$purl."PageNo=$j' class='page-link'>$j</a></li>";
             }
         }
         $plist = '';