From e91ce144089dd0f4d56b7618b4586fa696ef16db Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Wed, 30 Sep 2026 12:18:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(msgcenter,settings):=20=E7=95=99=E7=99=BD?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E4=B8=8E=E5=B7=A6=E4=BE=A7=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E2=80=94=E2=80=94/msg=E3=80=81/sett?=
 =?UTF-8?q?ings=20=E5=A3=B3=E5=B1=82=20padding=2015px=E3=80=81msg-side=202?=
 =?UTF-8?q?16px=E3=80=81sys=20pane=20:deep=20=E6=8A=B9=E5=B9=B3=E3=80=81Le?=
 =?UTF-8?q?ftMenu=20=E7=A7=BB=E9=99=A4=E7=A1=AC=E7=BC=96=E7=A0=81=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=81=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87=20fill?=
 =?UTF-8?q?=20=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                        |  2 +-
 src/assets/icons/menu-msg.svg      |  1 +
 src/assets/icons/menu-settings.svg |  2 +-
 src/components/LeftMenu.vue        | 32 ++++--------------------------
 src/views/Settings.vue             | 13 ++++++++++--
 src/views/msg/index.vue            | 10 ++++++----
 6 files changed, 24 insertions(+), 36 deletions(-)
 create mode 100644 src/assets/icons/menu-msg.svg

diff --git a/src/App.vue b/src/App.vue
index 7282c4b..5621c7f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -113,7 +113,7 @@ async function loadUserMenuBarList() {
     } else {
         findIndex = menuList.findIndex(x => x.url === route.path);
     }
-    // /msg、/settings 是前台硬编码路由（不在后台菜单表里），直达/刷新不应被弹回桌面
+    // /msg、/settings 由后台「边栏设置」配置后即进入菜单表；未配置时也允许直达/刷新，不被弹回桌面
     if (findIndex === -1 && !["/msg", "/settings"].includes(route.path)) router.push({ name: "index" });
 }
 
