From d49a918ba4f8b7c38ac6a88f6f660bfe70aafd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?=
 <tzxiaomo@outlook.com>
Date: Wed, 9 Sep 2026 16:48:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(preference):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E5=81=8F=E5=A5=BD=E8=AE=BE=E7=BD=AE=E5=BC=80=E5=85=B3=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=B8=8EUI=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 移除冗余的switch组件，统一使用内联分段器替代开关选择
2. 调整布尔设置项的UI布局，优化视觉展示
3. 简化值变更逻辑，移除站点默认判断逻辑
4. 更新重置弹窗文案与按钮颜色
---
 .../uh-settings-popup/uh-settings-popup.vue   | 53 ++++++++-------
 src/hooks/usePreferenceRows.ts                |  9 +--
 src/pages-blog/setting/setting.vue            | 66 ++++++++++---------
 3 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/src/components/uh-settings-popup/uh-settings-popup.vue b/src/components/uh-settings-popup/uh-settings-popup.vue
index 9f7a119..40e9da8 100644
--- a/src/components/uh-settings-popup/uh-settings-popup.vue
+++ b/src/components/uh-settings-popup/uh-settings-popup.vue
@@ -36,10 +36,6 @@
 	})
 
 	/* ---------------- 交互 ---------------- */
-	function handleSwitchChange(def : { path : string[] }, detail : { value ?: unknown }) {
-		handleBoolChange(def.path, detail.value === true)
-	}
-
 	function currentValueOf(path : string[]) : string | null {
 		return isFollowing(path) ? null : String(prefValueOf(path) ?? '')
 	}
@@ -148,30 +144,39 @@
 							</uh-section-title>
 							<view class="setting-sheet uh-global-card-glass overflow-hidden rounded-2xl">
 								<template v-for="(row, index) in featureRows" :key="row.key">
-									<!-- 布尔开关 -->
-									<view v-if="row.kind === 'bool'"
-										class="switch-row flex items-center justify-between px-4 py-4"
+									<!-- 布尔项:内联分段器(默认 / 开 / 关) -->
+									<view v-if="row.kind === 'bool'" class="box-border p-3"
 										:class="index < featureRows.length - 1 ? 'border-b border-black/5' : ''">
-										<view class="row-left flex flex-col gap-1">
-											<text
-												class="row-label text-[28rpx] text-gray-900 font-bold">{{ row.label }}</text>
+										<view class="flex items-center justify-between">
+											<text class="row-label text-sm text-gray-900 font-bold">{{ row.label }}</text>
 											<view class="flex items-center gap-2">
-												<text v-if="row.following"
-													class="row-sub text-2xs text-gray-400">跟随站点默认</text>
-												<template v-else>
-													<view
-														class="rounded-full bg-secondary px-2 py-0.5 text-[20rpx] text-[#4d7c0f] leading-none">
-														已自定义
-													</view>
-													<text class="revert-text text-2xs text-gray-400 underline"
-														@click.stop="handleRevert(row.path)">
-														恢复默认
-													</text>
-												</template>
+												<text v-if="row.following" class="row-sub text-2xs text-gray-400">默认</text>
+												<view v-else
+													class="rounded-full bg-secondary px-2 py-1 text-xs text-gray-900 leading-none">
+													已自定义
+												</view>
+											</view>
+										</view>
+										<view class="mt-3 flex flex-wrap gap-2">
+											<view
+												class="rounded-full px-3 py-1 text-xs uh-global-card-glass shadow-none border"
+												:class="row.following ? 'bg-secondary font-bold' : 'text-gray-500'"
+												@click="handleRevert(row.path)">
+												默认
+											</view>
+											<view
+												class="rounded-full px-3 py-1 text-xs uh-global-card-glass shadow-none border"
+												:class="!row.following && row.boolValue ? 'bg-secondary font-bold' : 'text-gray-500'"
+												@click="handleBoolChange(row.path, true)">
+												开
+											</view>
+											<view
+												class="rounded-full px-3 py-1 text-xs uh-global-card-glass shadow-none border"
+												:class="!row.following && !row.boolValue ? 'bg-secondary font-bold' : 'text-gray-500'"
+												@click="handleBoolChange(row.path, false)">
+												关
 											</view>
 										</view>
-										<wd-switch :model-value="row.boolValue"
-											@change="handleSwitchChange(row, $event)" />
 									</view>
 									<!-- 枚举项:内联分段器(与布局项一致) -->
 									<view v-else class="px-4 py-4"
