diff --git a/src/api/BaseApi.ts b/src/api/BaseApi.ts
index 83082dd..afab11b 100644
--- a/src/api/BaseApi.ts
+++ b/src/api/BaseApi.ts
@@ -125,7 +125,7 @@ class Base extends Abstract {
         const url = path + "/msgCenter/summary";
         return this.getRequest<{
             unreadCount: number;
-            todos: { appKey: string; count: number }[];
+            todos: { count: number }[];
             sysUnread?: number;
             bizUnread?: number;
             approvalUnread?: number;
diff --git a/src/api/SysSettingApi.ts b/src/api/SysSettingApi.ts
index 7b5c50e..55180e0 100644
--- a/src/api/SysSettingApi.ts
+++ b/src/api/SysSettingApi.ts
@@ -1,16 +1,9 @@
 import Abstract from "@/utils/axios/abstract";
-import { PageData, PageParams } from "@/types/Basics";
 
 const path = "/api";
 
-/** 系统设置-基础设置（机构树 / 壁纸 / Logo 管理视图） */
+/** 门户外观管理视图（壁纸 / Logo 池；S4.7 后由设置中心「门户外观」pane 调用，机构树随「系统设置-基础设置」一起移除） */
 class SysSettingApi extends Abstract {
-    /** 机构树（仅超管），已裁剪到学校层 */
-    getSchTree() {
-        const url = path + "/getSchTree";
-        return this.getRequest<any>({ url });
-    }
-
     /** 壁纸管理列表（系统 + 目标学校，不含个人壁纸） */
     getSchWallpaperManageList(schId?: number) {
         const url = path + "/getSchWallpaperManageList";
diff --git a/src/api/UsedAppApi.ts b/src/api/UsedAppApi.ts
new file mode 100644
index 0000000..308af3a
--- /dev/null
+++ b/src/api/UsedAppApi.ts
@@ -0,0 +1,33 @@
+import Abstract from "@/utils/axios/abstract";
+
+const path = "/api";
+
+/**
+ * 桌面/常用应用三级默认（used_app：BASE 平台 / SCHOOL 本校 / USER 个人）。
+ * 后端 UsedAppController + UsedAppServiceImpl.findById 已实现「用户 > 学校 > 系统」级联与覆盖式保存，
+ * 本封装只服务设置中心「桌面应用」pane（S6），不改后端接口签名。
+ */
+class UsedAppApi extends Abstract {
+    /**
+     * 取某角色生效的常用应用（BoaApp 详情，按 appIds 顺序）。
+     * @param roleType 角色（1 校管理员 / 2 教师 / 3 学生）
+     * @param schId    学校ID；0 时后端按登录人主学校→归属组推断
+     * @param isSch    学校级读取：true 且非超管时后端令 uid=schId，于是只回本校 SCHOOL 那一行；
+     *                 超管传 true 也会被后端强制回 false（走级联，实际取到 BASE 平台行）
+     */
+    getUsedApp(roleType: number, schId: number, isSch: boolean) {
+        const url = path + "/usedapp/getUsedApp";
+        return this.getRequest<any[]>({ url, params: { roleType, schId, isSch } });
+    }
+
+    /**
+     * 覆盖式保存某角色本级默认桌面（同 setId+type+roleType+schId 存在则更新）。
+     * 数量上限 ≤8 由前端控制（后端注释口径）；超管传任何 type 都会被后端强制为 BASE(0)。
+     */
+    saveUsedApp(params: { appIds: string; type: number; roleType: number; schId?: number }) {
+        const url = path + "/usedapp/saveUsedApp";
+        return this.postRequest({ url, data: params });
+    }
+}
+
+export default new UsedAppApi();
diff --git a/src/assets/styles/header.scss b/src/assets/styles/header.scss
index 62e1a98..17debcb 100644
--- a/src/assets/styles/header.scss
+++ b/src/assets/styles/header.scss
@@ -154,7 +154,9 @@
     .app-cmdk-layer.is-open & {
         opacity: 1;
         transform: none;
-        transition-delay: calc(0.14s + var(--i) * 0.035s), calc(0.14s + var(--i) * 0.035s), 0s;
+        /* --i 封顶 20：应用多时（100+）末尾条目延迟不再线性膨胀到数秒，滚动空白窗上限 ≈0.84s */
+        transition-delay: calc(0.14s + min(var(--i), 20) * 0.035s),
+            calc(0.14s + min(var(--i), 20) * 0.035s), 0s;
     }
     &.is-hl,
     &:hover {
diff --git a/src/assets/styles/utils/_utils.scss b/src/assets/styles/utils/_utils.scss
index b364dc3..3ec7ac8 100644
--- a/src/assets/styles/utils/_utils.scss
+++ b/src/assets/styles/utils/_utils.scss
@@ -152,6 +152,33 @@ div.dib {
     }
 }
 
+// 分段 Tab（设置中心「桌面应用」角色分段 / 系统设置「应用管理」角色分段共用，替代 iView Tabs 观感）
+.seg-tabs {
+    display: inline-flex;
+    background: #f0f2f6;
+    border-radius: 9px;
+    padding: 3px;
+    gap: 2px;
+    .sg {
+        padding: 6px 16px;
+        font-size: 13px;
+        border-radius: 7px;
+        color: #7a8088;
+        cursor: pointer;
+        transition: all 0.15s;
+        user-select: none;
+        &:hover {
+            color: #5979ea;
+        }
+        &.active {
+            background: #fff;
+            color: #5979ea;
+            font-weight: 600;
+            box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
+        }
+    }
+}
+
 // .chart-box {
 //     height: 50px;
 //     width: 100%;
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 6cdfb70..fb39cf2 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -170,7 +170,6 @@
     <!-- 审批直批弹窗（B3 §2）已抽共享组件（消息对接 2026-09-30），供 /msg 页复用；Header 内已无直批入口 -->
     <MsgApprovalModal ref="refMsgApproval" />
 
-    <StatsBarModal ref="refStatsBarModal" />
     <TeacherCopilotModal ref="refTeacherCopilotModal" />
 
     <!-- 搜索命令面板（2026-10-08 定稿 B 方案）：必须 Teleport 到 body ——
@@ -231,7 +230,6 @@ import { useDefaultStore } from "@/store";
 import { useRoute, useRouter } from "vue-router";
 import { requireImg } from "@/utils/hook/useImg";
 import ContextMenu from "@/components/ContextMenu.vue";
-import StatsBarModal from "@/components/StatsBarModal.vue";
 import TeacherCopilotModal from "@/components/TeacherCopilotModal.vue";
 import BaseApi from "@/api/BaseApi";
 import MsgApprovalModal from "@/components/MsgApprovalModal.vue";
@@ -257,7 +255,6 @@ const baseUrl = computed(() => $conf.fileHost);
  *  但摘要拉取与 WS 推送仍需保留 —— /msg 页左栏与 LeftMenu 角标与本store 同源 */
 
 const refSearchInput = ref<any>();
-const refStatsBarModal = ref<any>();
 const refTeacherCopilotModal = ref<any>();
 
 const uploadHeaders = { yschapirequest: 1, yschreferer: Utils.strToHexCharCode(window.location.href) };
@@ -336,13 +333,8 @@ async function connectMsgWs() {
     };
 }
 
-/** WS 帧按 appKey 匹配应用名（store 应用列表）；查无回退类型标签（缺失降级，不报错） */
+/** WS 通知标题用类型标签（appKey 属后端签名标识，帧消费已随 0e57022 口径移除） */
 function frameAppName(frame: any) {
-    const appKey = frame && frame.appKey;
-    if (appKey) {
-        const hit = store.getFlattenAppList.find((x: any) => x.appKey == appKey || x.appCode == appKey);
-        if (hit && hit.name) return hit.name;
-    }
     return msgTypeLabel(frame ? frame.msgType : null);
 }
 
@@ -414,6 +406,7 @@ onUnmounted(() => {
 // 不再 emit("searchChange") —— 背景应用网格保持原样（2026-10-08 用户修订 1）
 watch(searchAppText, () => {
     cmdkStagger.value = false; // 输入过滤时不重播逐条入场
+    cmdkIndex.value = 0; // 过滤使结果集变化，高亮回归首项（否则旧索引落空/错位，Enter 哑炮）
 });
 // ===== 搜索命令面板（2026-10-08 定稿 B 方案）=====
 const refCmdkList = ref<any>();
@@ -474,6 +467,9 @@ function pickApp(item: any) {
 
 function onCmdkKeydown(ev: KeyboardEvent) {
     if (!isSearching.value) return; // 面板未开：绝不拦截全局按键
+    // IME 组合态（拼音候选未上屏）不响应导航/确认：keydown 的 Enter/↑↓ 属输入法内部按键，
+    // 不拦截防误开应用、不 preventDefault 防干扰候选词选择（keyCode 229 为旧式组合态标记）
+    if (ev.isComposing || ev.keyCode === 229) return;
     if (ev.key === "Escape") {
         closeSearch();
         return;
@@ -542,11 +538,6 @@ function linkSidebarSetting() {
     router.push("/settings?pane=sidebar");
 }
 
-async function settingsStats() {
-    isUserCardShow.value = false;
-    refStatsBarModal.value.show();
-}
-
 async function settingsTeacherCopilot() {
     isUserCardShow.value = false;
     refTeacherCopilotModal.value.show();
diff --git a/src/components/StatsBarModal.vue b/src/components/StatsBarModal.vue
deleted file mode 100644
index a8efd22..0000000
--- a/src/components/StatsBarModal.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-    <Modal
-        v-model="isTableModalShow"
-        class-name="menuwapper-modal"
-        width="1160"
-        :mask="true"
-        title="统计模块设置"
-        :transfer="false"
-    >
-        <div class="fix mb-10">
-            <Button type="primary" size="small" class="fl ml-10 width-10" ghost @click="onEditFormShow()">
-                新建统计模块
-            </Button>
-        </div>
-        <Table
-            :columns="menuBarColumns"
-            :height="360"
-            :loading="tableLoading"
-            :data="tableList"
-            class="link-table"
-            no-data-text="暂无数据"
-        >
-            <template #icon="{ row }">
-                <img class="icon-box" v-if="!!row.icon" :src="$conf.serviceHost + row.icon" alt="" />
-            </template>
-            <template #isShow="{ row }">
-                <Switch :model-value="row.isShow" true-color="#5979ea" @on-change="onMenuBarShowChange(row.id)" />
-            </template>
-
-            <template #roleIds="{ row }">
-                <span>{{ row.roleIds.map((item: number) => RoleTypeDict.find(x => x.k == item)?.v).join(",") }}</span>
-            </template>
-            <!-- <template #orderNum="{ row }">
-                <InputNumber :model-value="row.orderNum" :min="1" />
-            </template> -->
-        </Table>
-        <template #footer>
-            <Button type="primary" ghost @click="isTableModalShow = false">关闭</Button>
-        </template>
-    </Modal>
-    <Modal
-        v-model="isEditModalShow"
-        scrollable
-        width="550"
-        :title="(!formData.id ? '添加' : '编辑') + '统计模块'"
-        :transfer="true"
-    >
-        <Form ref="refEditForm" class="mr-30" :model="formData" :rules="ruleValidate" :label-width="110">
-            <Form-Item label="权限角色：" class="fix" prop="roleIds">
-                <Checkbox
-                    class="fl"
-                    :indeterminate="indeterminate"
-                    :model-value="compCheckAll"
-                    @click.prevent="handleCheckAll"
-                >
-                    全部
-                </Checkbox>
-                <CheckboxGroup v-model="formData.roleIds">
-                    <Checkbox v-for="item in RoleTypeDict" :label="item.k">{{ item.v }}</Checkbox>
-                </CheckboxGroup>
-            </Form-Item>
-            <Form-Item label="名称：" prop="name">
-                <Input max="4" v-model="formData.name" maxlength="30" placeholder="请输入名称" />
-            </Form-Item>
-            <Form-Item label="网址：" prop="url">
-                <Input v-model="formData.url" placeholder="请输入链接" />
-            </Form-Item>
-            <Form-Item label="图标：" prop="icon">
-                <Upload
-                    :on-success="uploadIconSuccess"
-                    :show-upload-list="false"
-                    :action="$conf.serviceHost + '/api/iconUpload'"
-                    :format="['jpg', 'jpeg', 'png', 'gif']"
-                    accept="image/gif,image/jpeg,image/jpg,image/png"
-                    :with-credentials="true"
-                    :headers="uploadHeaders"
-                >
-                    <div v-if="!formData.icon" class="icon-upload-wrap">
-                        <SvgIcon name="upload-add" color="#646566" style="width: 20px; height: 20px" />
-                    </div>
-                    <div class="icon-preview-wrap" v-else>
-                        <SvgIcon
-                            @click.stop="formData.icon = null"
-                            class="cloase-btn"
-                            name="widget-close"
-                            size="18"
-                            color="#fff"
-                        />
-                        <img :src="$conf.serviceHost + formData.icon" alt="" />
-                    </div>
-                </Upload>
-            </Form-Item>
-
-            <Form-Item label="排序号：" prop="orderNum">
-                <InputNumber style="width: 120px" v-model="formData.orderNum" :min="1" placeholder="请输入排序号" />
-            </Form-Item>
-            <Form-Item label="打开方式：" prop="linkOpenType">
-                <RadioGroup v-model="formData.linkOpenType" type="button" button-style="solid">
-                    <Radio :label="item.k" v-for="item in linkOpenTypeDict">{{ item.v }}</Radio>
-                </RadioGroup>
-            </Form-Item>
-        </Form>
-        <template #footer>
-            <Button type="primary" :loading="editLoading" @click="onEditSave">保存</Button>
-            <Button @click="isEditModalShow = false">取消</Button>
-        </template>
-    </Modal>
-</template>
-
-<script lang="ts" setup>
-import StatsBarApi from "@/api/StatsBarApi";
-import { LinkOpenTypeDict, LinkOpenTypeEnum, RoleTypeEnum, RoleTypeDict } from "@/types";
-import Utils from "@/utils";
-import useCurrentInstance from "@/utils/hook/useCurrentInstance";
-import { Message } from "view-ui-plus";
-import { ref, reactive, computed } from "vue";
-import SvgIcon from "@/components/SvgIcon.vue";
-import MyConfirm from "@/components/MyConfirm";
-import { BaseDict } from "@/types/Basics";
-import { find } from "lodash";
-
-interface FormData {
-    id: string | null;
-    roleIds: number[];
-    name: string | null;
-    url: string | null;
-    linkOpenType: number;
-    icon: string | null;
-    orderNum: number | null;
-    isShow: boolean;
-    isEdit: boolean;
-}
-
-// 初始化 formData 的默认值
-const defaultFormData: FormData = {
-    id: null,
-    roleIds: [], // 添加 roleIds 属性
-    name: "",
-    url: "",
-    linkOpenType: 0,
-    icon: "",
-    orderNum: null,
-    isShow: true,
-    isEdit: true,
-};
-
-const { $conf } = useCurrentInstance();
-
-const uploadHeaders = { yschapirequest: 1, yschreferer: Utils.strToHexCharCode(window.location.href) };
-
-const refEditForm = ref<any>(null);
-
-const isTableModalShow = ref(false),
-    isEditModalShow = ref(false),
-    tableLoading = ref(false),
-    editLoading = ref(false),
-    tableList = ref<any[]>([]),
-    formData = reactive(defaultFormData);
-
-const ruleValidate = ref({
-    roleIds: { required: true, type: "array", message: "请选择权限角色", trigger: "change,submit" },
-    name: { required: true, message: "请输入名称", trigger: "blur" },
-    url: { required: true, message: "请输入网址", trigger: "blur" },
-    icon: { required: true, message: "请上传图标", trigger: "change,submit" },
-});
-
-const linkOpenTypeDict = computed(() => LinkOpenTypeDict.filter(x => x.k != LinkOpenTypeEnum.Modal));
-const compCheckAll = computed(() => formData.roleIds.length == RoleTypeDict.length && RoleTypeDict.length > 0);
-const indeterminate = computed(() => formData.roleIds.length > 0 && formData.roleIds.length < RoleTypeDict.length);
-
-const menuBarColumns = ref([
-    {
-        title: "名称",
-        key: "name",
-    },
-    {
-        title: "图标",
-        slot: "icon",
-    },
-    {
-        title: "角色",
-        width: 150,
-        slot: "roleIds",
-    },
-    {
-        title: "地址",
-        key: "url",
-        width: 150,
-        tooltip: true,
-    },
-    {
-        title: "打开方式",
-        key: "linkType",
-    },
-    {
-        title: "是否显示",
-        width: 100,
-        align: "center",
-        slot: "isShow",
-    },
-    {
-        title: "排序号",
-        key: "orderNum",
-        align: "center",
-    },
-    {
-        title: "操作",
-        width: 120,
-        align: "center",
-        render: (h: any, params: any) => {
-            const disabled = !params.row.isEdit,
-                id = params.row.id;
-
-            return [
-                Utils.operatingTextHandle(h, "编辑", "mr-2", () => onEditFormShow(id), disabled),
-                Utils.operatingTextHandle(h, "删除", "text-error", () => onDeleteMenu(id), disabled),
-            ];
-        },
-    },
-]);
-
-async function show() {
-    isTableModalShow.value = true;
-    await getMenuBarList();
-    console.log("show");
-}
-
-async function getMenuBarList() {
-    tableLoading.value = true;
-
-    const list = await StatsBarApi.getStatsBarSchList();
-    list.forEach(element => {
-        element.linkType = find(linkOpenTypeDict.value, { k: element.linkOpenType })?.v;
-    });
-    tableList.value = list;
-    tableLoading.value = false;
-}
-
-function handleCheckAll() {
-    formData.roleIds = !compCheckAll.value ? RoleTypeDict.map(item => item.k) : [];
-}
-function uploadIconSuccess(response: any, file: any, fileListt: any) {
-    if (response.code == 0) formData.icon = response.data.url;
-    else Message.error("上传错误！");
-    // console.log(response, file, fileListt);
-}
-
-async function onEditFormShow(id?: number) {
-    await refEditForm.value?.resetFields();
-    isEditModalShow.value = false;
-    if (!id) {
-        formData.id = null;
-        formData.linkOpenType = LinkOpenTypeEnum.Open;
-    } else {
-        let find = tableList.value.find(x => x.id == id);
-        Object.assign(formData, find);
-    }
-    isEditModalShow.value = true;
-}
-async function onDeleteMenu(id: number) {
-    await MyConfirm({
-        title: "删除",
-        msg: "确定删除该统计模块吗？",
-        info: "删除后无法恢复！",
-        async onOk() {
-            await StatsBarApi.deleteStatsBar(id);
-        },
-    });
-    await getMenuBarList();
-}
-
-async function onEditSave() {
-    let validate: boolean = await refEditForm.value?.validate();
-    if (!validate) return false;
-    editLoading.value = true;
-    try {
-        await StatsBarApi.saveStatsBar(formData);
-        Message.success("操作成功！");
-        await getMenuBarList();
-        isEditModalShow.value = false;
-    } catch (error) {
-        Message.success("操作失败！");
-    } finally {
-        editLoading.value = false;
-    }
-}
-function onMenuBarShowChange(id: number) {
-    StatsBarApi.toggleStatsBarShow(id);
-}
-
-defineExpose({
-    show,
-});
-</script>
-
-<style scoped>
-.icon-box {
-    width: 20px;
-    height: 20px;
-}
-</style>
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 9aa68bd..a219ae1 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -6,7 +6,7 @@
         <aside class="set-nav">
             <div class="nav-title">
                 <span>设置</span>
-                <span :class="['role-chip', { user: !isAdmin }]">{{ isAdmin ? "管理员" : "普通用户" }}</span>
+                <span :class="['role-chip', { user: !isAdmin, super: isSuper }]">{{ isSuper ? "超级管理员" : isAdmin ? "学校管理员" : "普通用户" }}</span>
             </div>
             <template v-for="g in navGroups" :key="g.title">
                 <div class="grp">{{ g.title }}</div>
@@ -18,7 +18,6 @@
                 >
                     <span class="ic" v-html="it.icon"></span>
                     <span>{{ it.name }}</span>
-                    <span v-if="it.key === 'backend'" class="ext">外部 ↗</span>
                 </div>
             </template>
         </aside>
@@ -42,10 +41,9 @@
             <div v-else-if="curPane === 'profile'" class="pane">
                 <div class="pane-head">
                     <h3>个人信息</h3>
-                    <p>查看与维护你的基础账号资料，姓名与工号由学校统一维护，如需变更请联系管理员。</p>
+                    <p>查看与维护你的基础账号资料，姓名与账号由管理员统一维护，如需变更请联系管理员。</p>
                 </div>
                 <div class="sec-card">
-                    <h4>基础资料</h4>
                     <div class="form-row">
                         <span class="lb">头像</span>
                         <div class="ctl">
@@ -57,14 +55,14 @@
                         <span class="lb">姓名</span>
                         <div class="ctl">
                             <input class="inp" :value="profileView.name" disabled />
-                            <span class="hint">由学校统一维护</span>
+                            <span class="hint">由管理员统一维护</span>
                         </div>
                     </div>
                     <div class="form-row">
-                        <span class="lb">工号</span>
+                        <span class="lb">账号</span>
                         <div class="ctl">
                             <input class="inp" :value="profileView.account" disabled />
-                            <span class="hint">由学校统一维护</span>
+                            <span class="hint">由管理员统一维护</span>
                         </div>
                     </div>
                     <div class="form-row">
@@ -125,109 +123,111 @@
                 </div>
             </div>
 
-            <!-- 头像设置 -->
+            <!-- 头像设置（S4 一层一角色：普通用户=我的，校管=本校默认，超管=平台默认；
+                 原「可选头像」预设网格已按方案 §6.S4.4 删除） -->
             <div v-else-if="curPane === 'avatar'" class="pane">
-                <div class="pane-head">
-                    <h3>头像设置</h3>
-                    <p>支持 JPG / PNG，建议 1:1 正方形，大小不超过 2MB。</p>
-                </div>
-                <div class="sec-card">
-                    <h4>当前头像</h4>
-                    <div class="avatar-pad">
-                        <div class="avatar-box">
-                            <UserAvatar :src="store.userInfo.profilePicture" :name="store.userInfo.name" :size="120" placement="light" />
-                            <div class="avatar-ops">
-                                <div class="avatar-btns">
-                                    <!-- 直传逻辑移植 UserInfoModal：action/headers/校验/成功回调照抄 -->
-                                    <Upload :on-success="uploadAvatarSuccess" :on-exceeded-size="onAvatarSizeExceeded"
-                                        :on-format-error="onAvatarFormatError" :show-upload-list="false"
-                                        :action="$conf.serviceHost + '/api/avatarUpload'"
-                                        accept=".jpg,.jpeg,.png,.gif,.webp" :format="['jpg', 'jpeg', 'png', 'gif', 'webp']"
-                                        :max-size="20480" :with-credentials="true" :headers="uploadHeaders">
-                                        <button class="btn primary sm">上传新头像</button>
-                                    </Upload>
-                                    <!-- 存储方案本轮不做（拍板），保持占位 -->
-                                    <button class="btn plain sm" disabled title="存储方案本轮不做">使用默认头像</button>
+                <template v-if="curLayer === 'my'">
+                    <div class="pane-head">
+                        <h3>头像设置<span class="scope">{{ LAYER_LABEL.my }}</span></h3>
+                        <p>上传你自己的头像；未上传时按下方「默认头像样式」兜底。支持 JPG / PNG / GIF / WebP。</p>
+                    </div>
+                    <div class="sec-card">
+                        <h4>当前头像</h4>
+                        <div class="avatar-pad">
+                            <div class="avatar-box">
+                                <UserAvatar :src="store.userInfo.profilePicture" :name="store.userInfo.name" :size="120" placement="light" />
+                                <div class="avatar-ops">
+                                    <div class="avatar-btns">
+                                        <!-- 直传逻辑移植 UserInfoModal：action/headers/校验/成功回调照抄 -->
+                                        <Upload :on-success="uploadAvatarSuccess" :on-exceeded-size="onAvatarSizeExceeded"
+                                            :on-format-error="onAvatarFormatError" :show-upload-list="false"
+                                            :action="$conf.serviceHost + '/api/avatarUpload'"
+                                            accept=".jpg,.jpeg,.png,.gif,.webp" :format="['jpg', 'jpeg', 'png', 'gif', 'webp']"
+                                            :max-size="20480" :with-credentials="true" :headers="uploadHeaders">
+                                            <button class="btn primary sm">上传新头像</button>
+                                        </Upload>
+                                        <!-- 存储方案本轮不做（拍板），保持占位 -->
+                                        <button class="btn plain sm" disabled title="存储方案本轮不做">使用默认头像</button>
+                                    </div>
+                                    <span class="tip">上传后立即生效，全站同步展示。支持 JPG / PNG / GIF / WebP，≤ 20MB。</span>
                                 </div>
-                                <span class="tip">上传后立即生效，全站同步展示。支持 JPG / PNG / GIF / WebP，≤ 20MB。</span>
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="sec-card">
-                    <h4>可选头像 <span class="tag">系统预设</span></h4>
-                    <div class="avatar-grid">
-                        <div
-                            v-for="(a, i) in avatarPresets"
-                            :key="i"
-                            :class="['avatar-item', { sel: avatarSel === i }]"
-                            :style="{ background: a }"
-                            @click="avatarSel = i"
-                        >
-                            {{ avatarLetters[i] }}<i class="tick">✓</i>
+                    <!-- 默认头像样式（默认头像轮 2026-09-30）：未上传头像时的兜底形态，链路与主题同构（我的 > 学校默认 > 平台默认 > 首字）。
+                         示例即 <UserAvatar> 实时渲染：首字示例带 name（样式生效即显字），剪影示例无 name（恒剪影）；
+                         :key=myAvatarTick 使 localStorage 直写后重挂组件、示例即时切换（resolveAvatarStyle 非响应式） -->
+                    <div class="sec-card">
+                        <h4>默认头像样式 <span class="tag">未上传头像时生效</span></h4>
+                        <div class="style-grid">
+                            <div
+                                :class="['style-opt', { sel: myAvatarEffective === 'text' }]"
+                                @click="pickMyAvatarStyle('text')"
+                            >
+                                <UserAvatar :key="myAvatarTick" :name="store.userInfo.name" :size="48" placement="light" />
+                                <span class="sn">首字</span>
+                                <i v-if="myAvatarEffective === 'text'" class="tick">✓</i>
+                            </div>
+                            <div
+                                :class="['style-opt', { sel: myAvatarEffective === 'silhouette' }]"
+                                @click="pickMyAvatarStyle('silhouette')"
+                            >
+                                <UserAvatar :key="myAvatarTick" :size="48" placement="light" />
+                                <span class="sn">剪影</span>
+                                <i v-if="myAvatarEffective === 'silhouette'" class="tick">✓</i>
+                            </div>
+                        </div>
+                        <div class="pane-foot style-foot">
+                            <span class="origin">当前来源：<b>{{ myAvatarOriginLabel }}</b></span>
+                            <button class="btn plain" :disabled="myAvatarOrigin !== 'mine'" @click="followSchoolAvatar">跟随学校默认</button>
                         </div>
                     </div>
-                </div>
-                <!-- 默认头像样式（默认头像轮 2026-09-30）：未上传头像时的兜底形态，链路与主题同构（用户键 > 学校键 > 系统默认）。
-                     示例即 <UserAvatar> 实时渲染：首字示例带 name（样式生效即显字），剪影示例无 name（恒剪影）；
-                     :key=myAvatarTick 使 localStorage 直写后重挂组件、示例即时切换（resolveAvatarStyle 非响应式） -->
-                <div class="sec-card">
-                    <h4>默认头像样式 <span class="tag">未上传头像时生效</span></h4>
-                    <div class="style-grid">
-                        <div
-                            :class="['style-opt', { sel: myAvatarEffective === 'text' }]"
-                            @click="pickMyAvatarStyle('text')"
-                        >
-                            <UserAvatar :key="myAvatarTick" :name="store.userInfo.name" :size="48" placement="light" />
-                            <span class="sn">首字</span>
-                            <i v-if="myAvatarEffective === 'text'" class="tick">✓</i>
+                </template>
+                <!-- 默认层（校管=本校行 / 超管=平台行 schId=0）：写落点由后端 resolveThemeSchId 按身份决定 -->
+                <template v-else>
+                    <div class="pane-head">
+                        <h3>头像设置<span class="scope">{{ LAYER_LABEL[curLayer] }}</span></h3>
+                        <p>设定{{ curLayer === 'platform' ? '全平台' : '本校' }}未自设头像的用户的默认头像样式，对上级未配置者生效；
+                            当前来源：<b>{{ layerAvatarFromLabel }}</b></p>
+                    </div>
+                    <div class="sec-card">
+                        <h4>{{ LAYER_LABEL[curLayer] }}头像样式 <span class="tag">未上传头像时生效</span></h4>
+                        <div class="style-grid">
+                            <div
+                                :class="['style-opt', { sel: layerAvatar === 'text' }]"
+                                @click="layerAvatar = 'text'"
+                            >
+                                <UserAvatar :key="myAvatarTick" :name="store.userInfo.name" :size="48" placement="light" />
+                                <span class="sn">首字</span>
+                                <i v-if="layerAvatar === 'text'" class="tick">✓</i>
+                            </div>
+                            <div
+                                :class="['style-opt', { sel: layerAvatar === 'silhouette' }]"
+                                @click="layerAvatar = 'silhouette'"
+                            >
+                                <UserAvatar :key="myAvatarTick" :size="48" placement="light" />
+                                <span class="sn">剪影</span>
+                                <i v-if="layerAvatar === 'silhouette'" class="tick">✓</i>
+                            </div>
                         </div>
-                        <div
-                            :class="['style-opt', { sel: myAvatarEffective === 'silhouette' }]"
-                            @click="pickMyAvatarStyle('silhouette')"
-                        >
-                            <UserAvatar :key="myAvatarTick" :size="48" placement="light" />
-                            <span class="sn">剪影</span>
-                            <i v-if="myAvatarEffective === 'silhouette'" class="tick">✓</i>
+                        <div class="pane-foot style-foot">
+                            <span class="origin">写入：<b>{{ curLayer === 'platform' ? '平台默认（sch_settings schId=0）' : '本校默认（sch_settings 当前校）' }}</b></span>
+                            <span class="btns">
+                                <button class="btn primary" :disabled="layerAvatarSaving" @click="onSaveLayerAvatar">{{ layerSaveLabel }}</button>
+                                <button class="btn plain" :disabled="layerAvatarSaving || !layerAvatarConfigured" @click="onClearLayerAvatar">{{ layerClearLabel }}</button>
+                            </span>
                         </div>
                     </div>
-                    <div class="pane-foot style-foot">
-                        <span class="origin">当前来源：<b>{{ myAvatarOriginLabel }}</b></span>
-                        <button class="btn plain" :disabled="myAvatarOrigin !== 'mine'" @click="followSchoolAvatar">跟随学校默认</button>
-                    </div>
-                </div>
-                <!-- 本校默认头像样式（仅管理员）：写入 sch_settings.avatar_style，契约复刻 schTheme 三接口 -->
-                <div v-if="isAdmin" class="sec-card">
-                    <h4>本校默认头像样式</h4>
-                    <div class="style-grid">
-                        <div
-                            :class="['style-opt', { sel: schAvatarCandidate === 'text' }]"
-                            @click="schAvatarCandidate = 'text'"
-                        >
-                            <span class="sn">首字</span>
-                        </div>
-                        <div
-                            :class="['style-opt', { sel: schAvatarCandidate === 'silhouette' }]"
-                            @click="schAvatarCandidate = 'silhouette'"
-                        >
-                            <span class="sn">剪影</span>
-                        </div>
-                    </div>
-                    <div class="pane-foot style-foot">
-                        <span class="origin">当前已配置：<b>{{ schAvatarConfigured ? AVATAR_STYLE_LABEL[schAvatarConfigured] : "未配置（系统默认：首字）" }}</b></span>
-                        <span class="btns">
-                            <button class="btn primary" :disabled="schAvatarSaving" @click="onSaveSchAvatar">保存为本校默认</button>
-                            <button class="btn plain" :disabled="schAvatarSaving || !schAvatarConfigured" @click="onClearSchAvatar">跟随系统默认（清空）</button>
-                        </span>
-                    </div>
-                </div>
+                </template>
             </div>
 
-            <!-- 我的主题（所有人；主题设置 2026-09-30） -->
-            <div v-else-if="curPane === 'mytheme'" class="pane">
+            <!-- 主题（S4 一层一角色：普通用户=我的（点选即生效），校管/超管=本级默认档（含侧栏样式，保存/清空）） -->
+            <div v-else-if="curPane === 'theme'" class="pane">
                 <div class="pane-head">
-                    <h3>我的主题</h3>
-                    <p>选择你的管理端主题档，各管理端（通知/用户中心等）同浏览器自动同步；当前来源：<b>{{ myOriginLabel }}</b>（{{ myEffective.theme }}）</p>
+                    <h3>主题<span class="scope">{{ LAYER_LABEL[curLayer] }}</span></h3>
+                    <p v-if="curLayer === 'my'">选择你的管理端主题档，各管理端（通知/用户中心等）同浏览器自动同步；当前来源：<b>{{ myOriginLabel }}</b>（{{ myEffective.theme }}）</p>
+                    <p v-else>设定{{ curLayer === 'platform' ? '全平台' : '本校' }}未自设主题的用户的默认主题档与侧栏样式；
+                        当前来源：<b>{{ layerFromLabel }}</b></p>
                 </div>
                 <div class="theme-pane">
                     <div class="theme-left">
@@ -235,161 +235,258 @@
                             <div
                                 v-for="t in THEME_OPTIONS"
                                 :key="t.key"
-                                :class="['theme-item', { sel: myEffective.theme === t.key, cand: myCandidate === t.key }]"
-                                @click="pickMyTheme(t.key)"
+                                :class="['theme-item', { sel: themePaneSel === t.key, cand: curLayer === 'my' && myCandidate === t.key }]"
+                                @click="pickThemePane(t.key)"
                             >
                                 <span class="swatch" :style="{ background: t.color }"></span>
                                 <span class="tn">{{ t.name }}</span>
-                                <i v-if="myEffective.theme === t.key" class="tick">✓</i>
+                                <i v-if="themePaneSel === t.key" class="tick">✓</i>
                             </div>
                         </div>
-                        <!-- 侧栏样式（默认头像轮 2026-09-30）：状态字段 theme.ts 早已有（sideFollow/sideDeep/gradOn），此处只补 UI；
-                             即时生效即入 localStorage（与 Notice 配色胶囊一致），无保存按钮；开关样式照搬 ThemeSwitcher .sw -->
+                        <!-- 侧栏样式（默认头像轮 2026-09-30 补 UI；S4.3 要求默认档也能改）：my 层即时生效入 localStorage，
+                             默认层随整份 ThemeState 存后端；开关样式照搬 ThemeSwitcher .sw -->
                         <div class="sec-card side-card">
                             <h4>侧栏样式</h4>
                             <label class="tp-row">
                                 <span>侧栏跟随顶栏色</span>
-                                <span class="sw"><input type="checkbox" v-model="sideFollow" @change="pickSide({ sideFollow })" /><i></i></span>
+                                <span class="sw"><input type="checkbox" :checked="themeSide.sideFollow" @change="pickSidePane('sideFollow', $event)" /><i></i></span>
                             </label>
                             <label class="tp-row">
                                 <span>侧栏深色（关＝浅色）</span>
-                                <span class="sw"><input type="checkbox" v-model="sideDeep" @change="pickSide({ sideDeep })" /><i></i></span>
+                                <span class="sw"><input type="checkbox" :checked="themeSide.sideDeep" @change="pickSidePane('sideDeep', $event)" /><i></i></span>
                             </label>
                             <label class="tp-row">
                                 <span>顶部过渡色（渐变）</span>
-                                <span class="sw"><input type="checkbox" v-model="gradOn" @change="pickSide({ gradOn })" /><i></i></span>
+                                <span class="sw"><input type="checkbox" :checked="themeSide.gradOn" @change="pickSidePane('gradOn', $event)" /><i></i></span>
                             </label>
+                            <p v-if="curLayer !== 'my'" class="hint">预览仅呈现主题档/侧栏深浅/渐变（YschTheme 通道只接受 ?yh-theme、?yh-side、?yh-grad）；「侧栏跟随顶栏色」保存后在实际管理端生效。</p>
                         </div>
                         <div class="pane-foot theme-foot">
-                            <!-- 删用户键后回落学校默认/系统默认（§3.3） -->
-                            <button class="btn plain" @click="followSchoolTheme" :disabled="myOrigin !== 'mine'">跟随学校默认</button>
+                            <!-- my：删用户自选键后回落学校默认/平台默认/系统默认（§3.3）；默认层：写本级 / 清空本级 -->
+                            <template v-if="curLayer === 'my'">
+                                <button class="btn plain" @click="followSchoolTheme" :disabled="myOrigin !== 'mine'">跟随学校默认</button>
+                            </template>
+                            <template v-else>
+                                <button class="btn primary" :disabled="layerSaving" @click="onSaveLayerTheme">{{ layerSaveLabel }}</button>
+                                <button class="btn plain" :disabled="layerSaving || !layerConfigured" @click="onClearLayerTheme">{{ layerClearLabel }}</button>
+                            </template>
                         </div>
                     </div>
                     <div class="theme-preview-box">
-                        <iframe :src="previewSrc(myCandidate)" class="theme-iframe" title="主题预览"></iframe>
+                        <iframe :src="themePreviewSrc" class="theme-iframe" title="主题预览"></iframe>
                     </div>
                 </div>
             </div>
 
-            <!-- 我的壁纸（所有人；2026-10-02 任务A：能力复制自 Header「设置壁纸」模态框——点选即保存+上传，
-                 模态框保留不动；管理员另有「外观→壁纸设置」管理 pane（上传入库/删除/应用），两者共用同一组接口） -->
-            <div v-else-if="curPane === 'mywallpaper'" class="pane">
-                <div class="pane-head">
-                    <h3>我的壁纸</h3>
-                    <p>选择桌面背景壁纸：系统与校区壁纸直接选用，也可上传个人壁纸；点击缩略图即保存生效。</p>
-                </div>
-                <div class="sec-card">
-                    <h4>系统壁纸 <span class="tag">平台内置</span></h4>
-                    <div class="wall-grid">
-                        <div v-if="myWallGroups.sys.length === 0" class="logo-empty">暂无壁纸</div>
-                        <div
-                            v-for="w in myWallGroups.sys"
-                            :key="w.id"
-                            :class="['wall-item', { sel: myWallSelected === w.url }]"
-                            :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
-                            @click="onPickMyWallpaper(w)"
-                        >
-                            <i class="tick">✓</i>
-                        </div>
+            <!-- 壁纸（S4 合并原「我的壁纸」+「壁纸设置」两处：一层一角色。
+                 my=点选即生效（能力仍与 Header「设置壁纸」模态框同源，模态框保留不动）；
+                 默认层=本级壁纸池（上传/删除）+ 上级只读参考池，无「应用壁纸」按钮（该语义属个人自选） -->
+            <div v-else-if="curPane === 'wallpaper'" class="pane">
+                <template v-if="curLayer === 'my'">
+                    <div class="pane-head">
+                        <h3>壁纸<span class="scope">{{ LAYER_LABEL.my }}</span></h3>
+                        <p>选择桌面背景壁纸：平台与校区壁纸直接选用，也可上传个人壁纸；点击缩略图即保存生效。</p>
                     </div>
-                </div>
-                <div class="sec-card">
-                    <h4>校区壁纸 <span class="tag">本校上传</span></h4>
-                    <div class="wall-grid">
-                        <div v-if="myWallGroups.sch.length === 0" class="logo-empty">暂无壁纸</div>
-                        <div
-                            v-for="w in myWallGroups.sch"
-                            :key="w.id"
-                            :class="['wall-item', { sel: myWallSelected === w.url }]"
-                            :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
-                            @click="onPickMyWallpaper(w)"
-                        >
-                            <i class="tick">✓</i>
-                        </div>
-                    </div>
-                </div>
-                <!-- 个人上传壁纸（type=2）：普通用户上传即入此组，可选用可删除；无个人壁纸时整卡不占位 -->
-                <div v-if="myWallGroups.mine.length > 0" class="sec-card">
-                    <h4>我的上传 <span class="tag">仅自己可见</span></h4>
-                    <div class="wall-grid">
-                        <div
-                            v-for="w in myWallGroups.mine"
-                            :key="w.id"
-                            :class="['wall-item', { sel: myWallSelected === w.url }]"
-                            :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
-                            @click="onPickMyWallpaper(w)"
-                        >
-                            <i v-if="w.isEdit" class="del" title="删除" @click.stop="onDeleteMyWallpaper(w)">×</i>
-                            <i class="tick">✓</i>
-                        </div>
-                    </div>
-                </div>
-                <div class="sec-card">
-                    <h4>上传壁纸</h4>
-                    <div class="form-row form-row--last form-row--top">
-                        <span class="lb">选择图片</span>
-                        <div class="ctl">
-                            <Upload :on-success="onMyWallpaperUploaded" :show-upload-list="false"
-                                :action="$conf.serviceHost + '/api/wallpaperUpload'"
-                                accept="image/jpeg, image/jpg, image/png" :with-credentials="true" :headers="uploadHeaders">
-                                <button class="btn ghost sm">选择文件</button>
-                            </Upload>
-                            <span class="hint">建议 1920×1080 以上，≤ 5MB；上传后进入「我的上传」可选</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- 本校默认（仅管理员；主题设置 2026-09-30） -->
-            <div v-else-if="curPane === 'schooltheme'" class="pane">
-                <div class="pane-head">
-                    <h3>本校默认</h3>
-                    <p>配置本校师生的推荐主题档（推荐非强制，用户自选优先）；
-                        当前已配置：<b>{{ schConfigured ? (THEME_OPTIONS.find(t => t.key === schConfigured)?.name || schConfigured) : "未配置（系统默认）" }}</b></p>
-                </div>
-                <div class="theme-pane">
-                    <div class="theme-left">
-                        <div class="theme-grid">
+                    <div class="sec-card">
+                        <h4>系统壁纸 <span class="tag">平台内置</span></h4>
+                        <div class="wall-grid">
+                            <div v-if="myWallGroups.sys.length === 0" class="logo-empty">暂无壁纸</div>
                             <div
-                                v-for="t in THEME_OPTIONS"
-                                :key="t.key"
-                                :class="['theme-item', { sel: schCandidate === t.key }]"
-                                @click="schCandidate = t.key"
+                                v-for="w in myWallGroups.sys"
+                                :key="w.id"
+                                :class="['wall-item', { sel: myWallSelected === w.url }]"
+                                :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
+                                @click="onPickMyWallpaper(w)"
                             >
-                                <span class="swatch" :style="{ background: t.color }"></span>
-                                <span class="tn">{{ t.name }}</span>
-                                <i v-if="schCandidate === t.key" class="tick">✓</i>
+                                <i class="tick">✓</i>
                             </div>
                         </div>
-                        <div class="pane-foot theme-foot">
-                            <button class="btn primary" :disabled="schSaving" @click="onSaveSchTheme">保存为本校默认</button>
-                            <button class="btn plain" :disabled="schSaving || !schConfigured" @click="onClearSchTheme">跟随系统默认（清空）</button>
+                    </div>
+                    <div class="sec-card">
+                        <h4>校区壁纸 <span class="tag">本校上传</span></h4>
+                        <div class="wall-grid">
+                            <div v-if="myWallGroups.sch.length === 0" class="logo-empty">暂无壁纸</div>
+                            <div
+                                v-for="w in myWallGroups.sch"
+                                :key="w.id"
+                                :class="['wall-item', { sel: myWallSelected === w.url }]"
+                                :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
+                                @click="onPickMyWallpaper(w)"
+                            >
+                                <i class="tick">✓</i>
+                            </div>
                         </div>
                     </div>
-                    <div class="theme-preview-box">
-                        <iframe :src="previewSrc(schCandidate)" class="theme-iframe" title="主题预览"></iframe>
+                    <!-- 个人上传壁纸（type=2）：普通用户上传即入此组，可选用可删除；无个人壁纸时整卡不占位 -->
+                    <div v-if="myWallGroups.mine.length > 0" class="sec-card">
+                        <h4>我的上传 <span class="tag">仅自己可见</span></h4>
+                        <div class="wall-grid">
+                            <div
+                                v-for="w in myWallGroups.mine"
+                                :key="w.id"
+                                :class="['wall-item', { sel: myWallSelected === w.url }]"
+                                :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
+                                @click="onPickMyWallpaper(w)"
+                            >
+                                <i v-if="w.isEdit" class="del" title="删除" @click.stop="onDeleteMyWallpaper(w)">×</i>
+                                <i class="tick">✓</i>
+                            </div>
+                        </div>
                     </div>
-                </div>
+                    <div class="sec-card">
+                        <h4>上传壁纸</h4>
+                        <div class="form-row form-row--last form-row--top">
+                            <span class="lb">选择图片</span>
+                            <div class="ctl">
+                                <Upload :on-success="onMyWallpaperUploaded" :show-upload-list="false"
+                                    :action="$conf.serviceHost + '/api/wallpaperUpload'"
+                                    accept="image/jpeg, image/jpg, image/png" :with-credentials="true" :headers="uploadHeaders">
+                                    <button class="btn ghost sm">选择文件</button>
+                                </Upload>
+                                <span class="hint">建议 1920×1080 以上，≤ 5MB；上传后进入「我的上传」可选</span>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+                <template v-else>
+                    <div class="pane-head">
+                        <h3>壁纸<span class="scope">{{ curLayer === 'platform' ? '系统壁纸池' : '校区壁纸池' }}</span></h3>
+                        <p>维护{{ curLayer === 'platform' ? '平台内置（schId=0）系统壁纸' : '本校可选壁纸' }}池：上传、删除，供师生在「壁纸」中选用。
+                            壁纸是每个用户的自选项，本层只提供可选项，不代替用户指定。</p>
+                    </div>
+                    <div class="sec-card">
+                        <h4>{{ curLayer === 'platform' ? '平台系统壁纸' : '本校校区壁纸' }} <span class="tag">本级可维护</span></h4>
+                        <div class="wall-grid">
+                            <div v-if="layerWallPool.length === 0" class="logo-empty">暂无壁纸，请先上传</div>
+                            <div
+                                v-for="w in layerWallPool"
+                                :key="w.id"
+                                class="wall-item"
+                                :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
+                            >
+                                <i class="del" title="删除" @click.stop="onDeleteWallpaper(w)">×</i>
+                            </div>
+                        </div>
+                        <div class="form-row form-row--last form-row--top">
+                            <span class="lb">上传壁纸</span>
+                            <div class="ctl">
+                                <Upload :on-success="onWallpaperUploaded" :show-upload-list="false" :action="wallpaperUploadAction"
+                                    accept="image/jpeg, image/jpg, image/png" :with-credentials="true" :headers="uploadHeaders">
+                                    <button class="btn ghost sm">选择文件</button>
+                                </Upload>
+                                <span class="hint">建议 1920×1080 以上，≤ 5MB；上传即入{{ curLayer === 'platform' ? "平台系统" : "本校" }}池</span>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- 上级只读参考池：校管视角下的平台系统壁纸（type=0，可选用不可删）；超管视角为空 -->
+                    <div v-if="upperWallPool.length > 0" class="sec-card">
+                        <h4>平台系统壁纸 <span class="tag">只读参考</span></h4>
+                        <div class="wall-grid">
+                            <div
+                                v-for="w in upperWallPool"
+                                :key="w.id"
+                                class="wall-item"
+                                :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
+                            ></div>
+                        </div>
+                    </div>
+                </template>
             </div>
 
-            <!-- LOGO 设置（管理员） -->
+            <!-- 桌面应用（S6 三级默认：my 层按方案 §9.2 只做「查看来源 + 恢复默认」，增删留给首页拖拽；
+                 默认层按角色写 used_app（校管=SCHOOL、超管=BASE/schId 0），级联与 copy-on-write 后端已就绪 -->
+            <div v-else-if="curPane === 'desktop'" class="pane">
+                <template v-if="curLayer === 'my'">
+                    <div class="pane-head">
+                        <h3>桌面应用<span class="scope">{{ LAYER_LABEL.my }}</span></h3>
+                        <p>首页「我的桌面」当前生效的应用；添加、移除与排序请在首页直接操作，此处只做来源查看与恢复默认。</p>
+                    </div>
+                    <div class="info-note">未自定义时继承上级默认；<b>一旦在首页增删即复制为独立副本</b>，之后学校/平台再改这份默认，不影响你已保存的桌面。</div>
+                    <div class="sec-card">
+                        <h4>我的桌面 <span class="tag">{{ myDeskList.length }}/8</span></h4>
+                        <div v-if="myDeskLoading" class="logo-empty">加载中…</div>
+                        <div v-else-if="myDeskList.length === 0" class="logo-empty">桌面暂无应用，请在首页添加</div>
+                        <div v-else class="app-grid readonly">
+                            <div v-for="(a, i) in myDeskList" :key="a.appId ?? i" class="app-tile on">
+                                <AppIcon v-if="deskVectorIcon(a)" :name="deskVectorIcon(a)" scene="tile" :tint="a.iconColor" />
+                                <img v-else class="ai-img" :src="Utils.appIconPath(a.icon)" :alt="a.name" />
+                                <span class="an">{{ a.name }}</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="pane-foot">
+                        <span :class="['src-badge', { copy: myDeskPersonal }]">当前来源：<b>{{ myDeskPersonal ? "我的桌面（独立副本）" : "继承本校/平台默认（未自定义）" }}</b></span>
+                        <button class="btn plain" :disabled="!myDeskPersonal" @click="onResetMyDesk">恢复默认</button>
+                    </div>
+                </template>
+                <template v-else>
+                    <div class="pane-head">
+                        <h3>桌面应用<span class="scope">{{ LAYER_LABEL[curLayer] }}</span></h3>
+                        <p>设定{{ curLayer === 'platform' ? '全平台' : '本校' }}未自定义桌面的用户进首页时看到的默认应用，按角色各存一份；本级未配置时此处为空，用户自行向上级回落。</p>
+                    </div>
+                    <div class="info-note">这是<b>最低优先级的兜底默认</b>：用户一旦在首页自定义桌面即复制独立副本，之后你改这份默认不影响已自定义的人。</div>
+                    <div class="seg-tabs">
+                        <div
+                            v-for="r in DESKTOP_ROLE_TYPES"
+                            :key="r.k"
+                            :class="['sg', { active: deskRoleType === r.k }]"
+                            @click="deskRoleType = r.k"
+                        >{{ r.v }}</div>
+                    </div>
+                    <div class="sec-card">
+                        <h4>{{ LAYER_LABEL[curLayer] }} · {{ DESKTOP_ROLE_TYPE_LABEL }}
+                            <span class="tag">{{ deskSelected.length }}/8</span>
+                        </h4>
+                        <div v-if="deskLoading" class="logo-empty">正在加载应用目录…</div>
+                        <div v-else-if="deskCatalog.length === 0" class="logo-empty">暂无可选应用</div>
+                        <div v-for="cat in deskCatalog" :key="cat.name" class="app-cat">
+                            <div class="app-cat-h" @click="toggleDeskCat(cat.name)">
+                                <span :class="['chev', { open: deskCatOpen[cat.name] !== false }]">▸</span>
+                                <span class="cn">{{ cat.name }}</span>
+                                <span :class="['cc', { has: deskCatCount(cat.apps) > 0 }]">已选 {{ deskCatCount(cat.apps) }}</span>
+                            </div>
+                            <div v-if="deskCatOpen[cat.name] !== false" class="app-grid">
+                                <div
+                                    v-for="a in cat.apps"
+                                    :key="a.id"
+                                    :class="['app-tile', { on: deskSelected.includes(a.id) }]"
+                                    @click="toggleDeskApp(a.id)"
+                                >
+                                    <i class="tick">✓</i>
+                                    <AppIcon v-if="deskVectorIcon(a)" :name="deskVectorIcon(a)" scene="tile" :tint="a.iconColor" />
+                                    <img v-else class="ai-img" :src="Utils.appIconPath(a.icon)" :alt="a.name" />
+                                    <span class="an">{{ a.name }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="pane-foot">
+                        <span class="hint">写入{{ curLayer === 'platform' ? "平台默认（schId=0）" : "本校默认" }} · {{ DESKTOP_ROLE_TYPE_LABEL }}</span>
+                        <button class="btn primary" :disabled="deskSaving" @click="onSaveDesk">保存默认</button>
+                        <button class="btn plain" :disabled="deskSaving || !deskHasValue" @click="onClearDesk">清空本级</button>
+                    </div>
+                </template>
+            </div>
+
+            <!-- LOGO 设置（S4 门户外观，仅管理员：校管=本校 LOGO 池，超管=平台 LOGO 池 schId=0） -->
             <div v-else-if="curPane === 'logo'" class="pane">
                 <div class="pane-head">
-                    <h3>LOGO 设置</h3>
-                    <p>设置顶部导航栏与登录页展示的站点 LOGO，全站生效。</p>
+                    <h3>LOGO 设置<span class="scope">{{ LAYER_LABEL[curLayer] }}</span></h3>
+                    <p>选择{{ curLayer === 'platform' ? '平台（schId=0）' : '本校' }}在顶部导航栏与登录页展示的站点 LOGO；
+                        上传、删除维护本级池，点选后保存为本级默认。</p>
                 </div>
                 <div class="sec-card">
-                    <h4>当前 LOGO</h4>
+                    <h4>{{ curLayer === 'platform' ? '平台 LOGO 池' : '本校 LOGO 池' }} <span class="tag">本级可维护</span></h4>
                     <div class="logo-grid">
-                        <div v-if="logoManageList.length === 0" class="logo-empty">暂无 LOGO，请先上传</div>
+                        <div v-if="layerLogoPool.length === 0" class="logo-empty">暂无 LOGO，请先上传</div>
                         <div
-                            v-for="l in logoManageList"
+                            v-for="l in layerLogoPool"
                             :key="l.id"
                             :class="['logo-item', { sel: logoSelUrl === l.url }]"
                             @click="logoSelUrl = l.url"
                         >
                             <img :src="l.url" alt="" />
-                            <i v-if="l.isEdit" class="del" title="删除" @click.stop="onDeleteLogo(l)">×</i>
+                            <i class="del" title="删除" @click.stop="onDeleteLogo(l)">×</i>
                         </div>
                     </div>
                     <div class="form-row form-row--last form-row--top">
@@ -404,46 +501,22 @@
                         </div>
                     </div>
                 </div>
-                <div class="pane-foot">
-                    <button class="btn primary" :disabled="logoSaving" @click="onSaveLogo">保存设置</button>
-                </div>
-            </div>
-
-            <!-- 壁纸设置（管理员） -->
-            <div v-else-if="curPane === 'wallpaper'" class="pane">
-                <div class="pane-head">
-                    <h3>壁纸设置</h3>
-                    <p>选择桌面背景壁纸，可上传自定义图片并删除历史壁纸。</p>
-                </div>
-                <div class="sec-card">
-                    <h4>系统壁纸</h4>
-                    <div class="wall-grid">
-                        <div v-if="wallpaperManageList.length === 0" class="logo-empty">暂无壁纸，请先上传</div>
+                <!-- 上级只读参考池：校管视角下的平台 LOGO（type=0，不可删，可直接选用为本级 LOGO）；超管视角为空 -->
+                <div v-if="upperLogoPool.length > 0" class="sec-card">
+                    <h4>平台 LOGO <span class="tag">只读参考</span></h4>
+                    <div class="logo-grid">
                         <div
-                            v-for="w in wallpaperManageList"
-                            :key="w.id"
-                            :class="['wall-item', { sel: wallSelUrl === w.url }]"
-                            :style="{ background: 'center / cover no-repeat url(' + w.url + ')' }"
-                            @click="wallSelUrl = w.url"
+                            v-for="l in upperLogoPool"
+                            :key="l.id"
+                            :class="['logo-item', { sel: logoSelUrl === l.url }]"
+                            @click="logoSelUrl = l.url"
                         >
-                            <i v-if="w.isEdit" class="del" title="删除" @click.stop="onDeleteWallpaper(w)">×</i>
-                            <i class="tick">✓</i>
-                        </div>
-                    </div>
-                    <div class="form-row form-row--last form-row--top">
-                        <span class="lb">上传壁纸</span>
-                        <div class="ctl">
-                            <Upload :on-success="onWallpaperUploaded" :show-upload-list="false" :action="wallpaperUploadAction"
-                                accept="image/jpeg, image/jpg, image/png" :with-credentials="true" :headers="uploadHeaders">
-                                <button class="btn ghost sm">选择文件</button>
-                            </Upload>
-                            <span class="hint">建议 1920×1080 以上，≤ 5MB</span>
+                            <img :src="l.url" alt="" />
                         </div>
                     </div>
                 </div>
                 <div class="pane-foot">
-                    <!-- 保存语义=设为我的壁纸（checkWallpaper，与 Header 壁纸弹窗一致） -->
-                    <button class="btn primary" :disabled="wallApplying" @click="onApplyWallpaper">应用壁纸</button>
+                    <button class="btn primary" :disabled="logoSaving" @click="onSaveLogo">{{ layerSaveLabel }}</button>
                 </div>
             </div>
 
@@ -473,43 +546,29 @@
                 </div>
             </div>
 
-            <!-- 统计设置（管理员） -->
+            <!-- 统计设置（管理员；2026-10-08 三轮自 Header StatsBarModal 迁入，接口/字段/校验/直传/确认删除语义照抄） -->
             <div v-else-if="curPane === 'statset'" class="pane">
                 <div class="pane-head">
                     <h3>统计设置</h3>
-                    <p>选择「统计」页面需要展示的图表与指标。</p>
+                    <p>配置「统计」页面展示的图表入口的名称、图标、可见角色与排序；保存后用户下次进入统计页生效。</p>
                 </div>
                 <div class="sec-card">
-                    <h4>展示指标</h4>
-                    <div class="check-list">
-                        <div
-                            v-for="(c, i) in statChecks"
-                            :key="i"
-                            :class="['check-item', { on: c.on }]"
-                            @click="c.on = !c.on"
-                        >
-                            <span class="bx">✓</span>{{ c.name }}
-                        </div>
+                    <h4>统计模块列表</h4>
+                    <div class="side-toolbar">
+                        <button class="btn primary sm" @click="onStatsEditShow()">新建统计模块</button>
                     </div>
-                </div>
-                <div class="pane-foot">
-                    <button class="btn primary">保存</button>
-                </div>
-            </div>
-
-            <!-- 后台管理（外跳说明页，管理员） -->
-            <div v-else-if="curPane === 'backend'" class="pane">
-                <div class="pane-head">
-                    <h3>后台管理</h3>
-                    <p>本项不属于设置中心内的页面，点击下方按钮在新标签页打开后台管理系统。</p>
-                </div>
-                <div class="info-bar">
-                    <span>↗</span>
-                    <span>跳转地址：<code>{{ $conf.baseHost }}/userbase/front/index.html</code>（<code>window.open</code> 新标签页）</span>
-                </div>
-                <div class="ph-box">后台管理系统由 userbase 独立承载，此处仅保留跳转入口</div>
-                <div class="pane-foot">
-                    <button class="btn primary" @click="openBackend">打开后台管理</button>
+                    <Table :columns="statsColumns" :loading="statsLoading" :data="statsList" no-data-text="暂无数据"
+                        class="sidebar-table">
+                        <template #icon="{ row }">
+                            <img class="sidebar-icon" v-if="!!row.icon" :src="$conf.serviceHost + row.icon" alt="" />
+                        </template>
+                        <template #roleIds="{ row }">
+                            <span>{{ row.roleIds.map((it: number) => RoleTypeDict.find(x => x.k == it)?.v).join(",") }}</span>
+                        </template>
+                        <template #isShow="{ row }">
+                            <Switch :model-value="row.isShow" true-color="#5979ea" @on-change="onStatsShowChange(row.id)" />
+                        </template>
+                    </Table>
                 </div>
             </div>
         </div>
@@ -579,6 +638,54 @@
             <Button @click="sidebarEditShow = false">取消</Button>
         </template>
     </Modal>
+
+    <!-- 统计模块新建/编辑（2026-10-08 三轮自 Header StatsBarModal 迁入：字段/校验/图标直传/保存语义照抄） -->
+    <Modal v-model="statsEditShow" scrollable width="550"
+        :title="(!statsForm.id ? '添加' : '编辑') + '统计模块'" :transfer="true">
+        <Form ref="refStatsForm" class="mr-30" :model="statsForm" :rules="statsRules" :label-width="110">
+            <Form-Item label="权限角色：" class="fix" prop="roleIds">
+                <Checkbox class="fl" :indeterminate="statsIndeterminate" :model-value="statsAllChecked"
+                    @click.prevent="onStatsCheckAll">
+                    全部
+                </Checkbox>
+                <CheckboxGroup v-model="statsForm.roleIds">
+                    <Checkbox v-for="item in RoleTypeDict" :key="item.k" :label="item.k">{{ item.v }}</Checkbox>
+                </CheckboxGroup>
+            </Form-Item>
+            <Form-Item label="名称：" prop="name">
+                <Input maxlength="30" v-model="statsForm.name" placeholder="请输入名称" />
+            </Form-Item>
+            <Form-Item label="网址：" prop="url">
+                <Input v-model="statsForm.url" placeholder="请输入链接" />
+            </Form-Item>
+            <Form-Item label="图标：" prop="icon">
+                <Upload :on-success="onStatsIconUploaded" :show-upload-list="false"
+                    :action="$conf.serviceHost + '/api/iconUpload'" :format="['jpg', 'jpeg', 'png', 'gif']"
+                    accept="image/gif,image/jpeg,image/jpg,image/png" :with-credentials="true" :headers="uploadHeaders">
+                    <div v-if="!statsForm.icon" class="sidebar-icon-upload">
+                        <SvgIcon name="upload-add" color="#646566" style="width: 20px; height: 20px" />
+                    </div>
+                    <div class="sidebar-icon-preview" v-else>
+                        <SvgIcon @click.stop="statsForm.icon = null" class="sidebar-icon-close" name="widget-close"
+                            size="18" color="#fff" />
+                        <img :src="$conf.serviceHost + statsForm.icon" alt="" />
+                    </div>
+                </Upload>
+            </Form-Item>
+            <Form-Item label="排序号：" prop="orderNum">
+                <InputNumber style="width: 120px" v-model="statsForm.orderNum" :min="1" placeholder="请输入排序号" />
+            </Form-Item>
+            <Form-Item label="打开方式：" prop="linkOpenType">
+                <RadioGroup v-model="statsForm.linkOpenType" type="button" button-style="solid">
+                    <Radio :label="item.k" v-for="item in linkOpenTypeDict" :key="item.k">{{ item.v }}</Radio>
+                </RadioGroup>
+            </Form-Item>
+        </Form>
+        <template #footer>
+            <Button type="primary" :loading="statsSaving" @click="onStatsSave">保存</Button>
+            <Button @click="statsEditShow = false">取消</Button>
+        </template>
+    </Modal>
 </template>
 
 <script lang="ts" setup>
@@ -591,8 +698,12 @@ import BaseApi from "@/api/BaseApi";
 import SysSettingApi from "@/api/SysSettingApi";
 import UserSettingApi from "@/api/UserSettingApi";
 import MenuBarApi from "@/api/MenuBarApi";
+import StatsBarApi from "@/api/StatsBarApi";
+import UsedAppApi from "@/api/UsedAppApi";
 import SvgIcon from "@/components/SvgIcon.vue";
 import UserAvatar from "@/components/UserAvatar.vue";
+import AppIcon from "@/components/AppIcon.vue";
+import { appiconKeyOf } from "@/constants/appIconRules";
 import MyConfirm from "@/components/MyConfirm";
 import { LinkOpenTypeDict, LinkOpenTypeEnum, RoleTypeDict } from "@/types";
 import Utils from "@/utils";
@@ -600,12 +711,14 @@ import { Message } from "view-ui-plus";
 
 /**
  * 设置中心（/settings）：左 216px 分组导航卡 + 右内容卡（B 方案左右双卡）。
- * 五个 pane 已对接真实数据（设置对接 2026-09-30，零新接口）：
+ * 三层生效模型（S4 一层一角色，2026-10-08）：个性化 pane（头像/主题/壁纸）按 curLayer() 只渲染当前身份那一层——
+ * 普通用户=我的（点选即生效，落 localStorage + 服务端双写）、学校管理员=本校默认、超级管理员=平台默认（schId=0），
+ * 默认层用「保存/清空本级」两键写入 sch_settings（写落点由后端 resolveThemeSchId 按登录身份决定，前端不传 schId）。
  * profile 读 store.userInfo（手机/邮箱本人可改：UpdateContact 直写 UserBase，2026-10-02 任务B）；
  * password 走 updatePassword + 确认登出流程（照抄 UserInfoModal）；
- * avatar 移植 UserInfoModal 直传上传（预设色块/「使用默认头像」保持占位）；
- * logo/wallpaper 管理列表 + 直传 + 删除照抄 SysSetting.vue，LOGO 保存走 saveSchLogo（schId 后端按登录人推断），
- * 「应用壁纸」采用 checkWallpaper 个人壁纸语义（与 Header 壁纸弹窗一致，执行报告已写明）。
+ * avatar 移植 UserInfoModal 直传上传（「使用默认头像」保持占位，存储方案本轮不做）；
+ * logo/wallpaper 池管理（列表 + 直传 + 删除）照抄 SysSetting.vue，LOGO 保存走 saveSchLogo（schId 后端按登录人推断）；
+ * 壁纸「点选即生效」的 checkWallpaper 个人语义只保留在 my 层，默认层只维护可选池（不再代用户指定）。
  */
 
 const route = useRoute();
@@ -614,20 +727,34 @@ const store = useDefaultStore();
 const { $conf } = useCurrentInstance();
 
 const isAdmin = computed(() => !!store.getIsAdmin);
+/** 超管判据与 SysSetting.vue 的 isSuperAdmin 同源（userInfo.type==1）；徽标三态用 */
+const isSuper = computed(() => store.userInfo?.type == 1);
 
-/** 普通用户不可用的管理 pane（导航隐藏；URL 直达渲染 noperm 黄条，不白屏不报错） */
-const ADMIN_PANES = ["logo", "wallpaper", "sidebar", "sys", "statset", "backend", "schooltheme"];
-const ALL_PANES = ["profile", "password", "avatar", "mytheme", "mywallpaper", "schooltheme", "logo", "wallpaper", "sidebar", "sys", "statset", "backend", "noperm"];
+/** 普通用户不可用的管理 pane（导航隐藏；URL 直达渲染 noperm 黄条，不白屏不报错）。
+ *  三层化（S4）后「头像/主题/壁纸」所有身份都可用——每角色只编辑自己那一层，不再是管理项 */
+const ADMIN_PANES = ["logo", "sidebar", "sys", "statset"];
+const ALL_PANES = ["profile", "password", "avatar", "theme", "wallpaper", "desktop", "logo", "sidebar", "sys", "statset", "noperm"];
+
+/** 历史 ?pane= 键兼容（S4 重命名：mytheme/schooltheme→theme、mywallpaper→wallpaper），保证旧链接不 404/不白屏 */
+const LEGACY_PANE_KEYS: Record<string, string> = {
+    mytheme: "theme",
+    schooltheme: "theme",
+    mywallpaper: "wallpaper",
+};
 
 const curPane = ref<string>("profile");
 
-// URL ?pane= 与当前 pane 双向同步：直达 / 刷新 / 前进后退均保持位置
+/** 当前编辑层（一层一角色）：超管=平台默认（后端 schId=0）、校管=本校默认、普通用户=我的 */
+const curLayer = computed<"my" | "school" | "platform">(() => (isSuper.value ? "platform" : isAdmin.value ? "school" : "my"));
+const LAYER_LABEL: Record<"my" | "school" | "platform", string> = { my: "我的", school: "本校默认", platform: "平台默认" };
+
+// URL ?pane= 与当前 pane 双向同步：直达 / 刷新 / 前进后退均保持位置；旧键先过 LEGACY_PANE_KEYS 归一
 watch(
     () => route.query.pane,
     pane => {
-        if (typeof pane === "string" && pane !== curPane.value) {
-            curPane.value = ALL_PANES.includes(pane) ? pane : "profile";
-        }
+        if (typeof pane !== "string") return;
+        const key = LEGACY_PANE_KEYS[pane] || pane;
+        if (key !== curPane.value) curPane.value = ALL_PANES.includes(key) ? key : "profile";
     },
     { immediate: true },
 );
@@ -647,49 +774,42 @@ interface NavItem {
     key: string;
     name: string;
     icon: string;
-    /** item 级仅管理员可见（主题设置 §3.3：schooltheme 双保险之一，另一道在 ADMIN_PANES） */
-    adminOnly?: boolean;
 }
 const svgWrap = (inner: string) =>
     `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round">${inner}</svg>`;
 const NAV_ACCOUNT: NavItem[] = [
     { key: "profile", name: "个人信息", icon: svgWrap('<circle cx="12" cy="8" r="4"/><path d="M4 20a8 8 0 0 1 16 0"/>') },
     { key: "password", name: "修改密码", icon: svgWrap('<rect x="4" y="10" width="16" height="10" rx="2"/><path d="M8 10V7a4 4 0 0 1 8 0v3"/>') },
+];
+/** 个性化（S4 三层化：一个 pane 内按 curLayer 只渲染自己那一层；桌面应用三级默认在 S6 补） */
+const NAV_PERSONAL: NavItem[] = [
     { key: "avatar", name: "头像设置", icon: svgWrap('<circle cx="12" cy="12" r="9"/><circle cx="12" cy="10" r="3"/><path d="M6.2 19a6.5 6.5 0 0 1 11.6 0"/>') },
+    { key: "theme", name: "主题", icon: svgWrap('<circle cx="12" cy="12" r="9"/><path d="M12 3a9 9 0 0 0 0 18c1.5 0 2-1 2-2s-1-1.5-1-2.5 1-2 2.5-2H19a2 2 0 0 0 2-2 9 9 0 0 0-9-9z"/><circle cx="7.5" cy="11" r="1"/><circle cx="12" cy="7.5" r="1"/><circle cx="16.5" cy="11" r="1"/>') },
+    { key: "wallpaper", name: "壁纸", icon: svgWrap('<path d="M5 3.5A9 9 0 1 0 20.5 12H5z"/><path d="M5 3.5V12h15.5"/>') },
+    { key: "desktop", name: "桌面应用", icon: svgWrap('<rect x="3" y="4" width="18" height="12" rx="2"/><path d="M8 20h8M12 16v4"/><rect x="6.5" y="7" width="4" height="4" rx="1"/><rect x="13.5" y="7" width="4" height="4" rx="1"/>') },
 ];
-const NAV_THEME: NavItem[] = [
-    { key: "mytheme", name: "我的主题", icon: svgWrap('<circle cx="12" cy="12" r="9"/><path d="M12 3a9 9 0 0 0 0 18c1.5 0 2-1 2-2s-1-1.5-1-2.5 1-2 2.5-2H19a2 2 0 0 0 2-2 9 9 0 0 0-9-9z"/><circle cx="7.5" cy="11" r="1"/><circle cx="12" cy="7.5" r="1"/><circle cx="16.5" cy="11" r="1"/>') },
-    // 我的壁纸（2026-10-02 任务A）：普通用户壁纸自选 pane，能力复制自 Header 设置壁纸模态框（模态框保留不动）
-    { key: "mywallpaper", name: "我的壁纸", icon: svgWrap('<path d="M5 3.5A9 9 0 1 0 20.5 12H5z"/><path d="M5 3.5V12h15.5"/>') },
-    { key: "schooltheme", name: "本校默认", icon: svgWrap('<path d="M4 21V8l8-5 8 5v13"/><path d="M4 21h16"/><path d="M12 11v4"/><circle cx="12" cy="9" r="2"/>'), adminOnly: true },
-];
-const NAV_APPEARANCE: NavItem[] = [
+const NAV_PORTAL: NavItem[] = [
     { key: "logo", name: "LOGO 设置", icon: svgWrap('<rect x="3" y="4" width="18" height="16" rx="2"/><circle cx="8.5" cy="9.5" r="1.5"/><path d="M21 15l-5-5L5 20"/>') },
-    { key: "wallpaper", name: "壁纸设置", icon: svgWrap('<path d="M5 3.5A9 9 0 1 0 20.5 12H5z"/><path d="M5 3.5V12h15.5"/>') },
     { key: "sidebar", name: "边栏设置", icon: svgWrap('<rect x="3" y="4" width="18" height="16" rx="2"/><path d="M9 4v16"/>') },
 ];
 const NAV_SYSTEM: NavItem[] = [
     { key: "sys", name: "系统设置", icon: svgWrap('<rect x="3" y="3" width="7" height="7" rx="1.5"/><rect x="14" y="3" width="7" height="7" rx="1.5"/><rect x="3" y="14" width="7" height="7" rx="1.5"/><rect x="14" y="14" width="7" height="7" rx="1.5"/>') },
     { key: "statset", name: "统计设置", icon: svgWrap('<path d="M18 20V10M12 20V4M6 20v-6"/>') },
-    { key: "backend", name: "后台管理", icon: svgWrap('<circle cx="12" cy="8" r="3.5"/><path d="M5 20a7 7 0 0 1 14 0"/><circle cx="18" cy="17" r="2.5"/>') },
 ];
 
-/** 分组导航：管理员全可见；普通用户只见「账号」「主题（仅我的主题）」——组级 + item 级（adminOnly）双层过滤 */
+/** 分组导航（S4 按原型重排：账号 / 个性化 / 门户外观(仅管理员) / 系统(仅管理员)）；组级过滤即可，
+ *  个性化 pane 内部按 curLayer 分层，不再需要 item 级 adminOnly */
 const navGroups = computed(() => {
     const groups = [
         { title: "账号", adminOnly: false, items: NAV_ACCOUNT },
-        { title: "主题", adminOnly: false, items: NAV_THEME },
-        { title: "外观", adminOnly: true, items: NAV_APPEARANCE },
+        { title: "个性化", adminOnly: false, items: NAV_PERSONAL },
+        { title: "门户外观", adminOnly: true, items: NAV_PORTAL },
         { title: "系统", adminOnly: true, items: NAV_SYSTEM },
     ];
-    const visible = isAdmin.value ? groups : groups.filter(g => !g.adminOnly);
-    return visible.map(g => ({
-        ...g,
-        items: isAdmin.value ? g.items : g.items.filter(it => !it.adminOnly),
-    }));
+    return isAdmin.value ? groups : groups.filter(g => !g.adminOnly);
 });
 
-/* ===== profile：读 store.userInfo（真实展示；手机/邮箱编辑值初始同源；工号暂以登录账号展示——接口未提供独立工号字段） ===== */
+/* ===== profile：读 store.userInfo（真实展示；手机/邮箱编辑值初始同源；「账号」行展示登录账号 account） ===== */
 /** 所属部门=组路径（BoaUser.groups 是「挂载组→…→根」近→远链）：取学校组(type=2)到链首的区段反向 join("/")，
  *  如「云海小学/校长室」；链上无学校组（区域/学段直属）时回退挂载组名；链空再回退 dept.name（dept 是 BoaGroup 对象，
  *  直接展示会成 [object Object]——本 helper 即该 bug 的修复口径，他处如需展示部门也复用此口径）。 */
@@ -815,7 +935,7 @@ function logout() {
     else window.location.href = url;
 }
 
-/* ===== avatar：移植 UserInfoModal 直传上传（预设色块/「使用默认头像」保持占位） ===== */
+/* ===== avatar：移植 UserInfoModal 直传上传（「使用默认头像」保持占位，存储方案本轮不做） ===== */
 // Upload 组件直传不经 axios 封装，需手动补网关校验头（照抄 UserInfoModal）
 const uploadHeaders = { yschapirequest: 1, yschreferer: Utils.strToHexCharCode(window.location.href) };
 function uploadAvatarSuccess(response: any) {
@@ -833,30 +953,16 @@ function onAvatarFormatError() {
     Message.error("仅支持 jpg/jpeg/png/gif/webp 格式图片！");
 }
 
-const avatarPresets = [
-    "linear-gradient(135deg,#5979ea,#7d9bf5)",
-    "linear-gradient(135deg,#45b972,#7bd39b)",
-    "linear-gradient(135deg,#e9b954,#f3d083)",
-    "linear-gradient(135deg,#e8684a,#f1957e)",
-    "linear-gradient(135deg,#8a7ce0,#b3a8f0)",
-];
-const avatarLetters = computed(() => {
-    const name = String(store.userInfo?.name || "A").trim();
-    return [name.charAt(0) || "A", "A", "B", "C", "D"];
-});
-const avatarSel = ref(0);
-
 /* ===== logo / wallpaper：管理列表 + 直传 + 删除（照抄 SysSetting.vue 管理语义） ===== */
 const logoManageList = ref<any[]>([]);
 const wallpaperManageList = ref<any[]>([]);
 const logoSelUrl = ref<string>("");
-const wallSelUrl = ref<string>("");
-/** 直传端点（本 pane 无机构树，超管按机构切换请用「系统设置」pane；不带 schId 即落到登录人归属校） */
+/** 直传端点：不带 schId 即按登录人落层——校管→本校池(type=1)、超管→平台系统池(type=0, schId 强制 0)。
+ *  逐校上传不在本轮（§3 决策 4：超管只管平台层，不给机构选择器）。 */
 const logoUploadAction = $conf.serviceHost + "/api/logoUpload";
 const wallpaperUploadAction = $conf.serviceHost + "/api/wallpaperUpload";
 
 async function loadManageLists() {
-    // 本 pane 无机构树：不带 schId，列表按登录人归属校返回（超管按机构切换请用「系统设置」pane）
     const [walls, logos] = await Promise.all([
         SysSettingApi.getSchWallpaperManageList(),
         SysSettingApi.getSchLogoManageList(),
@@ -865,6 +971,13 @@ async function loadManageLists() {
     logoManageList.value = logos || [];
 }
 
+/** 本级可编辑池（后端 isEdit 标记：校管=本校 type1，超管=平台 type0） */
+const layerWallPool = computed(() => wallpaperManageList.value.filter(x => x.isEdit));
+/** 上级只读参考池：校管视角下的平台系统壁纸（type0，可选用不可删）；超管视角为空 */
+const upperWallPool = computed(() => wallpaperManageList.value.filter(x => !x.isEdit && x.type === 0));
+const layerLogoPool = computed(() => logoManageList.value.filter(x => x.isEdit));
+const upperLogoPool = computed(() => logoManageList.value.filter(x => !x.isEdit && x.type === 0));
+
 function onLogoUploaded() {
     loadManageLists();
 }
@@ -882,7 +995,7 @@ async function onDeleteWallpaper(item: any) {
     loadManageLists();
 }
 
-/** LOGO 保存：选中项写入学校级配置（schId 后端按登录人推断：主学校→归属组→0 平台默认） */
+/** LOGO 保存：选中项写入本级配置（schId 后端按登录人推断：主学校→归属组→0 平台默认） */
 const logoSaving = ref(false);
 async function onSaveLogo() {
     if (!logoSelUrl.value) {
@@ -901,31 +1014,7 @@ async function onSaveLogo() {
     }
 }
 
-/** 应用壁纸：采用 checkWallpaper 个人壁纸语义（与 Header 壁纸弹窗现状一致，见执行报告） */
-const wallApplying = ref(false);
-async function onApplyWallpaper() {
-    if (!wallSelUrl.value) {
-        Message.warning("请先选择一张壁纸");
-        return;
-    }
-    if (wallApplying.value) return;
-    wallApplying.value = true;
-    try {
-        await UserSettingApi.checkWallpaper(store.getCurSchId, wallSelUrl.value);
-        const userSetting = store.curUserSettingInfo;
-        if (!!userSetting) {
-            userSetting.wallpaperUrl = wallSelUrl.value;
-            store.setCurUserSettingsInfo(userSetting);
-        }
-        Message.success("壁纸已应用");
-    } catch (error) {
-        Message.error("操作失败:" + error);
-    } finally {
-        wallApplying.value = false;
-    }
-}
-
-/* ===== mywallpaper：个人壁纸 pane（2026-10-02 任务A）=====
+/* ===== wallpaper pane · my 层（个人壁纸，2026-10-02 任务A；S4 三层化后仅 curLayer==='my' 渲染）=====
  * 能力复制自 Header「设置壁纸」模态框（模态框保留不动）：列表 getUserWallpaperList（type 0=系统/1=校区/2=个人）、
  * 点选即保存 checkWallpaper（与模态框 onClickWallpaper 同语义）、上传走 /api/wallpaperUpload（普通用户落 type=2 个人壁纸）、
  * 自己上传的可删（deleteWallById，isEdit 标记与模态框一致）；选中态回显 store 用户设置 wallpaperUrl。 */
@@ -981,42 +1070,222 @@ function onMyWallpaperUploaded() {
     loadMyWallpaperList();
 }
 
-// 打开我的壁纸 pane 时拉一次可选列表（所有人）
+// 壁纸 / LOGO pane 懒加载（S4.5 三层合并）：管理员=本级管理池（getSchWallpaperManageList 按登录人落本校/平台），
+// 普通用户=自选列表（getUserWallpaperList，type 0/1/2 三组）
 watch(curPane, pane => {
-    if (pane === "mywallpaper") loadMyWallpaperList();
-});
-
-// 首次切到 logo / wallpaper pane 时懒加载管理列表
-watch(curPane, pane => {
-    if ((pane === "logo" || pane === "wallpaper") && isAdmin.value && logoManageList.value.length === 0 && wallpaperManageList.value.length === 0) {
-        loadManageLists();
+    if (pane === "wallpaper") {
+        if (isAdmin.value) {
+            if (wallpaperManageList.value.length === 0) loadManageLists();
+        } else {
+            loadMyWallpaperList();
+        }
     }
+    if (pane === "logo" && isAdmin.value && logoManageList.value.length === 0) loadManageLists();
+}, { immediate: true });
+
+/* ===== desktop：桌面应用三级默认（S6，后端 used_app 级联 + copy-on-write 已就绪，此处只补 UI）=====
+ * my 层按方案 §9.2 默认只做「查看来源 + 恢复默认」，增删留给首页拖拽，避免两套写入口径不一致；
+ * 默认层（校管=used_app SCHOOL、超管=BASE）按角色各存一份 appIds。
+ * k 值 = UserBase SysRoleEnum 权威值域（1老师/2校领导/3学生，与 RoleTypeDict 一致），首页回落按 roleId 等值匹配。 */
+const DESKTOP_ROLE_TYPES = [
+    { k: 1, v: "教师" },
+    { k: 2, v: "校领导" },
+    { k: 3, v: "学生" },
+];
+/** 上限：后端 saveUsedApp 注释「≤8 由前端控制」，与首页桌面格子数一致 */
+const DESKTOP_MAX = 8;
+
+/** 矢量图标判定：与首页桌面 / AppList 同口径（iconKey 命中→矢量，有位图 URL→位图，否则关键词兜底） */
+function deskVectorIcon(app: any): string {
+    if (app?.iconKey) return app.iconKey;
+    if (app?.icon) return "";
+    return appiconKeyOf(app?.name || "");
+}
+
+/** 已知限制（方案 §9.3）：后端没有「按 roleType / 指定学校」取应用目录的接口——GetUserApp 只按登录人权限过滤
+ *  （userId/schId 入参未参与），故本级可选目录 = 当前管理员可见应用集；若某角色有管理员看不到的应用，此处选不到。
+ *  连带影响：getUsedApp 也只回可见应用的详情，本级保存是覆盖式 appIds——管理员不可见的已配项会在保存时被丢掉，
+ *  前端无从校验。要根治需后端补「按角色取目录 + 回传原始 appIds」接口，本轮按方案边界不改签名。 */
+const deskCatalog = ref<any[]>([]);
+const deskLoading = ref(false);
+/** 本级角色分段（1 校管理员 / 2 教师 / 3 学生），与 used_app.roleType 同口径 */
+const deskRoleType = ref<number>(1);
+const DESKTOP_ROLE_TYPE_LABEL = computed(
+    () => DESKTOP_ROLE_TYPES.find(x => x.k === deskRoleType.value)?.v || "",
+);
+/** 本级默认草稿（appId 顺序即首页展示顺序） */
+const deskSelected = ref<number[]>([]);
+const deskHasValue = ref(false);
+const deskSaving = ref(false);
+/** 分组折叠状态（默认展开，点标题切换） */
+const deskCatOpen = reactive<Record<string, boolean>>({});
+
+async function loadDeskCatalog() {
+    if (deskCatalog.value.length > 0) return;
+    deskLoading.value = true;
+    try {
+        const list = (await BaseApi.getUserApp(store.getCurUserId, store.getCurSchId)) || [];
+        deskCatalog.value = list.filter((g: any) => (g.apps || []).length > 0);
+        deskCatalog.value.forEach((g: any) => {
+            if (deskCatOpen[g.name] === undefined) deskCatOpen[g.name] = true;
+        });
+    } catch (e) {
+        deskCatalog.value = [];
+    } finally {
+        deskLoading.value = false;
+    }
+}
+
+/** 读本级已配的默认桌面：校管 isSch=true → 后端只回本校 SCHOOL 行；超管被服务端强制 isSch=false，
+ *  取的是 findById 级联结果（用户>学校>系统），一般即 BASE 平台行。
+ *  已知口径限制（不改后端签名）：若该超管自己存过同 roleType 的 USER 级常用应用，级联会优先回他的个人行，
+ *  此时本级读到/保存的不是同一份——个人常用应用在 Header「常用应用」弹窗里维护，与平台默认桌面互不影响。 */
+async function loadDeskDefault() {
+    await loadDeskCatalog();
+    try {
+        const list = (await UsedAppApi.getUsedApp(deskRoleType.value, store.getCurSchId, !isSuper.value)) || [];
+        deskSelected.value = list.map((x: any) => x.id);
+        deskHasValue.value = deskSelected.value.length > 0;
+    } catch (e) {
+        deskSelected.value = [];
+        deskHasValue.value = false;
+    }
+}
+
+function toggleDeskCat(name: string) {
+    deskCatOpen[name] = deskCatOpen[name] === false;
+}
+
+function toggleDeskApp(id: number) {
+    const i = deskSelected.value.indexOf(id);
+    if (i >= 0) {
+        deskSelected.value.splice(i, 1);
+        return;
+    }
+    if (deskSelected.value.length >= DESKTOP_MAX) {
+        Message.warning(`最多选择 ${DESKTOP_MAX} 个应用`);
+        return;
+    }
+    deskSelected.value.push(id);
+}
+
+/** 覆盖式保存本级默认（超管 type 传 0，后端也会强制为 BASE；schId 本级口径见 UsedAppApi 注释） */
+async function onSaveDesk() {
+    if (deskSaving.value) return;
+    deskSaving.value = true;
+    try {
+        await UsedAppApi.saveUsedApp({
+            appIds: deskSelected.value.join(","),
+            type: isSuper.value ? 0 : 1,
+            roleType: deskRoleType.value,
+            schId: isSuper.value ? 0 : store.getCurSchId,
+        });
+        Message.success(
+            `${LAYER_LABEL[curLayer.value]}桌面（${DESKTOP_ROLE_TYPE_LABEL.value}）已保存`,
+        );
+        await loadDeskDefault();
+    } catch (error) {
+        Message.error("保存失败:" + error);
+    } finally {
+        deskSaving.value = false;
+    }
+}
+
+/** 清空本级默认（写回空 appIds，该角色未自定义桌面的用户回落到上一级/首页空桌面） */
+async function onClearDesk() {
+    if (deskSaving.value) return;
+    await MyConfirm({
+        title: "清空本级默认桌面",
+        msg: `确定清空${LAYER_LABEL[curLayer.value]}（${DESKTOP_ROLE_TYPE_LABEL.value}）的默认桌面吗？`,
+        info: "清空后该角色未自定义桌面的用户，首页桌面将回落到上一级默认。",
+        async onOk() {
+            deskSaving.value = true;
+            try {
+                await UsedAppApi.saveUsedApp({
+                    appIds: "",
+                    type: isSuper.value ? 0 : 1,
+                    roleType: deskRoleType.value,
+                    schId: isSuper.value ? 0 : store.getCurSchId,
+                });
+                Message.success("已清空本级配置");
+                await loadDeskDefault();
+            } catch (error) {
+                Message.error("操作失败:" + error);
+            } finally {
+                deskSaving.value = false;
+            }
+        },
+    });
+}
+
+const deskCatCount = (apps: any[]) => apps.filter(a => deskSelected.value.includes(a.id)).length;
+
+/* ---- desktop · my 层：查看来源 + 恢复默认 ---- */
+/** 首页「我的桌面」同源接口：用户无个人副本时后端回落到 used_app 级联，回传的 id 为空 → 据此区分来源 */
+const myDeskList = ref<any[]>([]);
+const myDeskLoading = ref(false);
+const myDeskPersonal = computed(() => myDeskList.value.some(x => x.id != null));
+async function loadMyDesk() {
+    myDeskLoading.value = true;
+    try {
+        myDeskList.value = (await UserSettingApi.getUserDesktopAppList()) || [];
+    } catch (e) {
+        myDeskList.value = [];
+    } finally {
+        myDeskLoading.value = false;
+    }
+}
+/** 恢复默认 = 删掉全部个人副本行，让 getUserDesktopAppList 重新走 used_app 级联（后端无批量清接口，逐行删） */
+async function onResetMyDesk() {
+    await MyConfirm({
+        title: "恢复默认桌面",
+        msg: "确定放弃我的桌面、恢复为学校/平台默认吗？",
+        info: "恢复后首页桌面按上级默认展示；再次在首页增删会重新生成独立副本。",
+        async onOk() {
+            const rows = myDeskList.value.filter(x => x.id != null);
+            for (const row of rows) {
+                await UserSettingApi.deleteUserDesktopAppById(row.id, row.appId);
+            }
+            Message.success("已恢复默认桌面");
+            await loadMyDesk();
+        },
+    });
+}
+
+watch(curPane, pane => {
+    if (pane !== "desktop") return;
+    if (isAdmin.value) loadDeskDefault();
+    else loadMyDesk();
+}, { immediate: true });
+watch(deskRoleType, () => {
+    if (curPane.value === "desktop" && isAdmin.value) loadDeskDefault();
 });
 
-// ===== 主题（主题设置 2026-09-30：mytheme 所有人 / schooltheme 仅管理员）=====
+// ===== 主题（S4 三层化：单 pane 按 curLayer 渲染 my / 本校默认 / 平台默认）=====
 import {
     THEME_STORAGE_KEY,
     SCHOOL_DEFAULT_STORAGE_KEY,
-    DEFAULT_THEME_STATE,
     resolveEffectiveThemeState,
     saveThemeState,
 } from "@/utils/theme";
 import type { ThemeState } from "@/utils/theme";
 
-/** 档位清单本轮硬编码在 UserHome（YschTheme《阶段性方案》§4：痛感已从 ×N 降到 ×1）；主色取自通道 tokens 当前值 */
+/** 档位清单本轮硬编码在 UserHome（YschTheme《阶段性方案》§4：痛感已从 ×N 降到 ×1）；名与主色对齐通道 ThemeSwitcher.vue 的 THEME_META */
 const THEME_OPTIONS = [
-    { key: "blue", name: "蔚蓝", color: "#577afb" },
-    { key: "ocean", name: "海洋", color: "#2f7ce0" },
-    { key: "ink", name: "墨青", color: "#3d4d63" },
-    { key: "violet", name: "紫韵", color: "#6d5ae0" },
-    { key: "teal", name: "青碧", color: "#0d9488" },
+    { key: "blue", name: "原版靛蓝", color: "#577afb" },
+    { key: "ocean", name: "云海蓝", color: "#2f7ce0" },
+    { key: "ink", name: "石墨墨", color: "#3d4d63" },
+    { key: "violet", name: "靛紫", color: "#6d5ae0" },
+    { key: "teal", name: "松石绿", color: "#0d9488" },
 ];
 
 /** 预览 iframe src：候选档经 URL 覆盖参数拼进 #/theme-preview（§3.2/§3.4，切候选即换 src 重载）。
-    侧栏三开关直写 localStorage 非响应式，靠 void myTick.value 让 src 对主题态变化保持响应（否则改开关预览不重载） */
-function previewSrc(candidate: string) {
+ *  侧栏三开关直写 localStorage 非响应式，靠 void myTick.value 让 src 对主题态变化保持响应（否则改开关预览不重载）。
+ *  draft：默认层（本校/平台）预览用草稿值而非本机生效值；通道只认 yh-theme/yh-side/yh-grad 三个覆盖参，
+ *  sideFollow 无法经 URL 预览（theme.ts 是通道生成物，不新增参数）。 */
+function previewSrc(candidate: string, draft?: ThemeState) {
     void myTick.value;
-    const cur = resolveEffectiveThemeState();
+    const cur = draft ?? resolveEffectiveThemeState();
     const q = new URLSearchParams();
     q.set("yh-theme", candidate);
     q.set("yh-side", cur.sideDeep ? "deep" : "light");
@@ -1081,59 +1350,70 @@ function followSchoolTheme() {
     myTick.value += 1;
 }
 
-// ---- 本校默认（仅管理员）----
-const schCandidate = ref<string>(resolveEffectiveThemeState().theme);
-const schConfigured = ref<string | null>(null); // 已配置的学校档（theme 名）
-const schTick = ref(0);
-const schSaving = ref(false);
+// ---- 默认层（S4 一层一角色：校管=本校默认、超管=平台默认(schId=0)。
+//      写落点由后端 resolveThemeSchId 按登录身份决定，前端不传 schId、接口签名未变）----
+/** 默认层草稿档：档名 + 侧栏三开关（S4.3 要求默认档也能改侧栏样式，四字段随整份 ThemeState 存 theme|sideDeep|gradOn|sideFollow） */
+const layerTheme = reactive<ThemeState>({ ...resolveEffectiveThemeState() });
+/** 读接口回传的命中层：校管视角下 0＝"本校未配置，当前展示的是平台默认回落值" */
+const layerHitSchId = ref<number | null>(null);
+const layerHasValue = ref(false);
+const layerSaving = ref(false);
+/** 本级是否真配置过：本级＝校管的本校行 / 超管的平台行（平台回落不算本级；schId=0 一律按平台层口径） */
+const layerConfigured = computed(() => layerHasValue.value && (curLayer.value === "platform" || layerHitSchId.value !== 0));
+const layerSaveLabel = computed(() => (curLayer.value === "platform" ? "保存为平台默认" : "保存为本校默认"));
+const layerClearLabel = computed(() => (curLayer.value === "platform" ? "清空平台默认" : "清空本校默认"));
+/** 当前展示值来源（头部说明用） */
+const layerFromLabel = computed(() => {
+    if (!layerHasValue.value) return "未配置（回落系统默认）";
+    return layerConfigured.value
+        ? LAYER_LABEL[curLayer.value]
+        : "平台默认（本级未单独配置）";
+});
 
-async function loadSchTheme() {
+async function loadLayerTheme() {
     try {
         const res = await BaseApi.getSchTheme();
-        if (res && res.themeState) {
-            try {
-                const st = JSON.parse(res.themeState);
-                schConfigured.value = st.theme || null;
-                schCandidate.value = st.theme || schCandidate.value;
-            } catch (e) {
-                schConfigured.value = null;
-            }
-        } else {
-            schConfigured.value = null;
+        layerHitSchId.value = res?.schId ?? null;
+        let st: ThemeState | null = null;
+        try {
+            st = res?.themeState ? (JSON.parse(res.themeState) as ThemeState) : null;
+        } catch (e) {
+            st = null;
         }
+        layerHasValue.value = !!st;
+        Object.assign(layerTheme, st ?? resolveEffectiveThemeState());
     } catch (e) {
         /* 读取失败不打扰 */
     }
 }
 
-/** 保存本校默认：整份 ThemeState JSON（档名=候选，其余继承当前生效值），成功后同步本地键 */
-async function onSaveSchTheme() {
-    if (schSaving.value) return;
-    schSaving.value = true;
+/** 保存默认层：整份草稿（档名 + 侧栏三开关）；成功后回读一次（命中层从平台变本级，配置态展示要跟着翻），
+ *  并写本地学校默认键让管理员自身立即看到效果 */
+async function onSaveLayerTheme() {
+    if (layerSaving.value) return;
+    layerSaving.value = true;
+    const state = { ...layerTheme } as ThemeState;
     try {
-        const cur = resolveEffectiveThemeState();
-        const state = { ...cur, theme: schCandidate.value } as ThemeState;
         await BaseApi.saveSchThemeState(JSON.stringify(state));
         try {
             localStorage.setItem(SCHOOL_DEFAULT_STORAGE_KEY, JSON.stringify(state));
         } catch (e) {
             /* 隐私模式静默 */
         }
-        schConfigured.value = schCandidate.value;
-        schTick.value += 1;
+        await loadLayerTheme();
         myTick.value += 1;
-        Message.success("本校默认主题已保存");
+        Message.success(`${LAYER_LABEL[curLayer.value]}主题已保存`);
     } catch (error) {
         Message.error("保存失败:" + error);
     } finally {
-        schSaving.value = false;
+        layerSaving.value = false;
     }
 }
 
-/** 跟随系统默认（清空学校配置，§3.3：清空=删配置语义） */
-async function onClearSchTheme() {
-    if (schSaving.value) return;
-    schSaving.value = true;
+/** 清空本级配置（§3.3：清空=删配置语义）；清空后读侧回落上一级（校管→平台，超管→系统默认） */
+async function onClearLayerTheme() {
+    if (layerSaving.value) return;
+    layerSaving.value = true;
     try {
         await BaseApi.clearSchTheme();
         try {
@@ -1141,23 +1421,22 @@ async function onClearSchTheme() {
         } catch (e) {
             /* 隐私模式静默 */
         }
-        schConfigured.value = null;
-        schTick.value += 1;
+        await loadLayerTheme();
         myTick.value += 1;
-        Message.success("已恢复系统默认");
+        Message.success("已清空本级配置");
     } catch (error) {
         Message.error("操作失败:" + error);
     } finally {
-        schSaving.value = false;
+        layerSaving.value = false;
     }
 }
 
-// 打开主题 pane 时拉一次学校配置（管理员视角；失败静默）
+// 打开主题 pane 时拉一次默认层配置（管理员视角；失败静默）
 watch(curPane, pane => {
-    if (pane === "mytheme" || pane === "schooltheme") loadSchTheme();
+    if (pane === "theme" && isAdmin.value) loadLayerTheme();
 });
 
-// ===== 默认头像样式（默认头像轮 2026-09-30：用户自选 + 学校默认两级，链路与主题同构）=====
+// ===== 默认头像样式（默认头像轮 2026-09-30 两级 + S4 三层化：我的 > 本校默认 > 平台默认 > 系统首字，链路与主题同构）=====
 import {
     AVATAR_STORAGE_KEY,
     SCHOOL_DEFAULT_AVATAR_STORAGE_KEY,
@@ -1200,50 +1479,58 @@ function followSchoolAvatar() {
     myAvatarTick.value += 1;
 }
 
-// ---- 本校默认头像（仅管理员）----
-const schAvatarCandidate = ref<AvatarStyle>(resolveAvatarStyle());
-const schAvatarConfigured = ref<AvatarStyle | null>(null); // 已配置的学校默认（text|silhouette）
-const schAvatarSaving = ref(false);
+// ---- 默认层头像样式（S4：校管=本校默认行、超管=平台默认行(schId=0)，与主题层同构）----
+const layerAvatar = ref<AvatarStyle>(resolveAvatarStyle());
+const layerAvatarHitSchId = ref<number | null>(null);
+const layerAvatarHasValue = ref(false);
+const layerAvatarSaving = ref(false);
+const layerAvatarConfigured = computed(
+    () => layerAvatarHasValue.value && (curLayer.value === "platform" || layerAvatarHitSchId.value !== 0),
+);
+const layerAvatarFromLabel = computed(() => {
+    if (!layerAvatarHasValue.value) return "未配置（回落系统默认：首字）";
+    return layerAvatarConfigured.value
+        ? `${LAYER_LABEL[curLayer.value]}：${AVATAR_STYLE_LABEL[layerAvatar.value]}`
+        : `平台默认：${AVATAR_STYLE_LABEL[layerAvatar.value]}（本级未单独配置）`;
+});
 
-async function loadSchAvatar() {
+async function loadLayerAvatar() {
     try {
         const res = await BaseApi.getSchAvatarStyle();
-        if (res && res.avatarStyle) {
-            schAvatarConfigured.value = res.avatarStyle as AvatarStyle;
-            schAvatarCandidate.value = res.avatarStyle as AvatarStyle;
-        } else {
-            schAvatarConfigured.value = null;
-        }
+        layerAvatarHitSchId.value = res?.schId ?? null;
+        const style = (res?.avatarStyle as AvatarStyle) || null;
+        layerAvatarHasValue.value = !!style;
+        if (style) layerAvatar.value = style;
     } catch (e) {
         /* 读取失败不打扰 */
     }
 }
 
-/** 保存本校默认：成功后同步本地学校键（管理员自身立即生效，与 onSaveSchTheme 同构） */
-async function onSaveSchAvatar() {
-    if (schAvatarSaving.value) return;
-    schAvatarSaving.value = true;
+/** 保存默认层：成功后回读（命中层从平台变本级）并写本地学校默认键，管理员自身立即生效 */
+async function onSaveLayerAvatar() {
+    if (layerAvatarSaving.value) return;
+    layerAvatarSaving.value = true;
     try {
-        await BaseApi.saveSchAvatarStyle(schAvatarCandidate.value);
+        await BaseApi.saveSchAvatarStyle(layerAvatar.value);
         try {
-            localStorage.setItem(SCHOOL_DEFAULT_AVATAR_STORAGE_KEY, schAvatarCandidate.value);
+            localStorage.setItem(SCHOOL_DEFAULT_AVATAR_STORAGE_KEY, layerAvatar.value);
         } catch (e) {
             /* 隐私模式静默 */
         }
-        schAvatarConfigured.value = schAvatarCandidate.value;
+        await loadLayerAvatar();
         myAvatarTick.value += 1;
-        Message.success("本校默认头像样式已保存");
+        Message.success(`${LAYER_LABEL[curLayer.value]}头像样式已保存`);
     } catch (error) {
         Message.error("保存失败:" + error);
     } finally {
-        schAvatarSaving.value = false;
+        layerAvatarSaving.value = false;
     }
 }
 
-/** 跟随系统默认（清空学校配置，与 onClearSchTheme 同构） */
-async function onClearSchAvatar() {
-    if (schAvatarSaving.value) return;
-    schAvatarSaving.value = true;
+/** 清空本级头像配置（清空后回落上一级：校管→平台，超管→系统默认），与 onClearLayerTheme 同构 */
+async function onClearLayerAvatar() {
+    if (layerAvatarSaving.value) return;
+    layerAvatarSaving.value = true;
     try {
         await BaseApi.clearSchAvatarStyle();
         try {
@@ -1251,22 +1538,22 @@ async function onClearSchAvatar() {
         } catch (e) {
             /* 隐私模式静默 */
         }
-        schAvatarConfigured.value = null;
+        await loadLayerAvatar();
         myAvatarTick.value += 1;
-        Message.success("已恢复系统默认");
+        Message.success("已清空本级配置");
     } catch (error) {
         Message.error("操作失败:" + error);
     } finally {
-        schAvatarSaving.value = false;
+        layerAvatarSaving.value = false;
     }
 }
 
-// 打开头像 pane 时拉一次学校默认头像配置（管理员视角；失败静默）
+// 打开头像 pane 时拉一次默认层头像配置（管理员视角；失败静默）
 watch(curPane, pane => {
-    if (pane === "avatar" && isAdmin.value) loadSchAvatar();
+    if (pane === "avatar" && isAdmin.value) loadLayerAvatar();
 });
 
-// ---- 侧栏样式三开关（mytheme pane；即时生效即入 localStorage，无保存按钮）----
+// ---- 侧栏样式三开关（my 层即时生效即入 localStorage 无保存按钮；默认层并入 layerTheme 草稿随保存落库）----
 const sideFollow = ref(resolveEffectiveThemeState().sideFollow);
 const sideDeep = ref(resolveEffectiveThemeState().sideDeep);
 const gradOn = ref(resolveEffectiveThemeState().gradOn);
@@ -1278,6 +1565,36 @@ function pickSide(patch: Partial<ThemeState>) {
     myTick.value += 1;
 }
 
+/* ---- 主题 pane 的「一层一角色」统一绑定（S4.3：my 层走即时生效 ref，默认层走草稿 layerTheme，模板只写一份）---- */
+/** 当前层选中的主题档 */
+const themePaneSel = computed(() => (curLayer.value === "my" ? myEffective.value.theme : layerTheme.theme));
+/** 当前层的侧栏三开关状态（默认层为待保存草稿） */
+const themeSide = computed(() => ({
+    sideFollow: curLayer.value === "my" ? sideFollow.value : layerTheme.sideFollow,
+    sideDeep: curLayer.value === "my" ? sideDeep.value : layerTheme.sideDeep,
+    gradOn: curLayer.value === "my" ? gradOn.value : layerTheme.gradOn,
+}));
+function pickThemePane(key: string) {
+    if (curLayer.value === "my") pickMyTheme(key);
+    else layerTheme.theme = key as ThemeState["theme"];
+}
+/** my 层：改 ref 后即时入 localStorage + 服务端双写；默认层：只改草稿，点「保存为…」才落库 */
+function pickSidePane(field: "sideFollow" | "sideDeep" | "gradOn", e: Event) {
+    const val = !!(e.target as HTMLInputElement).checked;
+    if (curLayer.value !== "my") {
+        layerTheme[field] = val;
+        return;
+    }
+    if (field === "sideFollow") sideFollow.value = val;
+    else if (field === "sideDeep") sideDeep.value = val;
+    else gradOn.value = val;
+    pickSide(field === "sideFollow" ? { sideFollow: val } : field === "sideDeep" ? { sideDeep: val } : { gradOn: val });
+}
+/** 预览：my 层沿用点选即时档；默认层用草稿（含侧栏开关，sideFollow 无 URL 通道故仅实际生效） */
+const themePreviewSrc = computed(() =>
+    curLayer.value === "my" ? previewSrc(myCandidate.value) : previewSrc(layerTheme.theme, layerTheme),
+);
+
 /* ===== sidebar：真实边栏管理（2026-09-30 二轮自 Header MenuBarModal 迁入：接口/字段/校验/直传/确认删除语义照抄） ===== */
 const sidebarList = ref<any[]>([]);
 const sidebarLoading = ref(false);
@@ -1409,24 +1726,131 @@ function onSidebarShowChange(id: number) {
     MenuBarApi.toggleMenuBarShow(id);
 }
 
-// 打开边栏 pane 时拉真实列表
-watch(curPane, pane => {
-    if (pane === "sidebar" && isAdmin.value) loadSidebarList();
+/* ===== statset：真实统计模块管理（2026-10-08 三轮自 Header StatsBarModal 迁入：接口/字段/校验/直传/确认删除语义照抄） ===== */
+const statsList = ref<any[]>([]);
+const statsLoading = ref(false);
+const statsEditShow = ref(false);
+const statsSaving = ref(false);
+const refStatsForm = ref<any>(null);
+const statsForm = reactive({
+    id: null as any,
+    roleIds: [] as number[],
+    name: "",
+    url: "",
+    linkOpenType: 0,
+    icon: "" as string | null,
+    orderNum: null as number | null,
 });
+const statsRules = {
+    roleIds: { required: true, type: "array", message: "请选择权限角色", trigger: "change,submit" },
+    name: { required: true, message: "请输入名称", trigger: "blur" },
+    url: { required: true, message: "请输入网址", trigger: "blur" },
+    icon: { required: true, message: "请上传图标", trigger: "change,submit" },
+};
+const statsAllChecked = computed(() => statsForm.roleIds.length == RoleTypeDict.length && RoleTypeDict.length > 0);
+const statsIndeterminate = computed(() => statsForm.roleIds.length > 0 && statsForm.roleIds.length < RoleTypeDict.length);
 
-const statChecks = ref([
-    { name: "应用访问量", on: true },
-    { name: "消息总量", on: true },
-    { name: "审批及时率", on: true },
-    { name: "用户活跃度", on: false },
-    { name: "设备在线率", on: false },
-    { name: "存储使用量", on: false },
+// 列定义照抄 StatsBarModal.menuBarColumns，宽度沿用边栏表格口径
+const statsColumns = ref([
+    { title: "名称", key: "name", minWidth: 120 },
+    { title: "图标", slot: "icon", width: 70, align: "center" },
+    { title: "角色", width: 150, slot: "roleIds" },
+    { title: "地址", key: "url", minWidth: 220, tooltip: true },
+    { title: "打开方式", key: "linkType", width: 100, align: "center" },
+    { title: "是否显示", width: 90, align: "center", slot: "isShow" },
+    { title: "排序号", key: "orderNum", width: 80, align: "center" },
+    {
+        title: "操作",
+        width: 110,
+        fixed: "right",
+        align: "center",
+        render: (h: any, params: any) => {
+            const disabled = !params.row.isEdit,
+                id = params.row.id;
+            return [
+                Utils.operatingTextHandle(h, "编辑", "mr-2", () => onStatsEditShow(id), disabled),
+                Utils.operatingTextHandle(h, "删除", "text-error", () => onStatsDelete(id), disabled),
+            ];
+        },
+    },
 ]);
 
-/** 后台管理：保持外跳（与 Header.vue linkBackendManage 同一地址） */
-function openBackend() {
-    window.open(`${$conf.baseHost}/userbase/front/index.html`, "_blank");
+async function loadStatsList() {
+    statsLoading.value = true;
+    try {
+        const list = await StatsBarApi.getStatsBarSchList();
+        (list || []).forEach((el: any) => {
+            el.linkType = linkOpenTypeDict.value.find(x => x.k == el.linkOpenType)?.v;
+        });
+        statsList.value = list || [];
+    } finally {
+        statsLoading.value = false;
+    }
 }
+
+function onStatsCheckAll() {
+    statsForm.roleIds = !statsAllChecked.value ? RoleTypeDict.map(item => item.k as number) : [];
+}
+
+function onStatsIconUploaded(response: any) {
+    if (response.code == 0) statsForm.icon = response.data.url;
+    else Message.error("上传错误！");
+}
+
+async function onStatsEditShow(id?: number) {
+    await refStatsForm.value?.resetFields();
+    statsEditShow.value = false;
+    if (!id) {
+        Object.assign(statsForm, { id: null, roleIds: [], name: "", url: "", linkOpenType: LinkOpenTypeEnum.Open, icon: "", orderNum: null });
+    } else {
+        const row = statsList.value.find(x => x.id == id);
+        if (row) Object.assign(statsForm, row);
+    }
+    statsEditShow.value = true;
+}
+
+async function onStatsDelete(id: number) {
+    await MyConfirm({
+        title: "删除",
+        msg: "确定删除该统计模块吗？",
+        info: "删除后无法恢复！",
+        async onOk() {
+            await StatsBarApi.deleteStatsBar(id);
+        },
+    });
+    await loadStatsList();
+}
+
+async function onStatsSave() {
+    const valid = await refStatsForm.value?.validate();
+    if (!valid) return false;
+    statsSaving.value = true;
+    try {
+        await StatsBarApi.saveStatsBar(statsForm);
+        Message.success("操作成功！");
+        await loadStatsList();
+        statsEditShow.value = false;
+    } catch (error) {
+        Message.error("操作失败！");
+    } finally {
+        statsSaving.value = false;
+    }
+}
+
+function onStatsShowChange(id: number) {
+    StatsBarApi.toggleStatsBarShow(id);
+}
+
+// 打开边栏/统计 pane 时拉真实列表（immediate：URL 直达 ?pane=sidebar|statset 首帧也要加载）
+watch(
+    curPane,
+    pane => {
+        if (!isAdmin.value) return;
+        if (pane === "sidebar") loadSidebarList();
+        if (pane === "statset") loadStatsList();
+    },
+    { immediate: true },
+);
 </script>
 
 <style scoped lang="scss">
@@ -1474,6 +1898,10 @@ function openBackend() {
             background: #f0f1f3;
             color: #7a8088;
         }
+        &.super {
+            background: #f3effe;
+            color: #6d5ae0;
+        }
     }
     .grp {
         font-size: 11.5px;
@@ -1516,17 +1944,6 @@ function openBackend() {
         &.active .ic {
             color: #fff;
         }
-        .ext {
-            margin-left: auto;
-            font-size: 10.5px;
-            color: #999;
-        }
-        &:hover .ext {
-            color: #5979ea;
-        }
-        &.active .ext {
-            color: rgba(255, 255, 255, 0.85);
-        }
     }
 }
 
@@ -1579,6 +1996,18 @@ function openBackend() {
         color: #2c3138;
         margin-bottom: 5px;
     }
+    /* 层级徽标（S4 一层一角色：标题旁标当前编辑的是「我的 / 本校默认 / 平台默认」哪一层） */
+    .scope {
+        display: inline-block;
+        font-size: 11px;
+        font-weight: 600;
+        color: #5979ea;
+        background: #eef2ff;
+        border-radius: 6px;
+        padding: 1px 8px;
+        margin-left: 6px;
+        vertical-align: 2px;
+    }
     p {
         font-size: 12.5px;
         color: #999;
@@ -1705,37 +2134,6 @@ function openBackend() {
         line-height: 1.6;
     }
 }
-.avatar-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(76px, 1fr));
-    gap: 12px;
-    padding: 14px 0 4px;
-}
-.avatar-item {
-    height: 76px;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-    border: 2px solid transparent;
-    transition: all 0.18s;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #fff;
-    font-size: 22px;
-    font-weight: 600;
-    &:hover {
-        transform: translateY(-2px);
-        box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
-    }
-    &.sel {
-        border-color: #5979ea;
-        box-shadow: 0 0 0 3px rgba(89, 121, 234, 0.18);
-    }
-}
-
 /* 主题选择（主题设置 2026-09-30）：左色块 + 右预览 iframe（独立 document 吃通道 CSS，本体不吃） */
 .theme-pane {
     display: flex;
@@ -1969,7 +2367,6 @@ function openBackend() {
     justify-content: center;
     font-style: normal;
 }
-.avatar-item.sel .tick,
 .wall-item.sel .tick {
     display: flex;
 }
@@ -2147,49 +2544,155 @@ function openBackend() {
     }
 }
 
-/* 统计设置：勾选项 */
-.check-list {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-    padding: 14px 0 4px;
+/* ===== 桌面应用（S6）：分组可折叠目录 + 应用格子，样式对齐原型 .info-note/.seg-tabs/.app-cat/.app-grid/.app-tile ===== */
+.info-note {
+    background: #eef2ff;
+    border-left: 3px solid #5979ea;
+    color: #3f5fd4;
+    padding: 10px 14px;
+    border-radius: 6px;
+    font-size: 12.5px;
+    line-height: 1.6;
+    margin-bottom: 16px;
 }
-.check-item {
+/* 分段 Tab 样式在全局 utils.scss（与「应用管理」共用同一套），此处只补与下方卡片的间距 */
+.seg-tabs {
+    margin-bottom: 14px;
+}
+.app-cat {
+    margin: 4px 0 10px;
+}
+.app-cat-h {
     display: flex;
     align-items: center;
     gap: 8px;
-    height: 34px;
-    padding: 0 13px;
-    border: 1px solid #dcdfe6;
-    border-radius: 6px;
-    font-size: 13px;
-    color: #4a4f55;
+    font-size: 12.5px;
+    color: #7a8088;
+    padding: 7px 4px;
     cursor: pointer;
-    transition: all 0.18s;
+    user-select: none;
+    border-bottom: 1px solid #f2f4f7;
+    .cn {
+        font-weight: 600;
+        color: #4a4f55;
+    }
+    .chev {
+        display: inline-block;
+        transition: transform 0.15s;
+        color: #b6bcc7;
+        font-size: 11px;
+        &.open {
+            transform: rotate(90deg);
+        }
+    }
+    .cc {
+        margin-left: auto;
+        font-size: 11px;
+        color: #b6bcc7;
+        background: #f4f5f8;
+        border-radius: 6px;
+        padding: 1px 7px;
+        &.has {
+            color: #5979ea;
+            background: #eef2ff;
+        }
+    }
+}
+.app-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(96px, 1fr));
+    gap: 12px;
+    padding: 12px 0 4px;
+    .app-cat & {
+        padding: 10px 0 2px;
+    }
+}
+.app-tile {
+    position: relative;
+    height: 92px;
+    border: 2px solid #eef0f3;
+    border-radius: 12px;
     background: #fff;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    cursor: pointer;
+    transition: all 0.15s;
+    &:hover {
+        border-color: #c9d2f0;
+        transform: translateY(-2px);
+    }
     &.on {
         border-color: #5979ea;
-        background: #eef2ff;
-        color: #5979ea;
-        font-weight: 500;
+        box-shadow: 0 0 0 3px rgba(89, 121, 234, 0.14);
     }
-    .bx {
-        width: 15px;
-        height: 15px;
-        border-radius: 4px;
-        border: 1.5px solid #c8ccd4;
-        display: flex;
+    /* 图标 42px 档：压掉全局 .appicon-tile 的 60px，矢量与位图同尺寸 */
+    .appicon {
+        width: 42px;
+        height: 42px;
+        border-radius: 11px;
+        font-size: 30px;
+    }
+    .ai-img {
+        width: 42px;
+        height: 42px;
+        border-radius: 11px;
+        object-fit: cover;
+    }
+    .an {
+        font-size: 12.5px;
+        color: #4a4f55;
+        max-width: 100%;
+        padding: 0 6px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .tick {
+        position: absolute;
+        right: 6px;
+        top: 6px;
+        width: 18px;
+        height: 18px;
+        border-radius: 50%;
+        background: #5979ea;
+        color: #fff;
+        font-size: 11px;
+        display: none;
         align-items: center;
         justify-content: center;
-        font-size: 10px;
-        color: #fff;
-        flex-shrink: 0;
+        font-style: normal;
     }
-    &.on .bx {
-        background: #5979ea;
+    &.on .tick {
+        display: flex;
+    }
+}
+/* 我的桌面只读（§9.2：增删与排序归首页拖拽），去掉可点反馈 */
+.app-grid.readonly .app-tile {
+    cursor: default;
+    &:hover {
+        transform: none;
         border-color: #5979ea;
     }
 }
+.src-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    font-size: 12px;
+    color: #7a8088;
+    background: #f6f7f9;
+    border-radius: 6px;
+    padding: 5px 11px;
+    b {
+        color: #2c3138;
+    }
+    &.copy b {
+        color: #20a162;
+    }
+}
 
 /* 底部操作条 */
 .pane-foot {
@@ -2198,6 +2701,10 @@ function openBackend() {
     padding-top: 18px;
     margin-top: 6px;
     border-top: 1px solid #eef0f3;
+    .hint {
+        margin-right: auto;
+        align-self: center;
+    }
 }
 
 /* 按钮 */
@@ -2245,24 +2752,8 @@ function openBackend() {
     }
 }
 
-/* 空占位 */
-.ph-box {
-    height: auto;
-    padding: 22px;
-    border: 1px dashed #dcdfe6;
-    border-radius: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #b3b3b3;
-    font-size: 13px;
-    gap: 8px;
-    margin-top: 12px;
-}
-
-/* 无权限黄条 / 后台管理信息条 */
-.no-perm,
-.info-bar {
+/* 无权限黄条 */
+.no-perm {
     display: flex;
     align-items: flex-start;
     gap: 10px;
@@ -2271,19 +2762,8 @@ function openBackend() {
     font-size: 12.5px;
     line-height: 1.65;
     margin-bottom: 16px;
-}
-.no-perm {
     background: #fff8ec;
     border-left: 3px solid #e9b954;
     color: #8a6d2f;
 }
-.info-bar {
-    background: #eef2ff;
-    border-left: 3px solid #5979ea;
-    color: #3f5fd4;
-    code {
-        font-family: Consolas, Monaco, monospace;
-        font-size: 12px;
-    }
-}
 </style>
diff --git a/src/views/SysSetting.vue b/src/views/SysSetting.vue
index 1174f1a..ba390c2 100644
--- a/src/views/SysSetting.vue
+++ b/src/views/SysSetting.vue
@@ -1,185 +1,102 @@
 <template>
     <div class="syssetting-wrap fix" v-if="isAdmin">
-        <!-- 左侧机构树（仅超管） -->
-        <div v-if="isSuperAdmin" class="left-box fl">
-            <h4 class="tree-title">机构</h4>
-            <Tree :data="treeData" select-node @on-select-change="onTreeSelect" />
-        </div>
-        <div :class="['right-box', isSuperAdmin ? 'ml-315' : '']">
-            <!-- 面包屑：仅超管展示当前选中的机构路径 -->
-            <Breadcrumb v-if="isSuperAdmin" class="sch-crumb">
-                <BreadcrumbItem v-for="(n, i) in currentSchPath" :key="n.id">
-                    <span :class="['crumb-item', i === currentSchPath.length - 1 ? 'is-last' : '']">{{ n.title }}</span>
-                </BreadcrumbItem>
-            </Breadcrumb>
-            <Tabs v-model="tabIndex" type="card" class="syssetting-tabs">
-                <TabPane label="基础设置" name="basic">
-                    <div class="basic-wrap">
-                        <!-- Logo -->
-                        <div class="setting-item">
-                            <h4 class="item-title">
-                                学校Logo
-                                <span class="tip">（单张，上传即覆盖；推荐尺寸 70x70）</span>
-                            </h4>
-                            <div class="logo-uploader">
-                                <ul class="logo-ul">
-                                    <li v-for="(item, index) in logoList" :key="item.id">
-                                        <label :class="['badge', item.type == 0 ? 'sys' : 'sch']">
-                                            {{ item.type == 0 ? "系统" : "校" }}
-                                        </label>
-                                        <img :src="item.url" alt="" />
-                                        <div class="operate" v-if="item.isEdit">
-                                            <a href="javascript:;" class="del" @click="onDeleteLogo(item)">删除</a>
-                                        </div>
-                                    </li>
-                                    <li class="add-cell">
-                                        <Upload
-                                            class="logo-upload"
-                                            :on-success="logoSuccess"
-                                            :show-upload-list="false"
-                                            :action="logoUploadAction"
-                                            accept="image/jpeg, image/jpg, image/png, image/gif, image/webp"
-                                            :with-credentials="true"
-                                            :headers="uploadHeaders"
-                                        >
-                                            <div class="add-box add-box--logo">
-                                                <SvgIcon name="upload-add" color="#939393" style="width: 22px; height: 22px" />
-                                                <p>上传Logo</p>
-                                            </div>
-                                        </Upload>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-
-                        <!-- 壁纸 -->
-                        <div class="setting-item">
-                            <h4 class="item-title">
-                                壁纸
-                                <span class="tip">（多张，与 Header「设置壁纸」弹窗数据互通；推荐尺寸 1920x1200）</span>
-                            </h4>
-                            <ul class="wallpaper-ul">
-                                <li v-for="(item, index) in wallpaperList" :key="item.id">
-                                    <label :class="['badge', item.type == 0 ? 'sys' : 'sch']">
-                                        {{ item.type == 0 ? "系统" : "校" }}
-                                    </label>
-                                    <img :src="item.url" alt="" />
-                                    <div class="operate" v-if="item.isEdit">
-                                        <a href="javascript:;" class="del" @click="onDeleteWallpaper(item)">删除</a>
-                                    </div>
-                                </li>
-                                <li class="uploader">
-                                    <Upload
-                                        class="add-wrap tc"
-                                        :on-success="wallpaperSuccess"
-                                        :show-upload-list="false"
-                                        :action="wallpaperUploadAction"
-                                        accept="image/jpeg, image/jpg, image/png"
-                                        :with-credentials="true"
-                                        :headers="uploadHeaders"
-                                    >
-                                        <div class="add-box add-box--wallpaper">
-                                            <SvgIcon name="upload-add" color="#939393" style="width: 28px; height: 28px" />
-                                            <p>点击上传图片</p>
-                                        </div>
-                                    </Upload>
+        <!-- 应用管理（S4.7：原「基础设置」Tab 的 Logo/壁纸已迁到设置中心「门户外观」，此处只剩应用管理，
+             故去掉外层 Tabs 与只为基础设置服务的机构树/面包屑——应用管理接口不带 schId，跨校无需树） -->
+        <div class="right-box">
+            <div class="app-manage">
+                <!-- 角色分段用全局 .seg-tabs（与设置中心「桌面应用」同一套分段样式，方案 §10「应用管理自定义 Tab」） -->
+                <div class="role-tabs-row fix">
+                    <div class="seg-tabs fl">
+                        <div
+                            v-for="item in roleTypeList"
+                            :key="item.k"
+                            :class="['sg', { active: roleTypeTab === item.k }]"
+                            @click="onRoleTypeChange(item.k)"
+                        >{{ item.v }}</div>
+                    </div>
+                    <Button class="fr" size="small" type="primary" @click="showCategory()">新增应用</Button>
+                </div>
+                <div class="search-wrap fix">
+                    <Input
+                        placeholder="输入关键字搜索"
+                        class="fr"
+                        search
+                        suffix="ios-search"
+                        style="width: 200px"
+                        @on-search="onSearch"
+                        v-model="dataParmas.name"
+                    />
+                </div>
+                <TablePage
+                    :table-height="tableHeight"
+                    :data-api="tableDataApi"
+                    :columns="columns"
+                    :page-params="pageParams"
+                    :auto-load="true"
+                    ref="refTablePage"
+                />
+                <!-- 新增/编辑应用 -->
+                <Modal
+                    v-model="isModal"
+                    :mask-closable="false"
+                    width="600"
+                    :title="currentId == null ? '新增应用' : '编辑应用'"
+                >
+                    <Form ref="refFormData" class="mt-8 mr-24" :model="formData" :rules="ruleValidate" :label-width="120">
+                        <FormItem label="应用名称：" prop="name">
+                            <Input placeholder="请输入应用名称" v-model="formData.name" />
+                        </FormItem>
+                        <FormItem label="接口地址：" prop="apiUrl">
+                            <Input placeholder="请输入接口地址" v-model="formData.apiUrl" />
+                        </FormItem>
+                        <FormItem label="接口参数：" prop="paramsKey">
+                            <ul class="parmas-ul">
+                                <li class="fix mb-12" v-for="(item, index) in parmasList" :key="index">
+                                    <span class="ivu-form-item-label">参数名称</span>
+                                    <Input class="fl mr-12" v-model="item.k" style="width: 80px" />
+                                    <template v-if="item.type == 1">
+                                        <span class="ivu-form-item-label">参数类型</span>
+                                        <span>userId</span>
+                                    </template>
+                                    <template v-else-if="item.type == 2">
+                                        <span class="ivu-form-item-label">参数类型</span>
+                                        <span>学校Id</span>
+                                    </template>
+                                    <template v-else>
+                                        <span class="ivu-form-item-label">参数定值</span>
+                                        <Input class="fl mr-12" style="width: 80px" v-model="item.v" />
+                                    </template>
+                                    <Button
+                                        v-if="item.type != 1"
+                                        type="error"
+                                        ghost
+                                        icon="md-remove"
+                                        class="ml-12"
+                                        @click="parmasList.splice(index, 1)"
+                                    ></Button>
                                 </li>
                             </ul>
-                        </div>
-                    </div>
-                </TabPane>
-
-                <TabPane label="应用管理" name="app">
-                    <div class="app-manage">
-                        <Tabs v-model="roleTypeTab" @on-click="onRoleTypeChange">
-                            <TabPane :label="item.v" :name="item.k + ''" v-for="item in roleTypeList" :key="item.k" />
-                            <template #extra>
-                                <Button class="fl" size="small" type="primary" @click="showCategory()">新增应用</Button>
-                            </template>
-                        </Tabs>
-                        <div class="search-wrap fix">
-                            <Input
-                                placeholder="输入关键字搜索"
-                                class="fr"
-                                search
-                                suffix="ios-search"
-                                style="width: 200px"
-                                @on-search="onSearch"
-                                v-model="dataParmas.name"
-                            />
-                        </div>
-                        <TablePage
-                            :table-height="tableHeight"
-                            :data-api="tableDataApi"
-                            :columns="columns"
-                            :page-params="pageParams"
-                            :auto-load="true"
-                            ref="refTablePage"
-                        />
-                        <!-- 新增/编辑应用 -->
-                        <Modal
-                            v-model="isModal"
-                            :mask-closable="false"
-                            width="600"
-                            :title="currentId == null ? '新增应用' : '编辑应用'"
-                        >
-                            <Form ref="refFormData" class="mt-8 mr-24" :model="formData" :rules="ruleValidate" :label-width="120">
-                                <FormItem label="应用名称：" prop="name">
-                                    <Input placeholder="请输入应用名称" v-model="formData.name" />
-                                </FormItem>
-                                <FormItem label="接口地址：" prop="apiUrl">
-                                    <Input placeholder="请输入接口地址" v-model="formData.apiUrl" />
-                                </FormItem>
-                                <FormItem label="接口参数：" prop="paramsKey">
-                                    <ul class="parmas-ul">
-                                        <li class="fix mb-12" v-for="(item, index) in parmasList" :key="index">
-                                            <span class="ivu-form-item-label">参数名称</span>
-                                            <Input class="fl mr-12" v-model="item.k" style="width: 80px" />
-                                            <template v-if="item.type == 1">
-                                                <span class="ivu-form-item-label">参数类型</span>
-                                                <span>userId</span>
-                                            </template>
-                                            <template v-else-if="item.type == 2">
-                                                <span class="ivu-form-item-label">参数类型</span>
-                                                <span>学校Id</span>
-                                            </template>
-                                            <template v-else>
-                                                <span class="ivu-form-item-label">参数定值</span>
-                                                <Input class="fl mr-12" style="width: 80px" v-model="item.v" />
-                                            </template>
-                                            <Button
-                                                v-if="item.type != 1"
-                                                type="error"
-                                                ghost
-                                                icon="md-remove"
-                                                class="ml-12"
-                                                @click="parmasList.splice(index, 1)"
-                                            ></Button>
-                                        </li>
-                                    </ul>
-                                    <div class="fix">
-                                        <Button class="fl" @click="parmasList.push({ k: '', v: '', type: 3 })">添加固定参数</Button>
-                                        <Button
-                                            v-if="!!currentId"
-                                            class="ml-8"
-                                            @click="parmasList.push({ k: 'schId', v: '', type: 2 })"
-                                        >
-                                            添加SchId参数
-                                        </Button>
-                                    </div>
-                                </FormItem>
-                                <FormItem label="数据解析：" prop="dataKey">
-                                    <Input placeholder="请输入数据字段" v-model="formData.dataKey" />
-                                </FormItem>
-                            </Form>
-                            <template #footer>
-                                <Button type="primary" :loading="isSubmitLoading" @click="onEditSave">提交</Button>
-                                <Button @click="onReset">取消</Button>
-                            </template>
-                        </Modal>
-                    </div>
-                </TabPane>
-            </Tabs>
+                            <div class="fix">
+                                <Button class="fl" @click="parmasList.push({ k: '', v: '', type: 3 })">添加固定参数</Button>
+                                <Button
+                                    v-if="!!currentId"
+                                    class="ml-8"
+                                    @click="parmasList.push({ k: 'schId', v: '', type: 2 })"
+                                >
+                                    添加SchId参数
+                                </Button>
+                            </div>
+                        </FormItem>
+                        <FormItem label="数据解析：" prop="dataKey">
+                            <Input placeholder="请输入数据字段" v-model="formData.dataKey" />
+                        </FormItem>
+                    </Form>
+                    <template #footer>
+                        <Button type="primary" :loading="isSubmitLoading" @click="onEditSave">提交</Button>
+                        <Button @click="onReset">取消</Button>
+                    </template>
+                </Modal>
+            </div>
         </div>
     </div>
     <div class="no-permission" v-else>无权限访问</div>
@@ -189,126 +106,19 @@
 import { ref, reactive, computed, watch, onMounted, onUnmounted } from "vue";
 import { useRouter } from "vue-router";
 import { useDefaultStore } from "@/store";
-import useCurrentInstance from "@/utils/hook/useCurrentInstance";
-import SvgIcon from "@/components/SvgIcon.vue";
 import TablePage from "@/components/TablePage.vue";
 import Utils from "@/utils";
 import { Message } from "view-ui-plus";
 import { OperatorEnum } from "@/types";
 import { PageParams } from "@/types/Basics";
-import SysSettingApi from "@/api/SysSettingApi";
 import AppSettingApi, { AppCategoryItem } from "@/api/AppSettingApi";
 import mittBus from "@/utils/mitt";
 
 const router = useRouter();
 const store = useDefaultStore();
-const { $conf } = useCurrentInstance();
 
-const uploadHeaders = { yschapirequest: 1, yschreferer: Utils.strToHexCharCode(window.location.href) };
-
-const isSuperAdmin = computed(() => store.userInfo.type == 1);
 const isAdmin = computed(() => store.getIsAdmin);
 
-const tabIndex = ref("basic");
-const currentSchId = ref<number>(0);
-
-const treeData = ref<any[]>([
-    { id: 0, title: "平台默认设置", selected: true },
-]);
-
-// 当前选中的机构路径（面包屑），默认平台默认设置
-const currentSchPath = ref<{ id: number; title: string }[]>([
-    { id: 0, title: "平台默认设置" },
-]);
-
-function findPathInTree(list: any[], id: number): { id: number; title: string }[] | null {
-    for (const n of list || []) {
-        if (n.id === id) return [{ id: n.id, title: n.title }];
-        if (n.children && n.children.length) {
-            const sub = findPathInTree(n.children, id);
-            if (sub) return [{ id: n.id, title: n.title }, ...sub];
-        }
-    }
-    return null;
-}
-
-function onTreeSelect(nodes: any[]) {
-    if (!nodes || nodes.length == 0) return;
-    const node = nodes[0];
-    currentSchId.value = node.id;
-    if (node.id === 0) {
-        currentSchPath.value = [{ id: 0, title: "平台默认设置" }];
-    } else {
-        const path = findPathInTree(treeData.value, node.id);
-        currentSchPath.value = path && path.length ? path : [{ id: node.id, title: node.title }];
-    }
-    loadBasicData();
-}
-
-function mapTree(list: any[]): any[] {
-    return (list || []).map((item: any) => ({
-        id: item.id,
-        title: item.name,
-        children: item.children && item.children.length ? mapTree(item.children) : [],
-    }));
-}
-
-function getTreeData() {
-    SysSettingApi.getSchTree()
-        .then((resp: any) => {
-            treeData.value = [{ id: 0, title: "平台默认设置", selected: true }, ...mapTree(resp.children)];
-        })
-        .catch(() => {
-            treeData.value = [{ id: 0, title: "平台默认设置", selected: true }];
-        });
-}
-
-// ==================== 基础设置（Logo + 壁纸） ====================
-
-const logoList = ref<any[]>([]);
-const wallpaperList = ref<any[]>([]);
-
-const logoUploadAction = computed(() => {
-    let url = $conf.serviceHost + "/api/logoUpload";
-    if (isSuperAdmin.value && currentSchId.value > 0) url += "?schId=" + currentSchId.value;
-    return url;
-});
-
-const wallpaperUploadAction = computed(() => {
-    let url = $conf.serviceHost + "/api/wallpaperUpload";
-    if (isSuperAdmin.value && currentSchId.value > 0) url += "?schId=" + currentSchId.value;
-    return url;
-});
-
-async function loadBasicData() {
-    const [walls, logos] = await Promise.all([
-        SysSettingApi.getSchWallpaperManageList(isSuperAdmin.value ? currentSchId.value : undefined),
-        SysSettingApi.getSchLogoManageList(isSuperAdmin.value ? currentSchId.value : undefined),
-    ]);
-    wallpaperList.value = walls || [];
-    logoList.value = logos || [];
-}
-
-function wallpaperSuccess() {
-    loadBasicData();
-}
-
-function logoSuccess() {
-    loadBasicData();
-}
-
-async function onDeleteWallpaper(item: any) {
-    await SysSettingApi.deleteWallById(item.id);
-    Message.success("删除成功");
-    loadBasicData();
-}
-
-async function onDeleteLogo(item: any) {
-    await SysSettingApi.deleteLogoById(item.id);
-    Message.success("删除成功");
-    loadBasicData();
-}
-
 // ==================== 应用管理（AppCategory） ====================
 
 const roleTypeList = [
@@ -317,7 +127,7 @@ const roleTypeList = [
     { k: 3, v: "学生" },
 ];
 
-const roleTypeTab = ref("1");
+const roleTypeTab = ref<number>(1);
 const dataParmas = reactive({ name: "" });
 const pageParams: PageParams = reactive({ page: 1, count: 10 });
 const refTablePage = ref<any>(null);
@@ -326,7 +136,7 @@ const tableHeight = Utils.useTableHeight({ isSearch: true, isTabs: true, isPage:
 const tableDataApi = (params: PageParams) =>
     AppSettingApi.getAppCategoryList({
         ...params,
-        roleType: Number(roleTypeTab.value),
+        roleType: roleTypeTab.value,
         name: dataParmas.name || undefined,
     });
 
@@ -379,7 +189,10 @@ watch(
     { deep: true }
 );
 
-function onRoleTypeChange() {
+/** 分段 Tab 点击（原 iView @on-click 改为自绘分段，值即 roleType） */
+function onRoleTypeChange(k: number) {
+    if (roleTypeTab.value === k) return;
+    roleTypeTab.value = k;
     refTablePage.value?.reloadData();
 }
 
@@ -416,7 +229,7 @@ async function onEditSave() {
     }
     isSubmitLoading.value = true;
     try {
-        const item: AppCategoryItem = { ...formData, roleType: Number(roleTypeTab.value) };
+        const item: AppCategoryItem = { ...formData, roleType: roleTypeTab.value };
         await AppSettingApi.saveAppCategory(item);
         Message.success(`${currentId.value == null ? "添加" : "操作"}成功！`);
         refTablePage.value.reloadData(currentId.value == null ? OperatorEnum.add : OperatorEnum.edit);
@@ -448,22 +261,14 @@ async function onDeleteCategory(id: number) {
 
 // ==================== 生命周期 ====================
 
-async function onSwitchRole() {
+/** 切换身份/角色后重取应用列表（首屏由 TablePage 的 auto-load 负责） */
+function onSwitchRole() {
     if (!isAdmin.value) return;
-    if (isSuperAdmin.value) {
-        currentSchId.value = 0;
-        getTreeData();
-    }
-    await loadBasicData();
     refTablePage.value?.reloadData();
 }
 
-onMounted(async () => {
+onMounted(() => {
     if (!isAdmin.value) return;
-    if (isSuperAdmin.value) {
-        getTreeData();
-    }
-    await loadBasicData();
     mittBus.on("switchRole", onSwitchRole);
 });
 
@@ -477,21 +282,6 @@ onUnmounted(() => {
     height: 100%;
     padding: 15px;
 
-    .left-box {
-        width: 300px;
-        height: 100%;
-        background: #fff;
-        padding: 15px;
-        border-radius: 10px;
-        box-shadow: 0 10px 20px rgba(0, 0, 0, 0.1);
-        overflow-y: auto;
-
-        .tree-title {
-            margin-bottom: 10px;
-            color: #333;
-        }
-    }
-
     .right-box {
         height: 100%;
         background: #fff;
@@ -501,36 +291,6 @@ onUnmounted(() => {
         overflow: hidden;
         display: flex;
         flex-direction: column;
-
-        &.ml-315 {
-            margin-left: 315px;
-        }
-    }
-
-    .sch-crumb {
-        margin: 0 0 12px;
-        padding: 8px 14px;
-        background: #f5f7fa;
-        border-radius: 6px;
-        color: #606266;
-        font-size: 13px;
-
-        .crumb-item {
-            &.is-last {
-                color: #303133;
-                font-weight: 600;
-            }
-        }
-
-        :deep(.ivu-breadcrumb-item-separator) {
-            margin: 0 8px;
-            color: #c0c4cc;
-        }
-    }
-
-    .syssetting-tabs {
-        flex: 1;
-        min-height: 0;
     }
 }
 
@@ -542,217 +302,20 @@ onUnmounted(() => {
     color: #999;
 }
 
-.basic-wrap {
-    height: calc(100% - 44px);
-    overflow-y: auto;
-    padding: 18px 24px 24px;
-
-    .setting-item {
-        margin-bottom: 28px;
-
-        & + .setting-item {
-            padding-top: 20px;
-            border-top: 1px dashed #ebeef5;
-        }
-
-        .item-title {
-            margin: 0 0 14px;
-            font-size: 15px;
-            font-weight: 600;
-            color: #303133;
-            line-height: 22px;
-
-            .tip {
-                font-size: 12px;
-                color: #909399;
-                font-weight: 400;
-                margin-left: 4px;
-            }
-        }
-    }
-
-    .logo-uploader {
-        display: block;
-    }
-
-    .logo-ul {
-        display: flex;
-        flex-wrap: wrap;
-        gap: 14px;
-
-        li {
-            position: relative;
-            width: 120px;
-            height: 90px;
-            border: 1px solid #ebeef5;
-            border-radius: 6px;
-            overflow: hidden;
-            transition: border-color 0.2s, box-shadow 0.2s;
-
-            &:hover {
-                border-color: #c0c4cc;
-                box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-            }
-
-            img {
-                width: 100%;
-                height: 100%;
-                object-fit: contain;
-                background: #f7f8fa;
-            }
-
-            &.add-cell {
-                padding: 0;
-                border: none;
-                overflow: visible;
-
-                &:hover {
-                    border: none;
-                    box-shadow: none;
-                }
-            }
-        }
-    }
-
-    .wallpaper-ul {
-        display: flex;
-        flex-wrap: wrap;
-        gap: 16px;
-
-        li {
-            position: relative;
-            width: 250px;
-            height: 140px;
-            flex-shrink: 0;
-            border: 1px solid #ebeef5;
-            border-radius: 6px;
-            overflow: hidden;
-            transition: border-color 0.2s, box-shadow 0.2s;
-
-            &:hover {
-                border-color: #c0c4cc;
-                box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-            }
-
-            img {
-                width: 100%;
-                height: 100%;
-                object-fit: cover;
-            }
-
-            &.uploader {
-                padding: 0;
-                border: none;
-                overflow: visible;
-
-                &:hover {
-                    border: none;
-                    box-shadow: none;
-                }
-            }
-        }
-
-        // 强约束 view-ui-plus Upload 组件渲染层都撑满 li
-        li.uploader :deep(.ivu-upload),
-        li.uploader :deep(.ivu-upload-select) {
-            display: flex;
-            width: 100%;
-            height: 100%;
-        }
-    }
-
-    .badge {
-        position: absolute;
-        left: 8px;
-        top: 8px;
-        z-index: 2;
-        padding: 2px 10px;
-        border-radius: 10px;
-        font-size: 12px;
-        color: #fff;
-        line-height: 18px;
-
-        &.sys {
-            background: #5979ea;
-        }
-
-        &.sch {
-            background: #45b972;
-        }
-    }
-
-    .operate {
-        position: absolute;
-        right: 8px;
-        top: 8px;
-        z-index: 2;
-
-        a.del {
-            background: rgba(0, 0, 0, 0.5);
-            color: #fff;
-            padding: 2px 10px;
-            border-radius: 10px;
-            font-size: 12px;
-            line-height: 18px;
-            transition: background-color 0.2s;
-
-            &:hover {
-                background: rgba(0, 0, 0, 0.7);
-            }
-        }
-    }
-
-    .add-box {
-        width: 100%;
-        height: 100%;
-        border: 1px dashed #dcdfe6;
-        border-radius: 6px;
-        background: #fafbfc;
-        text-align: center;
-        color: #909399;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        gap: 6px;
-        cursor: pointer;
-        box-sizing: border-box;
-        transition: border-color 0.2s, color 0.2s, background-color 0.2s;
-
-        p {
-            font-size: 13px;
-            line-height: 1;
-        }
-
-        &:hover {
-            border-color: #5979ea;
-            color: #5979ea;
-            background: #f3f6fd;
-        }
-
-        &--logo {
-            width: 120px;
-            height: 90px;
-        }
-
-        &--wallpaper {
-            width: 250px;
-            height: 140px;
-            gap: 10px;
-        }
-    }
-
-    .logo-upload {
-        display: block;
-        width: 120px;
-        height: 90px;
-    }
-}
-
+/* 应用管理：.right-box 是纵向 flex，此处占满剩余高度（原外层 Tabs 的 44px 头部已随「基础设置」Tab 一起移除） */
 .app-manage {
-    height: calc(100% - 44px);
+    flex: 1;
+    min-height: 0;
     overflow: hidden;
 
+    .role-tabs-row {
+        margin-bottom: 12px;
+
+        .fr {
+            margin-top: 3px;
+        }
+    }
+
     .search-wrap {
         margin-bottom: 10px;
     }
diff --git a/src/views/ThemePreview.vue b/src/views/ThemePreview.vue
index d931ae8..db32a0d 100644
--- a/src/views/ThemePreview.vue
+++ b/src/views/ThemePreview.vue
@@ -3,11 +3,12 @@
          只在本路由的 document 内加载通道（组件挂载时动态 append init 脚本），
          档位类与通道 CSS 只落在本 document 的 <html> 上——UserHome 本体（父页）永远不吃通道 CSS。
          纯展示：根容器 pointer-events:none，不渲染搜索区/分页操作/ThemeSwitcher。
-         DOM 结构对齐 Notice layout（header-container / left-menu / path-nav / main-container），
-         观感（配色/侧栏形态）由通道 base.layout.css 按 URL 覆盖参数（?yh-theme= 等）驱动的档位类提供。
-         默认头像轮（2026-09-30）：logo 换云海图形、用户胶囊补三态头像圆 + icon-logout、
-         右侧补静态配色胶囊、左菜单换 iconfont + 可展开子菜单（预览 markup 落后于通道皮肤修复）。 -->
-    <div class="theme-preview-root">
+         DOM 结构逐层对齐 Notice（layout.vue + App.vue）：.layout-wrap 作用域内放
+         header-container / left-menu / path-nav，内容区用 .base-wrap-main > .main-wrapper > .main-container；
+         通道皮肤（skin.src.css）的侧栏/顶栏/面包屑规则全部以 .layout-wrap 为祖先，故根必须挂该类，
+         侧栏深色/浅色/跟随顶栏、渐变Header 这些档位令牌（html.side-deep/.grad-on…）才会被消费到。
+         观感（配色、侧栏形态、内容区卡片）由通道按 URL 覆盖参数（?yh-theme= 等）驱动的档位提供，本页不写死。 -->
+    <div class="theme-preview-root layout-wrap">
         <header class="header-container fix">
             <span class="logo-badge fl"><img src="@/assets/image/yunhai-logo.svg" alt="云海" /></span>
             <div class="delimiter fl align-middle"></div>
@@ -20,8 +21,7 @@
                 <a href="javascript:;" class="logout fl align-middle" title="退出登陆"><i class="iconfont icon-logout"></i></a>
             </div>
             <!-- 配色胶囊：静态展示（不接 ThemeSwitcher，避免预览里出现可点控件与真实切换器语义混淆）。
-                 置于 header-aside 之后：本页不吃 .layout-wrap 皮肤（flex order 失效、走 float），
-                 float:right 的 DOM 靠后者居左——才能复刻 Notice「配色在左、用户胶囊在右」 -->
+                 顶栏是 flex，皮肤给 .theme-cap{order:1} / .header-aside{order:2} → 胶囊恒落在用户胶囊左侧。 -->
             <div class="theme-cap fr"><span class="cap-btn">配色 ▾</span></div>
         </header>
         <div class="left-menu">
@@ -44,10 +44,12 @@
         <div class="path-nav">
             <span>首页</span><span class="crumb-sep">/</span><span>通知管理</span><span class="crumb-sep">/</span><span>通知列表</span>
         </div>
-        <div class="preview-main">
-            <div class="main-container">
-                <h3 class="panel-title">通知列表</h3>
-                <Table :columns="columns" :data="rows" size="small" :border="true" />
+        <div class="base-wrap-main">
+            <div class="main-wrapper">
+                <div class="main-container">
+                    <h3 class="panel-title">通知列表</h3>
+                    <Table :columns="columns" :data="rows" size="small" :border="true" />
+                </div>
             </div>
         </div>
     </div>
@@ -91,25 +93,17 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-/* 本页只补最小布局；配色/圆角/阴影等观感全部由通道 base.layout.css 的档位类驱动 */
+/* 本页只补"铺满 iframe + 纯展示"这层壳；配色、顶栏/侧栏/面包屑观感、内容区卡片全部交给通道
+   （骨架 skeleton.src.css 出结构、皮肤 skin.src.css 出观感，皮肤规则以 .layout-wrap 为祖先——
+   故根元素同时挂 .layout-wrap，档位令牌变化才会实时反映到预览上）。 */
 .theme-preview-root {
     position: fixed;
     inset: 0;
     overflow: hidden;
     pointer-events: none; /* 纯展示：整页不可交互 */
-    background: #f5f6f8;
     font-size: 14px;
 }
 
-.header-container {
-    h4 {
-        color: #fff;
-        font-size: 16px;
-        font-weight: 600;
-        margin: 0 12px;
-    }
-}
-
 /* 配色胶囊（静态展示）：观感对齐 ThemeSwitcher .theme-btn（通道皮肤只给 .theme-cap 排版，胶囊样式在切换器组件内） */
 .cap-btn {
     display: flex;
@@ -124,35 +118,17 @@ onMounted(() => {
     font-size: 12.5px;
 }
 
-/* 菜单图标（通道下发的 ysch-icons 掩码类）与文字间距（Notice 同款覆盖） */
-.left-menu a .iconfont {
-    margin-right: 8px;
-}
-
-/* 子菜单缩进：预览页不吃 .layout-wrap 前缀的皮肤层，骨架 a 无缩进差，补出层级（对齐皮肤 24px 缩进） */
-.left-menu .child-item-wrap a {
-    padding-left: 59px;
-}
-
+/* 面包屑分隔符：预览用纯 span 复刻（Notice 侧是 iView Breadcrumb，皮肤只作用于 .ivu-breadcrumb-*） */
 .path-nav .crumb-sep {
     margin: 0 8px;
     color: #c5c8cd;
 }
 
-.preview-main {
-    position: fixed;
-    top: calc(var(--topbar-h, 52px) + var(--crumb-h, 44px));
-    left: var(--side-w, 200px);
-    right: 0;
-    bottom: 0;
-    padding: 14px 24px 24px;
-    overflow: auto;
-
-    .panel-title {
-        font-size: 15px;
-        font-weight: 600;
-        color: #2c3138;
-        margin: 4px 0 12px;
-    }
+/* 内容卡标题：通道未定义，本页补最小排版（色值取通道文本色变量，未加载时回退） */
+.panel-title {
+    font-size: 15px;
+    font-weight: 600;
+    color: var(--text, #2c3138);
+    margin: 4px 0 12px;
 }
 </style>