From 35ca5ef49145aafd20ee20b48ca364b7d6b43759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com>
Date: Mon, 8 Jul 2024 20:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9@=E6=88=90=E5=91=98=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dzz/comment/images/comment.css            |  7 +-
 dzz/comment/template/publish_form.htm     |  2 +-
 dzz/comment/template/reply_form.htm       |  2 +-
 dzz/system/at.php                         | 11 ++-
 dzz/system/template/notification.htm      |  2 +-
 dzz/system/template/notification_list.htm | 94 +++++++++++------------
 static/css/app_manage.css                 |  5 +-
 7 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/dzz/comment/images/comment.css b/dzz/comment/images/comment.css
index 83c9e85..e50c83e 100644
--- a/dzz/comment/images/comment.css
+++ b/dzz/comment/images/comment.css
@@ -13,7 +13,12 @@
     min-width: 120px;
     z-index: 99999;
 }
-
+.atwho-view .img-avatar {
+	width: 24px;
+	height: 24px;
+	line-height: 20px;
+    font-size: 10px;
+}
 .atwho-view .cur {
     background: #428bca;
     color: white;
diff --git a/dzz/comment/template/publish_form.htm b/dzz/comment/template/publish_form.htm
index 035b6b2..a5ece38 100644
--- a/dzz/comment/template/publish_form.htm
+++ b/dzz/comment/template/publish_form.htm
@@ -204,7 +204,7 @@ jQuery(document).ready(function(e) {
 							}                    
 						}
 			},
-			 tpl: "<li data-value='@[${name}:${id}]' title='${title}'><img src='${icon}'>&nbsp;${name}</li>",
+			 tpl: "<li data-value='@[${name}:${id}]' title='${title}'>${icon}&nbsp;${name}</li>",
 			 search_key: "searchkey",
 			 start_with_space: false,
 			 limit: 5,
diff --git a/dzz/comment/template/reply_form.htm b/dzz/comment/template/reply_form.htm
index efe0819..6703dff 100644
--- a/dzz/comment/template/reply_form.htm
+++ b/dzz/comment/template/reply_form.htm
@@ -174,7 +174,7 @@
 							}                    
 						}
 			},
-			 tpl: "<li data-value='@[${name}:${id}]' title='${title}'><img src='${icon}'>&nbsp;${name}</li>",
+			 tpl: "<li data-value='@[${name}:${id}]' title='${title}'>${icon}&nbsp;${name}</li>",
 			 search_key: "searchkey",
 			 start_with_space: false,
 			 limit: 5,
diff --git a/dzz/system/at.php b/dzz/system/at.php
index 196c7ab..9f92332 100644
--- a/dzz/system/at.php
+++ b/dzz/system/at.php
@@ -27,12 +27,11 @@
 	  foreach(DB::fetch_all("select u.uid,u.username  from %t u LEFT JOIN %t s on u.uid=s.uid  $sql_user order by s.lastactivity DESC limit 10",$param_user) as $value){
 		 if($value['uid']!=$_G['uid']){
 			 $data[]=array('name'=>$value['username'],
-						   'searchkey'=> pinyin::encode($value['username'],'all').$value['username'],
-						   'id'=>'u'.$value['uid'],
-						   'icon'=>'avatar.php?uid='.$value['uid'].'&size=small',
-						   'title'=>$value['username'].':'.'u'.$value['uid']
-						);
-			
+				'searchkey'=> pinyin::encode($value['username'],'all').$value['username'],
+				'id'=>'u'.$value['uid'],
+				'icon'=>avatar_block($value['uid']),
+				'title'=>$value['username'].':'.'u'.$value['uid']
+			);
 		 }
 	  }
   }
diff --git a/dzz/system/template/notification.htm b/dzz/system/template/notification.htm
index ffa42b9..a3f5773 100644
--- a/dzz/system/template/notification.htm
+++ b/dzz/system/template/notification.htm
@@ -18,7 +18,7 @@
                   <!--{else}-->
                   <p class="note u-bottom" >无内容</p>
                   <!--{/if}-->
-                  <p class="dateline u-bottom">$value[dateline]</p>
+                  <p class="dateline u-bottom text-muted">$value[dateline]</p>
                 </div>
             </div>
             <!--{/loop}-->
diff --git a/dzz/system/template/notification_list.htm b/dzz/system/template/notification_list.htm
index 778ea79..89f395c 100644
--- a/dzz/system/template/notification_list.htm
+++ b/dzz/system/template/notification_list.htm
@@ -13,7 +13,7 @@
 		<!--{loop $searchcats $val}-->
 		<li class="nav-item" data-appid="$val[appid]">
 			<a <!--{if $fromid == $val['appid']}-->class="nav-link active"<!--{/if}-->href="{MOD_URL}&op=notification&appid=$val[appid]">