diff --git a/src/assets/icons/menu-msg.svg b/src/assets/icons/menu-msg.svg
new file mode 100644
index 0000000..8d5c190
--- /dev/null
+++ b/src/assets/icons/menu-msg.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" fill-rule="evenodd"><path d="M801.4 393.1 798.6 313.1 794.7 286.7 788.0 259.2 778.1 231.1 765.2 204.2 751.5 181.3 735.6 159.9 715.6 137.7 693.5 117.7 672.0 101.9 649.1 88.1 622.2 75.3 594.1 65.3 568.2 58.9 541.8 54.9 512.0 53.3 482.2 54.9 455.8 58.9 429.9 65.3 401.8 75.3 374.9 88.1 352.0 101.9 329.3 118.7 308.4 137.7 290.4 157.4 271.7 182.7 258.0 205.6 245.9 231.1 236.4 257.7 229.3 286.7 225.3 314.7 222.6 393.1 218.7 440.0 212.7 482.2 200.5 537.1 190.8 568.5 180.3 595.9 169.4 619.5 158.4 639.7 147.8 656.5 133.1 675.9 121.1 689.0 104.4 703.7 99.3 711.2 96.9 717.9 96.0 725.1 96.8 732.3 99.9 740.7 104.1 746.6 110.9 752.4 119.1 756.1 128.0 757.3 896.0 757.3 903.2 756.5 911.5 753.3 917.4 749.1 921.1 745.2 926.3 735.7 927.8 728.7 927.9 723.3 925.4 712.8 919.6 703.7 902.9 689.0 890.9 675.9 876.2 656.5 865.6 639.7 854.6 619.5 843.7 595.9 833.2 568.5 823.5 537.1 811.3 482.2 805.3 440.0 801.4 393.1Z M200.3 693.0 219.8 661.1 233.2 634.5 251.1 589.9 262.0 554.5 271.5 515.0 275.6 493.7 282.2 447.7 286.5 396.2 289.1 319.4 292.3 297.6 297.7 276.3 305.1 255.6 314.5 235.8 325.8 216.9 338.9 199.3 353.6 183.0 369.9 168.2 387.6 155.1 406.4 143.8 426.3 134.4 447.0 127.0 468.3 121.7 490.0 118.5 512.0 117.4 534.0 118.5 555.7 121.7 577.0 127.0 597.7 134.4 617.6 143.8 636.4 155.1 654.1 168.2 670.4 183.0 685.1 199.3 698.2 216.9 709.5 235.8 718.9 255.6 726.3 276.3 731.7 297.6 734.9 319.4 737.5 396.2 741.8 447.7 748.2 492.7 756.8 534.3 767.3 572.7 784.9 621.2 803.7 660.2 823.9 693.3 200.3 693.0Z M553.4 884.6 543.6 894.0 531.8 900.5 518.8 903.9 505.2 903.9 492.2 900.5 483.2 895.9 475.2 889.6 464.3 877.2 457.0 872.0 448.6 869.1 437.8 868.8 430.9 870.7 426.1 873.0 421.7 876.2 416.8 881.4 414.0 886.0 411.4 892.7 410.6 898.0 410.8 905.1 412.0 910.4 415.0 916.9 425.1 929.9 437.3 941.5 455.8 954.0 474.4 962.2 490.8 966.4 511.0 968.4 527.9 967.3 540.5 964.9 554.7 960.3 568.2 954.0 580.8 946.1 592.3 936.6 602.4 925.8 611.2 913.7 615.0 905.6 616.4 898.6 616.4 893.2 615.5 887.9 612.9 881.2 608.9 875.3 605.1 871.5 600.7 868.4 594.2 865.5 583.6 864.0 578.2 864.6 571.4 866.8 562.5 872.8 553.4 884.6Z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/menu-settings.svg b/src/assets/icons/menu-settings.svg
index 2d63f0b..1f2c7c6 100644
--- a/src/assets/icons/menu-settings.svg
+++ b/src/assets/icons/menu-settings.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3.2"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 1 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 1 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 1 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.6 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 1 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 1 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.6a1.65 1.65 0 0 0 1-1.51V3a2 2 0 1 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 1 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9v0a1.65 1.65 0 0 0 1.51 1H21a2 2 0 1 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" fill-rule="evenodd"><path d="M111.6 629.5 121.3 630.5 135.2 633.7 144.0 636.9 156.4 643.2 164.1 648.4 174.5 657.5 183.6 667.9 188.8 675.6 196.8 692.3 200.7 706.0 202.5 720.4 202.3 734.1 199.8 748.9 194.3 764.6 187.4 777.3 176.8 791.9 173.9 798.5 172.6 809.2 174.8 819.7 177.2 824.5 181.7 830.2 213.6 860.4 242.3 883.1 272.9 903.5 305.1 921.5 338.8 936.9 380.7 951.6 387.8 952.9 395.1 952.6 405.4 949.1 413.9 942.3 418.1 936.4 426.3 916.8 434.0 904.0 446.3 890.0 457.9 880.7 474.3 871.7 488.7 866.9 508.0 864.1 523.9 864.8 535.3 866.9 549.7 871.7 563.0 878.6 574.9 887.5 585.4 898.1 592.1 907.1 599.4 920.2 605.9 936.4 610.1 942.3 615.5 947.2 621.9 950.6 628.9 952.6 636.2 952.9 643.3 951.6 671.7 942.1 699.3 930.8 725.9 917.8 757.4 899.6 782.1 882.8 810.4 860.4 837.2 835.5 843.6 828.9 847.7 823.0 850.3 816.3 851.3 811.0 851.2 803.8 850.1 798.5 847.2 791.9 836.6 777.3 829.7 764.6 824.8 750.9 821.9 736.3 821.5 720.4 823.3 706.0 827.2 692.3 832.9 679.6 840.4 667.9 849.5 657.5 859.9 648.4 871.6 640.9 884.3 635.2 898.0 631.3 912.4 629.5 932.3 629.9 941.1 628.0 949.1 623.7 954.3 618.8 958.4 612.8 961.0 606.0 965.8 578.9 969.1 550.3 970.6 521.0 970.3 494.0 968.5 467.5 964.6 437.4 959.6 411.6 952.1 382.5 949.1 372.9 945.9 366.5 941.4 361.0 935.7 356.6 925.8 352.7 898.0 350.1 880.0 344.5 871.6 340.4 859.9 333.0 852.8 327.1 843.3 317.1 835.2 305.8 828.9 293.4 824.4 280.0 821.8 265.9 821.4 251.7 823.0 237.9 826.1 226.0 832.6 210.1 834.2 203.2 833.7 192.6 830.6 184.3 826.6 178.4 819.4 171.6 788.0 145.7 760.1 126.2 730.7 108.8 700.0 93.5 668.0 80.6 633.1 69.6 622.3 69.0 611.9 72.1 604.5 77.2 599.7 82.7 590.9 97.4 582.8 107.6 570.8 118.6 560.0 125.8 545.2 132.8 532.4 136.5 515.5 138.6 501.6 138.1 491.6 136.5 478.8 132.8 466.8 127.4 455.8 120.5 448.2 114.4 439.1 105.1 431.3 94.7 423.2 81.2 418.2 76.0 413.7 72.9 405.3 69.6 398.1 68.8 390.9 69.6 382.4 71.9 356.5 80.4 330.8 90.6 305.8 102.2 281.8 115.2 258.6 129.7 236.4 145.4 215.1 162.4 198.6 177.1 194.3 182.7 191.2 189.2 189.6 201.5 190.8 208.5 197.5 224.8 201.0 237.9 202.6 251.7 202.2 265.9 198.3 284.6 195.1 293.4 188.8 305.8 180.7 317.1 171.2 327.1 160.3 335.6 152.4 340.4 139.7 346.2 130.7 349.0 116.5 351.5 99.9 352.4 93.1 354.3 83.9 359.8 76.3 369.6 69.6 390.7 63.4 416.1 58.7 441.7 55.4 467.8 53.7 494.3 53.4 520.8 54.7 547.2 57.4 573.3 63.0 606.0 66.5 614.4 70.9 620.1 78.0 625.7 86.3 629.0 93.5 630.0 111.6 629.5Z M121.0 566.0 117.6 527.3 118.0 488.9 122.0 451.3 129.5 414.4 145.9 411.2 162.4 406.0 176.7 399.9 195.5 389.1 207.9 380.0 220.3 368.6 234.4 352.4 243.1 339.7 251.2 324.7 257.2 310.3 263.2 289.0 265.8 273.1 266.7 255.8 265.9 239.9 263.4 223.9 259.5 208.7 289.0 186.4 318.9 167.8 350.5 151.8 383.9 138.6 394.5 151.2 406.0 162.6 418.7 172.7 432.4 181.5 447.0 188.9 462.4 194.8 478.6 199.2 494.2 201.7 512.6 202.7 535.4 201.0 556.3 196.5 577.0 188.9 592.5 181.0 610.5 168.8 626.6 154.4 640.1 138.6 678.9 154.3 700.0 164.9 720.3 176.7 744.6 193.1 764.5 208.7 760.1 226.1 757.8 244.0 757.5 263.4 759.1 279.5 762.2 295.2 767.3 311.8 773.5 326.1 784.3 344.9 793.4 357.2 804.7 369.7 821.0 383.8 833.7 392.4 848.7 400.6 863.1 406.6 878.1 411.2 894.5 414.4 899.5 436.6 903.1 458.8 905.8 485.1 906.7 512.0 905.7 539.9 903.0 566.0 884.3 568.8 861.6 575.4 840.4 585.1 821.0 597.6 803.7 612.8 788.7 630.2 776.3 649.8 766.8 671.1 762.2 686.2 759.1 701.8 757.5 718.0 758.0 739.5 760.0 754.4 764.1 771.6 770.1 788.0 777.8 803.7 749.2 827.4 717.9 848.8 684.5 867.1 651.3 881.4 638.6 862.2 626.4 848.1 612.6 835.6 597.5 824.8 581.1 815.7 563.6 808.5 545.1 803.5 525.9 800.6 504.7 800.2 480.1 803.2 460.4 808.5 437.3 818.5 417.2 831.1 402.0 843.8 386.2 861.2 372.7 881.4 339.5 867.1 311.5 852.1 279.8 831.2 246.2 803.7 255.5 784.1 262.6 761.4 266.0 739.5 266.5 718.0 264.7 700.2 259.2 677.0 251.2 656.7 239.7 636.5 229.6 623.0 214.8 607.4 201.8 596.7 189.0 588.1 175.3 580.8 160.9 574.8 139.7 568.8 121.0 566.0Z M512.8 693.3 529.7 692.5 547.7 689.8 565.1 685.4 581.9 679.4 597.8 671.8 612.8 662.8 626.8 652.4 640.8 639.7 652.4 626.8 662.8 612.8 671.8 597.8 679.4 581.9 685.4 565.1 689.8 547.7 692.5 529.7 693.3 511.2 692.5 494.3 689.8 476.3 685.4 458.9 679.4 442.1 671.8 426.2 662.8 411.2 652.4 397.2 639.7 383.2 626.8 371.6 612.8 361.2 597.8 352.2 581.9 344.6 565.1 338.6 547.7 334.2 529.7 331.5 511.2 330.7 494.3 331.5 476.3 334.2 458.9 338.6 442.1 344.6 426.2 352.2 411.2 361.2 397.2 371.6 383.2 384.3 371.6 397.2 361.2 411.2 352.2 426.2 344.6 442.1 338.6 458.9 334.2 476.3 331.5 494.3 330.7 512.8 331.5 529.7 334.2 547.7 338.6 565.1 344.6 581.9 352.2 597.8 361.2 612.8 371.6 626.8 384.3 640.8 397.2 652.4 411.2 662.8 426.2 671.8 442.1 679.4 458.9 685.4 476.3 689.8 494.3 692.5 512.8 693.3Z M505.9 629.2 482.7 625.6 461.2 617.8 441.8 606.0 425.1 590.9 411.6 572.8 401.8 552.3 396.0 529.9 394.8 518.1 394.8 505.9 398.4 482.7 406.2 461.2 418.0 441.8 433.1 425.1 451.2 411.6 471.7 401.8 494.1 396.0 505.9 394.8 518.1 394.8 541.3 398.4 562.8 406.2 582.2 418.0 598.9 433.1 612.4 451.2 622.2 471.7 628.0 494.1 629.2 505.9 629.2 518.1 625.6 541.3 617.8 562.8 606.0 582.2 590.9 598.9 572.8 612.4 552.3 622.2 529.9 628.0 518.1 629.2 505.9 629.2Z" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 4cb695b..740a06c 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -5,14 +5,13 @@
                 <SvgIcon name="menu-operate" color="#ececec" />
             </li>
             <template v-for="(item, index) in menuList" :key="index">