diff --git a/src/hooks/usePreferenceRows.ts b/src/hooks/usePreferenceRows.ts
index e7d5fab..11860bf 100644
--- a/src/hooks/usePreferenceRows.ts
+++ b/src/hooks/usePreferenceRows.ts
@@ -147,16 +147,11 @@ export function usePreferenceRows() {
 
 	/** 开关类:选值等于站点默认则还原为跟随(只存差异) */
 	function handleBoolChange(path: string[], next: boolean): void {
-		if (next === siteDefaultOf(path)) {
-			settingStore.savePreference(buildPatch(path, null));
-		} else {
-			settingStore.savePreference(buildPatch(path, next));
-		}
+		settingStore.savePreference(buildPatch(path, next));
 	}
 
-	/** 枚举选值:null 或等于站点默认则还原为跟随,否则写入差异(内联分段器与弹层共用) */
 	function handleChoose(path: string[], value: string | null): void {
-		if (value === null || value === siteDefaultOf(path)) {
+		if (value === null) {
 			handleRevert(path);
 		} else {
 			settingStore.savePreference(buildPatch(path, value));
diff --git a/src/pages-blog/setting/setting.vue b/src/pages-blog/setting/setting.vue
index 733a3aa..12698a2 100644
--- a/src/pages-blog/setting/setting.vue
+++ b/src/pages-blog/setting/setting.vue
@@ -41,11 +41,6 @@
 	const activeTab = ref<'layout' | 'feature'>('layout')
 
 	/* ---------------- 交互 ---------------- */
-	/** 开关事件(模板透传 $event) */
-	function handleSwitchChange(def : PrefDef, detail : { value ?: unknown }) {
-		handleBoolChange(def.path, detail.value === true)
-	}
-
 	/* ---------------- 枚举底部弹层(uh-glass-popup + wd-picker-view) ---------------- */
 	const enumSheet = ref<{ show : boolean, def : PrefDef | null }>({ show: false, def: null })
 	/** 弹层内滚动中的临时选中值(单列;确认时才落库,取消不生效) */
@@ -100,11 +95,11 @@
 	function handleResetAll() {
 		uni.showModal({
 			title: '提示',
-			content: '确定将所有偏好恢复为站点默认吗？本地自定义的偏好将被清除，未配置站点默认的项将恢复为内置默认。',
+			content: '确定将所有偏好恢复为站点默认吗？',
 			showCancel: true,
 			cancelText: '取消',
 			confirmText: '确定',
-			confirmColor: '#03a9f4',
+			confirmColor: '#B9E424',
 			success: (res) => {
 				if (res.confirm) {
 					settingStore.resetPreferences()
@@ -125,8 +120,7 @@
 		<view class="box-border flex flex-col gap-y-6 p-3">
 			<!-- 顶部分段器:布局 / 功能 -->
 			<view class="uh-global-card-glass flex rounded-full p-1">
-				<view v-for="tab in SETTING_TABS" :key="tab.key"
-					class="flex-1 rounded-full py-1.5 text-center text-sm"
+				<view v-for="tab in SETTING_TABS" :key="tab.key" class="flex-1 rounded-full py-1.5 text-center text-sm"
 					:class="activeTab === tab.key ? 'bg-primary font-bold' : 'text-gray-500'"
 					@click="activeTab = tab.key">
 					{{ tab.label }}
@@ -172,27 +166,37 @@
 					</uh-section-title>
 					<view class="setting-sheet uh-global-card-glass overflow-hidden rounded-2xl">
 						<template v-for="(row, index) in featureRows" :key="row.key">
-							<!-- 布尔开关 -->
-							<view v-if="row.kind === 'bool'" class="switch-row flex items-center justify-between px-4 py-4"
-								:class="index < featureRows.length - 1 ? 'border-b border-black/5' : ''">
-								<view class="row-left flex flex-col gap-1">
-									<text class="row-label text-[28rpx] text-gray-900 font-bold">{{ row.label }}</text>
-									<view class="flex items-center gap-2">
-										<text v-if="row.following" class="row-sub text-2xs text-gray-400">跟随站点默认</text>
-										<template v-else>
-											<view
-												class="rounded-full bg-secondary px-2 py-0.5 text-[20rpx] text-[#4d7c0f] leading-none">
-												已自定义
-											</view>
-											<text class="revert-text text-2xs text-gray-400 underline"
-												@click.stop="handleRevert(row.path)">
-												恢复默认
-											</text>
-										</template>
-									</view>
-								</view>
-								<wd-switch :model-value="row.boolValue" @change="handleSwitchChange(row, $event)" />
-							</view>
+						 <!-- 布尔项:内联分段器(默认 / 开 / 关) -->
+						 <view v-if="row.kind === 'bool'" class="box-border p-3"
+						  :class="index < featureRows.length - 1 ? 'border-b border-black/5' : ''">
+						  <view class="flex items-center justify-between">
+						   <text class="row-label text-[28rpx] text-gray-900 font-bold">{{ row.label }}</text>
+						   <view class="flex items-center gap-2">
+						    <text v-if="row.following" class="row-sub text-2xs text-gray-400">默认</text>
+						    <view v-else
+						     class="rounded-full bg-secondary px-2 py-1 text-xs text-gray-900 leading-none">
+						     已自定义
+						    </view>
+						   </view>
+						  </view>
+						  <view class="mt-3 flex flex-wrap gap-2">
+						   <view class="rounded-full px-3 py-1 text-xs uh-global-card-glass shadow-none border"
+						    :class="row.following ? 'bg-secondary font-bold' : 'text-gray-500'"
+						    @click="handleRevert(row.path)">
+						    默认
+						   </view>
+						   <view class="rounded-full px-3 py-1 text-xs uh-global-card-glass shadow-none border"
+						    :class="!row.following && row.boolValue ? 'bg-secondary font-bold' : 'text-gray-500'"
+						    @click="handleBoolChange(row.path, true)">
+						    开
+						   </view>
+						   <view class="rounded-full px-3 py-1 text-xs uh-global-card-glass shadow-none border"
+						    :class="!row.following && !row.boolValue ? 'bg-secondary font-bold' : 'text-gray-500'"
+						    @click="handleBoolChange(row.path, false)">
+						    关
+						   </view>
+						  </view>
+						 </view>
 							<!-- 枚举选择 -->
 							<view v-else class="pick-row flex items-center justify-between px-4 py-4"
 								:class="index < featureRows.length - 1 ? 'border-b border-black/5' : ''"
@@ -255,4 +259,4 @@
 			</view>
 		</uh-glass-popup>
 	</view>
-</template>
+</template>
\ No newline at end of file