-				<img src="$val[appico]">
+				<img style="margin-right: 5px;"src="$val[appico]">
 				<span class="notice-text">$val[appname]</span>
 			</a>
 		</li>
@@ -24,63 +24,59 @@
 
 <div class="panel-container main-allcontent clearfix">
 	<!--{if $list}-->
-  <div class="panel-heading">
-		<!--{if $img}-->
-		<img src="$img">
-		<!--{else}-->
+	<div class="panel-heading">
+	<!--{if $img}-->
+	<img src="$img">
+	<!--{else}-->
     <span class="dzz dzz-notifications dzz-allnotice"></span>
-		<!--{/if}-->
+	<!--{/if}-->
     <h3>{$tongzhileixing}($count)</h3>
   </div>
 	<!--{/if}-->
   <div class="panel-body">
       <ul id="notification-list" class="notification-list list-unstyled u-gutter clearfix"> 
-             <!--{if $list}-->
-             <!--{loop $list $value}-->
-                <li class="card notification-list-item clearfix">
-
-                    <div class="member member-no-menu">
-											<a href="user.php?uid=$value[authorid]">
-                         {eval echo avatar_block($value[authorid]);}
-                      </a>
-                    </div>
-
-                    <div class="details">
-											<!--{if $value[title]}-->
-											<p class="note u-title" >$value[title]</p>
-											<!--{/if}-->
-											<!--{if $value[note]}-->
-											<p class="note u-bottom" >$value[note]</p>
-											<!--{else}-->
-                      <p class="note u-bottom" >无内容</p>
-											<!--{/if}-->
-											<!--{if $value[redirecturl]}-->
-											<p class="dateline u-bottom" >来源地址:<a href="$value[redirecturl]" target="_blank">$value[redirecturl]</a></p>
-											<!--{/if}-->
-                      {if !isset($fromid) || is_string($fromid)}
-											<div class="note-iconimg">
-                        <img src="$value[appico]">
-											</div>
-											{/if}
-                      <p class="dateline u-bottom">$value[dateline]</p>
-                    </div>
-                </li>
-                <!--{/loop}-->
-             <!--{else}-->
-              <div style="text-align: center;">
-              <img src="static/image/common/no_list.png" /><br>
-              <span class="no-result-title">{lang noappall_notice}…</span>
-              </div>
-            <!--{/if}-->
-            </ul>
-
+			<!--{if $list}-->
+			<!--{loop $list $value}-->
+			<li class="card notification-list-item clearfix">
+				<div class="member member-no-menu">
+					<a href="user.php?uid=$value[authorid]">
+						{eval echo avatar_block($value[authorid]);}
+					</a>
+				</div>
+				<div class="details">
+				<!--{if $value[title]}-->
+				<p class="note u-title">$value[title]</p>
+				<!--{/if}-->
+				<!--{if $value[note]}-->
+				<p class="note u-bottom">$value[note]</p>
+				<!--{else}-->
+				<p class="note u-bottom">无内容</p>
+				<!--{/if}-->
+				<!--{if $value[redirecturl]}-->
+				<p class="dateline u-bottom text-muted">来源地址:<a href="$value[redirecturl]" target="_blank">$value[redirecturl]</a></p>
+				<!--{/if}-->
+				<!--{if !isset($fromid) || is_string($fromid)}-->
+				<div class="note-iconimg">
+					<img src="$value[appico]">
+				</div>
+				<!--{/if}-->
+					<p class="dateline u-bottom text-muted">$value[dateline]</p>
+				</div>
+			</li>
+			<!--{/loop}-->
+			<!--{else}-->
+			<div style="text-align: center;">
+			<img src="static/image/common/no_list.png" /><br>
+			<span class="no-result-title">{lang noappall_notice}…</span>
+			</div>
+		<!--{/if}-->
+		</ul>
    </div>
-
 </div>
 	<div class="all-notice">
-  <nav aria-label="Page navigation" class="notice-navigation">
-    {$multi}
-  </nav>
+		<nav aria-label="Page navigation" class="notice-navigation">
+			{$multi}
+		</nav>
 	</div>
 </div>
 <script type="text/javascript">
diff --git a/static/css/app_manage.css b/static/css/app_manage.css
index 4256468..cd89ec8 100644
--- a/static/css/app_manage.css
+++ b/static/css/app_manage.css
@@ -357,7 +357,7 @@ button.input-search-drop {
 }
 .notification-list-item .member{
 	position: absolute;
-    left: 2px;
+    left: 9px;
     cursor: pointer;
     top: 10px;
     float: left;
@@ -386,6 +386,9 @@ button.input-search-drop {
 .u-bottom b{
 	border-bottom: 2px solid #d8e5f9;
 }
+.u-bottom a{
+    color: var(--bs-primary);
+}
 .member-initials {
   display: block;
   font-size: 20px;