Merge pull request 'feat(user-center): 用户中心前台 1:1 列表/URL/关注/身份' (#69) from worktree-user-center-1to1 into main

Reviewed-on: CYL/wordpress-theme-aksrt#69

header.php

@@ -140,9 +140,9 @@ if (!empty($aksrt_bg_styles)) {
 	$aksrt_current_user = wp_get_current_user();
 	$aksrt_user_credit = function_exists('aksrt_user_credits') && is_user_logged_in() ? (int) aksrt_user_credits(get_current_user_id()) : 0;
 	$aksrt_currency_name = class_exists('AKSRT_Settings') ? AKSRT_Settings::get_currency_name() : __('积分', 'aksrt');
-	$aksrt_orders_url = home_url('/orders/');
+	$aksrt_orders_url = function_exists('aksrt_get_orders_page_url') ? aksrt_get_orders_page_url() : '';
 	$aksrt_publish_url = admin_url('post-new.php');
-	$aksrt_messages_url = function_exists('aksrt_get_user_center_url') ? aksrt_get_user_center_url('notif') : home_url('/');
+	$aksrt_messages_url = function_exists('aksrt_get_messages_page_url') ? aksrt_get_messages_page_url() : '';
 	$aksrt_unread_count = (is_user_logged_in() && function_exists('aksrt_get_user_unread_notification_count'))
 		? (int) aksrt_get_user_unread_notification_count(get_current_user_id())
 		: 0;

inc/classes/class-aksrt-templates.php

@@ -48,6 +48,7 @@ class AKSRT_Templates {
             'templates/pages/page-orders.php' => __('AKSRT - 订单中心', 'aksrt'),
             'templates/pages/page-revenue.php' => __('AKSRT - 收益中心', 'aksrt'),
             'templates/pages/page-cart.php' => __('AKSRT - 购物车', 'aksrt'),
+            'templates/pages/page-messages.php' => __('AKSRT - 消息中心', 'aksrt'),
             'templates/pages/page-product.php' => __('AKSRT - 商品详情', 'aksrt'),
             'templates/pages/page-product-edit.php' => __('AKSRT - 商品编辑', 'aksrt'),
             'templates/pages/page-forums.php' => __('AKSRT - 论坛', 'aksrt'),

inc/classes/class-aksrt-user.php

@@ -672,6 +672,51 @@ function aksrt_get_user_center_url(string $tab = ''): string {
 }
 endif;
 
+if (!function_exists('aksrt_get_orders_page_url')) :
+/**
+ * 订单中心页面 URL（模板 templates/pages/page-orders.php）。
+ * 未指派页面时返回空串，调用方应隐藏入口。
+ */
+function aksrt_get_orders_page_url(): string {
+    return function_exists('aksrt_get_page_url_by_template')
+        ? aksrt_get_page_url_by_template('templates/pages/page-orders.php')
+        : '';
+}
+endif;
+
+if (!function_exists('aksrt_get_cart_page_url')) :
+/**
+ * 购物车页面 URL（模板 templates/pages/page-cart.php）。
+ */
+function aksrt_get_cart_page_url(): string {
+    return function_exists('aksrt_get_page_url_by_template')
+        ? aksrt_get_page_url_by_template('templates/pages/page-cart.php')
+        : '';
+}
+endif;
+
+if (!function_exists('aksrt_get_revenue_page_url')) :
+/**
+ * 收益中心页面 URL（模板 templates/pages/page-revenue.php）。
+ */
+function aksrt_get_revenue_page_url(): string {
+    return function_exists('aksrt_get_page_url_by_template')
+        ? aksrt_get_page_url_by_template('templates/pages/page-revenue.php')
+        : '';
+}
+endif;
+
+if (!function_exists('aksrt_get_messages_page_url')) :
+/**
+ * 消息中心页面 URL（模板 templates/pages/page-messages.php）。
+ */
+function aksrt_get_messages_page_url(): string {
+    return function_exists('aksrt_get_page_url_by_template')
+        ? aksrt_get_page_url_by_template('templates/pages/page-messages.php')
+        : '';
+}
+endif;
+
 if (!function_exists('aksrt_get_user_home_url')) :
 /**
  * 获取公开用户主页 URL（/user/{nicename}/）

inc/helpers/aksrt-user-center.php

@@ -401,7 +401,7 @@ if (!function_exists('aksrt_get_user_center_render_context')) {
 			? aksrt_get_user_dashboard_view($user_id, [
 				'viewer_id'            => $user_id,
 				'include_recent_posts' => false,
-				'include_governance'   => false,
+				'include_governance'   => true,
 			])
 			: [];
 
@@ -453,7 +453,7 @@ if (!function_exists('aksrt_get_user_center_render_context')) {
 			'show_avatar_edit'          => !empty($user_center_settings['avatar_upload']),
 			'avatar_settings_url'       => admin_url('profile.php'),
 			'notification_unread_count' => function_exists('aksrt_get_user_unread_notification_count') ? aksrt_get_user_unread_notification_count($user_id) : 0,
-			'messages_url'              => aksrt_get_user_center_url('notif'),
+			'messages_url'              => function_exists('aksrt_get_messages_page_url') ? aksrt_get_messages_page_url() : '',
 			'per_page'                  => 10,
 			'posts_page'                => max(1, isset($_GET['posts_page']) ? (int) $_GET['posts_page'] : 1),
 			'comments_page'             => max(1, isset($_GET['comments_page']) ? (int) $_GET['comments_page'] : 1),

inc/helpers/aksrt-user-home.php

@@ -82,17 +82,25 @@ if (!function_exists('aksrt_get_user_home_page_context')) {
 		$forum_instance = class_exists('AKSRT_Forum') ? AKSRT_Forum::get_instance() : null;
 		$forum_stats = $forum_instance ? $forum_instance->get_user_forum_stats($user_id) : [];
 		$forum_topic_count = (int) ($forum_stats['topic_count'] ?? 0);
-		$forum_followed_count = (int) ($forum_stats['followed_plate_count'] ?? 0);
+		$product_count = 0;
+		if (class_exists('AKSRT_Shop')) {
+			$product_count = (int) AKSRT_Shop::get_instance()->count_author_products($user_id);
+		}
+
+		$follow_count = 0;
+		if (class_exists('AKSRT_Follow')) {
+			$follow_count = (int) AKSRT_Follow::get_instance()->get_following_count($user_id);
+		}
 
 		$tab_counts = [
 			'posts'     => $post_count,
 			'comments'  => $comment_count,
 			'favorites' => $favorite_count,
 			'credits'   => $credits_enabled && $is_own_profile ? (int) round((float) $credit_balance) : 0,
-			'product'   => 0,
+			'product'   => $product_count,
 			'plate'     => 0,
 			'forum'     => $forum_topic_count,
-			'follow'    => $forum_followed_count,
+			'follow'    => $follow_count,
 		];
 
 		$tab_labels = [

inc/helpers/user-center-renderers/sidebar-commerce.php

@@ -16,6 +16,9 @@ if (empty($orders_url) && empty($show_vip) && empty($show_credit_tabs)) {
 <div class="uc-sidebar__section">
 	<div class="uc-sidebar__title"><?php esc_html_e('权益与消费', 'aksrt'); ?></div>
 	<div class="uc-sidebar__buttons">
+			<?php
+			$revenue_url = function_exists('aksrt_get_revenue_page_url') ? aksrt_get_revenue_page_url() : '';
+			?>
 		<?php if ($orders_url) : ?>
 			<a href="<?php echo esc_url($orders_url); ?>" class="uc-sidebar__btn">
 				<i class="fas fa-receipt" aria-hidden="true"></i>
@@ -34,8 +37,8 @@ if (empty($orders_url) && empty($show_vip) && empty($show_credit_tabs)) {
 				<span><?php echo esc_html($currency_name); ?></span>
 			</a>
 		<?php endif; ?>
-		<?php if (!empty($affiliate_enabled)) : ?>
-			<a class="uc-sidebar__btn<?php echo $active_tab === 'credits' ? ' is-active' : ''; ?>" href="<?php echo esc_url(aksrt_get_user_center_tab_url('credits')); ?>" data-tab="credits">
+			<?php if (!empty($affiliate_enabled) && $revenue_url) : ?>
+				<a href="<?php echo esc_url($revenue_url); ?>" class="uc-sidebar__btn">
 				<i class="fas fa-share-alt" aria-hidden="true"></i>
 				<span><?php esc_html_e('推广返佣', 'aksrt'); ?></span>
 			</a>

templates/parts/single-author-bar.php

@@ -65,7 +65,7 @@ $classes = trim('article-avatar ' . $extra_class . ($show_actions ? ' article-av
 				</button>
 				<?php // 私信为“停用候选”兼容能力：默认不在前台暴露，仅在站点显式开启时显示。 ?>
 				<?php if (is_user_logged_in()) : ?>
-					<a href="<?php echo esc_url(add_query_arg('msg_type', 'conversation', aksrt_get_user_center_url('notif'))); ?>" class="author-action-btn author-action-btn--ghost">
+					<a href="<?php echo esc_url(add_query_arg('msg_type', 'conversation', function_exists('aksrt_get_messages_page_url') ? aksrt_get_messages_page_url() : home_url('/'))); ?>" class="author-action-btn author-action-btn--ghost">
 						<i class="far fa-comment-dots" aria-hidden="true"></i>
 						<span><?php esc_html_e('私信', 'aksrt'); ?></span>
 					</a>

templates/parts/user-home/panel-follow.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Public user home — follow tab panel.
+ * Public user home — follow tab panel (social following/followers).
  *
  * @package AKSRT
  */
@@ -11,29 +11,78 @@ $args = is_array($args ?? null) ? $args : [];
 extract($args, EXTR_SKIP); // phpcs:ignore WordPress.PHP.DontExtract.extract_extract
 
 ?>
-				<?php if (in_array('follow', $enabled_tabs, true)) : ?>
-				<div id="panel-follow" class="dashboard-panel<?php echo $active_tab === 'follow' ? ' is-active' : ''; ?>" role="tabpanel"<?php echo $active_tab !== 'follow' ? ' hidden' : ''; ?>>
-					<?php
-					if ($forum_instance) :
-						$followed = $forum_instance->get_user_followed_plates($user_id);
-						if (!empty($followed)) : ?>
-							<div class="uh-forum__plate-grid">
-								<?php foreach ($followed as $plate) : ?>
-									<a class="uh-forum__plate-card" href="<?php echo esc_url(get_permalink((int) ($plate['id'] ?? 0))); ?>">
-										<div class="uh-forum__plate-name"><?php echo esc_html((string) ($plate['name'] ?? '')); ?></div>
-										<div class="uh-forum__plate-stats">
-											<span><?php printf(esc_html__('%d 帖子', 'aksrt'), (int) ($plate['topic_count'] ?? 0)); ?></span>
-											<span><?php printf(esc_html__('%d 关注', 'aksrt'), (int) ($plate['follow_count'] ?? 0)); ?></span>
-										</div>
+					<?php if (in_array('follow', $enabled_tabs, true)) : ?>
+					<div id="panel-follow" class="dashboard-panel<?php echo $active_tab === 'follow' ? ' is-active' : ''; ?>" role="tabpanel"<?php echo $active_tab !== 'follow' ? ' hidden' : ''; ?>>
+						<?php
+						$follow_page = max(1, isset($_GET['follow_page']) ? (int) $_GET['follow_page'] : 1);
+						$follow_sub  = isset($_GET['follow_sub']) ? sanitize_key(wp_unslash($_GET['follow_sub'])) : 'following';
+						$follow_sub  = in_array($follow_sub, ['following', 'followers'], true) ? $follow_sub : 'following';
+
+						$follow_instance = class_exists('AKSRT_Follow') ? AKSRT_Follow::get_instance() : null;
+						$following_count = $follow_instance ? (int) $follow_instance->get_following_count((int) $user_id) : 0;
+						$follower_count  = $follow_instance ? (int) $follow_instance->get_follower_count((int) $user_id) : 0;
+						$list = ['items' => [], 'total' => 0, 'total_pages' => 1];
+						if ($follow_instance) {
+							$list = $follow_sub === 'followers'
+								? $follow_instance->get_followers((int) $user_id, $follow_page, (int) $per_page)
+								: $follow_instance->get_following((int) $user_id, $follow_page, (int) $per_page);
+						}
+						$items = is_array($list['items'] ?? null) ? $list['items'] : [];
+						$total_pages = max(1, (int) ($list['total_pages'] ?? 1));
+						?>
+						<div class="uh-forum__subtabs uh-follow__subtabs">
+							<a class="uh-forum__subtab<?php echo $follow_sub === 'following' ? ' is-active' : ''; ?>"
+								href="<?php echo esc_url(add_query_arg(['tab' => 'follow', 'follow_sub' => 'following', 'follow_page' => 1], $home_url)); ?>">
+								<i class="fas fa-user-plus"></i> <?php esc_html_e('关注', 'aksrt'); ?>
+								<span class="uh-forum__subtab-count"><?php echo esc_html((string) $following_count); ?></span>
+							</a>
+							<a class="uh-forum__subtab<?php echo $follow_sub === 'followers' ? ' is-active' : ''; ?>"
+								href="<?php echo esc_url(add_query_arg(['tab' => 'follow', 'follow_sub' => 'followers', 'follow_page' => 1], $home_url)); ?>">
+								<i class="fas fa-users"></i> <?php esc_html_e('粉丝', 'aksrt'); ?>
+								<span class="uh-forum__subtab-count"><?php echo esc_html((string) $follower_count); ?></span>
+							</a>
+						</div>
+
+						<?php if (!empty($items)) : ?>
+							<div class="uh-follow__list">
+								<?php foreach ($items as $row) :
+									$uid = (int) ($row['user_id'] ?? 0);
+									$name = (string) ($row['display_name'] ?? '');
+									$avatar = (string) ($row['avatar_url'] ?? '');
+									$profile = function_exists('aksrt_get_user_home_url') ? aksrt_get_user_home_url($uid) : home_url('/');
+									?>
+									<a class="uh-follow__item" href="<?php echo esc_url($profile); ?>">
+										<span class="uh-follow__avatar">
+											<?php if ($avatar !== '') : ?>
+												<img src="<?php echo esc_url($avatar); ?>" alt="" width="48" height="48" loading="lazy">
+											<?php else : ?>
+												<?php echo get_avatar($uid, 48); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+											<?php endif; ?>
+										</span>
+										<span class="uh-follow__name"><?php echo esc_html($name !== '' ? $name : sprintf(__('用户 #%d', 'aksrt'), $uid)); ?></span>
 									</a>
 								<?php endforeach; ?>
 							</div>
+							<?php if ($total_pages > 1) : ?>
+								<div class="uh-forum__pagination">
+									<?php
+									echo paginate_links([
+										'base'     => add_query_arg(['tab' => 'follow', 'follow_sub' => $follow_sub, 'follow_page' => '%#%'], $home_url),
+										'format'   => '',
+										'current'  => $follow_page,
+										'total'    => $total_pages,
+										'add_args' => ['tab' => 'follow', 'follow_sub' => $follow_sub],
+									]);
+									?>
+								</div>
+							<?php endif; ?>
 						<?php else : ?>
-							<?php aksrt_render_profile_empty($svg_empty_post, __('暂未关注任何版块', 'aksrt')); ?>
-						<?php endif;
-					else :
-						aksrt_render_profile_empty($svg_empty_post, __('暂无关注内容', 'aksrt'));
-					endif;
-					?>
-				</div>
-				<?php endif; ?>
+							<?php
+							$empty_msg = $follow_sub === 'followers'
+								? __('暂无粉丝', 'aksrt')
+								: __('暂未关注任何人', 'aksrt');
+							aksrt_render_profile_empty($svg_empty_post, $empty_msg);
+							?>
+						<?php endif; ?>
+					</div>
+					<?php endif; ?>

templates/parts/user-home/panels-core.php

@@ -131,17 +131,68 @@ extract($args, EXTR_SKIP); // phpcs:ignore WordPress.PHP.DontExtract.extract_ext
 				</div>
 				<?php endif; ?>
 
-				<?php
-				// Placeholder panels for extended tabs (product, plate)
-				$_uh_extended_tabs = ['product', 'plate'];
-				$_uh_placeholder_msgs = [
-					'product' => __('暂无商品内容', 'aksrt'),
-					'plate'   => __('暂无圈子内容', 'aksrt'),
-				];
-				foreach ($_uh_extended_tabs as $_uh_ext) :
-					if (!in_array($_uh_ext, $enabled_tabs, true)) continue;
-				?>
-				<div id="panel-<?php echo esc_attr($_uh_ext); ?>" class="dashboard-panel<?php echo $active_tab === $_uh_ext ? ' is-active' : ''; ?>" role="tabpanel"<?php echo $active_tab !== $_uh_ext ? ' hidden' : ''; ?>>
-					<?php aksrt_render_profile_empty($svg_empty_post, $_uh_placeholder_msgs[$_uh_ext]); ?>
-				</div>
-				<?php endforeach; ?>
+								<?php if (in_array('product', $enabled_tabs, true)) : ?>
+					<div id="panel-product" class="dashboard-panel<?php echo $active_tab === 'product' ? ' is-active' : ''; ?>" role="tabpanel"<?php echo $active_tab !== 'product' ? ' hidden' : ''; ?>>
+						<?php
+						$product_page = max(1, isset($_GET['product_page']) ? (int) $_GET['product_page'] : 1);
+						$product_view = ['items' => [], 'total' => 0, 'max_pages' => 0];
+						if (class_exists('AKSRT_Shop')) {
+							$product_view = AKSRT_Shop::get_instance()->get_store_products((int) $user_id, $product_page, (int) $per_page);
+						}
+						$product_items = is_array($product_view['items'] ?? null) ? $product_view['items'] : [];
+						$product_max_pages = (int) ($product_view['max_pages'] ?? 0);
+						if (!empty($product_items)) :
+							?>
+							<div class="aksrt-product-archive__grid aksrt-product-archive__grid--default uh-product-grid">
+								<?php foreach ($product_items as $product) :
+									$sales = (int) ($product['sales'] ?? 0);
+									?>
+									<article class="aksrt-product-card">
+										<a href="<?php echo esc_url((string) ($product['permalink'] ?? '#')); ?>" class="aksrt-product-card__link">
+											<?php if (!empty($product['image'])) : ?>
+												<div class="aksrt-product-card__image">
+													<img src="<?php echo esc_url((string) $product['image']); ?>" alt="<?php echo esc_attr((string) ($product['title'] ?? '')); ?>" loading="lazy">
+												</div>
+											<?php else : ?>
+												<div class="aksrt-product-card__image aksrt-product-card__image--placeholder"><i class="fas fa-image"></i></div>
+											<?php endif; ?>
+											<div class="aksrt-product-card__body">
+												<h3 class="aksrt-product-card__title"><?php echo esc_html((string) ($product['title'] ?? '')); ?></h3>
+												<?php if (!empty($product['excerpt'])) : ?>
+													<p class="aksrt-product-card__excerpt"><?php echo esc_html(wp_trim_words((string) $product['excerpt'], 15)); ?></p>
+												<?php endif; ?>
+												<div class="aksrt-product-card__footer">
+													<span class="aksrt-product-card__price">¥<?php echo esc_html(number_format((float) ($product['price'] ?? 0), 2)); ?></span>
+													<?php if ($sales > 0) : ?>
+														<span class="aksrt-product-card__sales"><?php printf(esc_html__('已售 %d', 'aksrt'), $sales); ?></span>
+													<?php endif; ?>
+												</div>
+											</div>
+										</a>
+									</article>
+								<?php endforeach; ?>
+							</div>
+							<?php if ($product_max_pages > 1 && function_exists('aksrt_render_profile_pagination')) : ?>
+								<?php aksrt_render_profile_pagination($product_max_pages, $product_page, 'product_page'); ?>
+							<?php elseif ($product_max_pages > 1) : ?>
+								<?php
+								echo paginate_links([
+									'base'     => add_query_arg(['tab' => 'product', 'product_page' => '%#%'], $home_url),
+									'format'   => '',
+									'current'  => $product_page,
+									'total'    => $product_max_pages,
+									'add_args' => ['tab' => 'product'],
+								]);
+								?>
+							<?php endif; ?>
+						<?php else : ?>
+							<?php aksrt_render_profile_empty($svg_empty_post, __('暂无商品内容', 'aksrt')); ?>
+						<?php endif; ?>
+					</div>
+					<?php endif; ?>
+
+					<?php if (in_array('plate', $enabled_tabs, true)) : ?>
+					<div id="panel-plate" class="dashboard-panel<?php echo $active_tab === 'plate' ? ' is-active' : ''; ?>" role="tabpanel"<?php echo $active_tab !== 'plate' ? ' hidden' : ''; ?>>
+						<?php aksrt_render_profile_empty($svg_empty_post, __('暂无圈子内容', 'aksrt')); ?>
+					</div>
+					<?php endif; ?>

templates/parts/user-home/sidebar.php

@@ -69,13 +69,13 @@ extract($args, EXTR_SKIP); // phpcs:ignore WordPress.PHP.DontExtract.extract_ext
 							</a>
 						<?php endif; ?>
 						<?php if ($show_vip) : ?>
-							<a href="<?php echo esc_url(aksrt_get_user_center_url()); ?>" class="uc-sidebar__btn">
+							<a href="<?php echo esc_url(function_exists('aksrt_get_user_center_tab_url') ? aksrt_get_user_center_tab_url('credits') : aksrt_get_user_center_url('credits')); ?>" class="uc-sidebar__btn">
 								<i class="fas fa-crown" aria-hidden="true"></i>
 								<span><?php esc_html_e('VIP 会员', 'aksrt'); ?></span>
 							</a>
 						<?php endif; ?>
 						<?php if ($credits_enabled_side) : ?>
-							<a href="<?php echo esc_url(aksrt_get_user_center_url()); ?>" class="uc-sidebar__btn">
+							<a href="<?php echo esc_url(function_exists('aksrt_get_user_center_tab_url') ? aksrt_get_user_center_tab_url('credits') : aksrt_get_user_center_url('credits')); ?>" class="uc-sidebar__btn">
 								<i class="fas fa-coins" aria-hidden="true"></i>
 								<span><?php echo esc_html(AKSRT_Settings::get_currency_name()); ?></span>
 							</a>