-                <!-- 硬编码补位的「设置」一级入口上方的分隔线（业务入口 vs 系统入口分层） -->
-                <li v-if="item.sep" class="menu-sep" aria-hidden="true"></li>
                 <li
                     v-wave="myWave"
                     @click="linkPage(item, index)"
                     :class="{ active: index == activeIndex, 'first-bottom': index == menuFirstBottomIndex }"
                 >
                     <a :title="item.name">
+                        <!-- 图标走后台上传的 svg（菜单 icon 字段），保留本地 sprite 兜底能力 -->
                         <SvgIcon v-if="item.localIcon" :name="item.localIcon" size="24"
                             :color="index == activeIndex ? '#fff' : '#ececec'" />
                         <FetchSvg v-else size="24" :src="$conf.serviceHost + item.icon"
@@ -66,26 +65,11 @@ const route = useRoute(),
 
 const store = useDefaultStore();
 const { menuVisible } = storeToRefs(store);
-/** 硬编码的「设置」一级入口：isNative 直走 router.push，图标用本地 svg sprite */
-const SETTINGS_MENU_ITEM = {
-    id: -1,
-    name: "设置",
-    url: "/settings",
-    isNative: true,
-    isBottom: true,
-    orderNum: 9999,
-    localIcon: "menu-settings",
-    sep: true,
-};
 
