From b6e7382d9fb2ca2889144fa991e090ef850324a9 Mon Sep 17 00:00:00 2001
From: LyLme <admin@lylme.com>
Date: Thu, 12 May 2022 05:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=92=8C=E7=A6=81=E7=94=A8=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/5iux/index.php   | 7 ++++---
 template/baisu/list.php   | 5 +++--
 template/default/list.php | 5 +++--
 template/lylme/list.php   | 4 +++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/template/5iux/index.php b/template/5iux/index.php
index e44681d..4ddf53a 100644
--- a/template/5iux/index.php
+++ b/template/5iux/index.php
@@ -44,14 +44,13 @@ if (!empty($q)) {
     <div id="menu"><i></i></div>
     <div class="list closed">
   <?php        
-        $links = $DB->query("SELECT * FROM `lylme_links`");
-// 获取网站
+
 $groups = $DB->query("SELECT * FROM `lylme_groups` ORDER BY `group_order` ASC");
 // 获取分类
 $i = 0;
 while ($group = $DB->fetch($groups)) {
 	//循环所有分组
-	$sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id'];
+	$sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id']." ORDER BY `link_order` ASC;";
 	$group_links = $DB->query($sql);
 	$link_num = $DB->num_rows($group_links);
 	// 获取返回字段条目数量
@@ -67,6 +66,7 @@ while ($group = $DB->fetch($groups)) {
 		// 返回指定分组下的所有字段
 		if ($link_num > $i) {
 			$i = $i + 1;
+			if($link["link_status"]!="0"){
 			echo "\n" . '<li class="col-3 col-sm-3 col-md-3 col-lg-1"><a rel="nofollow" href="' . $link["url"] . '" target="_blank">';
 			if ($link["icon"] == '') {
 				echo '<img src="/assets/img/default-icon.png" alt="默认' . $link["name"] . '" />';
@@ -77,6 +77,7 @@ while ($group = $DB->fetch($groups)) {
 			}
 			echo '<span>' . $link["name"] . '</span></a></li>';
 			//输出图标和链接
+			}
 		}
 		if ($link_num == $i) {
 			//判断当前分组链接循环完毕
diff --git a/template/baisu/list.php b/template/baisu/list.php
index ba2e6a8..039d373 100644
--- a/template/baisu/list.php
+++ b/template/baisu/list.php
@@ -9,14 +9,13 @@
 // | Authors: LyLme <admin@lylme.com>                         |
 // | date: 2022-05-01                                         |
 // +----------------------------------------------------------+
-$links = $DB->query("SELECT * FROM `lylme_links`");
 // 获取网站
 $groups = $DB->query("SELECT * FROM `lylme_groups` ORDER BY `group_order` ASC");
 // 获取分类
 $i = 0;
 while ($group = $DB->fetch($groups)) {
 	//循环所有分组
-	$sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id'];
+	$sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id']." ORDER BY `link_order` ASC;";
 	$group_links = $DB->query($sql);
 	$link_num = $DB->num_rows($group_links);
 	// 获取返回字段条目数量
@@ -36,6 +35,7 @@ while ($group = $DB->fetch($groups)) {
 		// 返回指定分组下的所有字段
 		if ($link_num > $i) {
 			$i = $i + 1;
+			if($link["link_status"]!="0"){
 			echo "\n" . '
             <div class="list urllist" id="id_' . $link["id"] . '" data-id="' . $link["id"] . '" data-url="' . $link["url"] . '">
 			<a rel="nofollow" href="' . $link["url"] . '" target="_blank">';
@@ -47,6 +47,7 @@ while ($group = $DB->fetch($groups)) {
 				echo $link["icon"];
 			}
 			echo	'<p class="name">'. $link["name"] . '</p><p class="desc"></p></a></div>';
+			}
 		}
 		if ($link_num == $i) {
 			//判断当前分组链接循环完毕
diff --git a/template/default/list.php b/template/default/list.php
index 86afcfd..2f2c94e 100644
--- a/template/default/list.php
+++ b/template/default/list.php
@@ -11,11 +11,10 @@
 // +----------------------------------------------------------+
 
 
-$links = $DB->query("SELECT * FROM `lylme_links`"); // 获取网站
 $groups = $DB->query("SELECT * FROM `lylme_groups` ORDER BY `group_order` ASC"); // 获取分类
 $i = 0;
 while ($group = $DB->fetch($groups)) { //循环所有分组
-    $sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id'];
+    $sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id']." ORDER BY `link_order` ASC;";
     $group_links = $DB->query($sql);
     $link_num = $DB->num_rows($group_links); // 获取返回字段条目数量
     echo '<ul class="mylist row"><li id="group_' . $group["group_id"] . '" class="title">' . $group["group_icon"] . '<sapn>' . $group["group_name"] . '</sapn></li>'; //输出分组图标和标题
@@ -28,6 +27,7 @@ while ($group = $DB->fetch($groups)) { //循环所有分组
         // 返回指定分组下的所有字段
         if ($link_num > $i) {
             $i = $i + 1;
+            if($link["link_status"]!="0"){
             echo "\n" . '<li class="col-3 col-sm-3 col-md-3 col-lg-1"><a rel="nofollow" href="' . $link["url"] . '" target="_blank">';
             if ($link["icon"] == '') {
                 echo '<img src="/assets/img/default-icon.png" alt="默认' . $link["name"] . '" />';
@@ -38,6 +38,7 @@ while ($group = $DB->fetch($groups)) { //循环所有分组
             }
             echo '<span>' . $link["name"] . '</span></a></li>';
             //输出图标和链接
+			}
         }
         if ($link_num == $i) {
             //判断当前分组链接循环完毕
diff --git a/template/lylme/list.php b/template/lylme/list.php
index 1852199..e94a2b3 100644
--- a/template/lylme/list.php
+++ b/template/lylme/list.php
@@ -15,7 +15,7 @@ $links = $DB->query("SELECT * FROM `lylme_links`"); // 获取网站
 $groups = $DB->query("SELECT * FROM `lylme_groups` ORDER BY `group_order` ASC"); // 获取分类
 $i = 0;
 while ($group = $DB->fetch($groups)) { //循环所有分组
-    $sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id'];
+    $sql = "SELECT * FROM `lylme_links` WHERE `group_id` = " . $group['group_id']." ORDER BY `link_order` ASC;";
     $group_links = $DB->query($sql);
     $link_num = $DB->num_rows($group_links); // 获取返回字段条目数量
     echo '<ul class="mylist row"><li class="title">' . $group["group_icon"] . '<sapn>' . $group["group_name"] . '</sapn></li>'; //输出分组图标和标题
@@ -28,6 +28,7 @@ while ($group = $DB->fetch($groups)) { //循环所有分组
         // 返回指定分组下的所有字段
         if ($link_num > $i) {
             $i = $i + 1;
+            if($link["link_status"]!="0"){
             echo "\n" . '<li class="lylme-3"><a rel="nofollow" href="' . $link["url"] . '" target="_blank">';
             if ($link["icon"] == '') {
                 echo '<img src="/assets/img/default-icon.png" alt="默认' . $link["name"] . '" />';
@@ -37,6 +38,7 @@ while ($group = $DB->fetch($groups)) { //循环所有分组
                 echo $link["icon"];
             }
             echo '<span>' . $link["name"] . '</span></a></li>';
+            }
             //输出图标和链接
         }
         if ($link_num == $i) {