+/** 一级入口（含「消息」「设置」）统一由后台「边栏设置」配置，图标走 icon 字段上传的 svg */
 const menuList = computed<any[]>(() => {
-    let topArr = store.curUserMenuList.filter(x => x.isBottom !== true).sort((a, b) => a.orderNum - b.orderNum);
-    let bottomArr = store.curUserMenuList.filter(x => x.isBottom === true).sort((a, b) => a.orderNum - b.orderNum);
-    // 「设置」一级入口走前台硬编码补位（路径 A，不动后端菜单表）；
-    // 若后台菜单表已配置同 url 的项则不重复追加，避免双入口
-    if (!store.curUserMenuList.some(x => x.url === "/settings")) {
-        bottomArr = [...bottomArr, SETTINGS_MENU_ITEM];
-    }
+    const topArr = store.curUserMenuList.filter(x => x.isBottom !== true).sort((a, b) => a.orderNum - b.orderNum);
+    const bottomArr = store.curUserMenuList.filter(x => x.isBottom === true).sort((a, b) => a.orderNum - b.orderNum);
     return [...topArr, ...bottomArr];
 });
 
@@ -216,14 +200,6 @@ async function linkPage(item: any, index: number) {
         bottom: 8px;
         left: 5px;
     }
-    li.menu-sep {
-        width: 36px;
-        height: 1px;
-        margin: 6px auto;
-        padding: 0;
-        background: rgba(255, 255, 255, 0.22);
-        pointer-events: none;
-    }
     li:hover {
         background-color: rgba(255, 255, 255, 0.15);
     }
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index fbe3a2d..4831424 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -424,12 +424,15 @@ function openBackend() {
 </script>
 
 <style scoped lang="scss">
-/* 壳：透明，不平铺白（B 方案），gap 加在两卡的直接父容器上 */
+/* 壳：透明，不平铺白（B 方案），gap 加在两卡的直接父容器上。
+   padding 与 .syssetting-wrap 对齐（15px 四周），overflow:hidden 与 .app-list-wrapper/.stats-wrap 对齐，
+   避免内容撑出页面级滚动条把右侧留白撑大。 */
 .set-shell {
     display: flex;
     gap: 16px;
     height: calc(100% - var(--headerH));
-    padding: 0 20px 20px;
+    padding: 15px;
+    overflow: hidden;
     background: transparent;
     border: none;
     box-shadow: none;
@@ -540,6 +543,12 @@ function openBackend() {
         overflow: hidden;
         display: flex;
         flex-direction: column;
+
+        /* 内嵌的 SysSetting 自带 padding:15px，与 .set-shell 的 15px 叠加成 30px，此处抹平。
+           仅作用于本内嵌场景，独立页 /syssetting 不受影响（该页退役后可删本段） */
+        :deep(.syssetting-wrap) {
+            padding: 0;
+        }
     }
 }
 
diff --git a/src/views/msg/index.vue b/src/views/msg/index.vue
index 5245f79..1a4fa29 100644
--- a/src/views/msg/index.vue
+++ b/src/views/msg/index.vue
@@ -240,20 +240,22 @@ function fmtTime(min: number) {
 </script>
 
 <style scoped lang="scss">
-/* 壳：透明，不平铺白，壁纸透出（B 方案） */
+/* 壳：透明，不平铺白，壁纸透出（B 方案）。
+   padding 与 .set-shell / .syssetting-wrap 对齐（15px 四周），overflow:hidden 同 .set-shell。 */
 .msg-shell {
     display: flex;
     gap: 16px; /* ★ 两卡间隔 —— 必须加在两卡的直接父容器（本容器）上 */
     height: calc(100% - var(--headerH));
-    padding: 0 20px 20px;
+    padding: 15px;
+    overflow: hidden;
     background: transparent;
     border: none;
     box-shadow: none;
 }
 
-/* 左卡：分类 / 应用导航 */
+/* 左卡：分类 / 应用导航（宽度与 .set-nav 统一为 216px） */
 .msg-side {
-    width: 224px;
+    width: 216px;
     flex-shrink: 0;
     background: #fff;
     border-radius: 10px;