1

线稿图手动排序后更新bug
去掉管理员界面的allUser编辑userName
2026-05-15 16:25:08 +08:00 · 2026-05-15 15:01:17 +08:00 · 2026-05-15 10:15:18 +08:00 · 2026-05-14 18:06:01 +08:00 · 2026-05-14 09:27:06 +08:00 · 2026-05-13 17:29:05 +08:00
217 changed files with 23154 additions and 12085 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -7,5 +7,7 @@ VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VITE_APP_BASE_URL = 'https://www.api.aida.com.hk'
 # 徐佩
 # VITE_APP_BASE_URL = 'http://192.168.31.118:5567'
 # 李天祥
 # VITE_APP_BASE_URL = 'http://192.168.31.82:5567'
 # 海波
 # VITE_APP_BASE_URL = 'http://192.168.31.34:5567'
--- a/.env.dev_build
+++ b/.env.dev_build
@@ -5,4 +5,3 @@ VITE_USER_NODE_ENV = 'development'
 VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VITE_APP_BASE_URL = 'http://localhost:22170'
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ dist.rar
 *.sw?
 .eslintrc-auto-import.json
 components.d.ts
 .cursor
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -0,0 +1,33 @@
 /** @type {import('prettier').Config} */
 module.exports = {
  // 打印宽度
  printWidth: 100,
  // 使用 4 空格缩进
  tabWidth: 4,
  // 使用 4 空格缩进，不使用制表符
  useTabs: true,
  // 行尾使用 LF (Unix 风格)
  endOfLine: 'lf',
  // 语句末尾使用分号
  semi: false,
  // 使用单引号
  singleQuote: false,
  // 对象和数组末尾不添加尾随逗号
  trailingComma: 'none',
  // JSX 引号使用单引号
  jsxSingleQuote: false,
  // 括号内侧空格
  bracketSpacing: true,
  // JSX 标签不换行
  bracketSameLine: false,
  // 箭头函数参数始终使用括号
  arrowParens: 'always',
  // HTML、Vue、Angular 和 Markdown 使用 LF
  htmlWhitespaceSensitivity: 'css',
  // Vue 文件脚本和样式缩进
  vueIndentScriptAndStyle: false,
  // 行注释位置在注释上方，不加空格
  proseWrap: 'preserve',
  // 根据文件类型自动推断
  embeddedLanguageFormatting: 'auto',
 };
--- a/index.html
+++ b/index.html
@@ -17,6 +17,7 @@
  <link rel="stylesheet" href="/css/sloganFamily.css">
  <link rel="stylesheet" href="/css/pingfang.css">
  <link rel="stylesheet" href="/css/fonts/fontFamily.css">
 </head>
 <body>
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,6 +34,7 @@
        "vue-draggable-plus": "^0.6.0",
        "vue-i18n": "^9.6.1",
        "vue-router": "^4.0.3",
        "vue3-moveable": "^0.28.0",
        "vuedraggable": "^4.1.0",
        "vuex": "^4.0.0",
        "x-sender": "^1.1.6"
@@ -232,6 +233,15 @@
        "node": ">=6.9.0"
      }
    },
    "node_modules/@cfcs/core": {
      "version": "0.0.6",
      "resolved": "https://registry.npmmirror.com/@cfcs/core/-/core-0.0.6.tgz",
      "integrity": "sha512-FxfJMwoLB8MEMConeXUCqtMGqxdtePQxRBOiGip9ULcYYam3WfCgoY6xdnMaSkYvRvmosp5iuG+TiPofm65+Pw==",
      "license": "MIT",
      "dependencies": {
        "@egjs/component": "^3.0.2"
      }
    },
    "node_modules/@ctrl/tinycolor": {
      "version": "3.6.1",
      "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz",
@@ -240,6 +250,39 @@
        "node": ">=10"
      }
    },
    "node_modules/@daybrush/utils": {
      "version": "1.13.0",
      "resolved": "https://registry.npmmirror.com/@daybrush/utils/-/utils-1.13.0.tgz",
      "integrity": "sha512-ALK12C6SQNNHw1enXK+UO8bdyQ+jaWNQ1Af7Z3FNxeAwjYhQT7do+TRE4RASAJ3ObaS2+TJ7TXR3oz2Gzbw0PQ==",
      "license": "MIT"
    },
    "node_modules/@egjs/agent": {
      "version": "2.4.4",
      "resolved": "https://registry.npmmirror.com/@egjs/agent/-/agent-2.4.4.tgz",
      "integrity": "sha512-cvAPSlUILhBBOakn2krdPnOGv5hAZq92f1YHxYcfu0p7uarix2C6Ia3AVizpS1SGRZGiEkIS5E+IVTLg1I2Iog==",
      "license": "MIT"
    },
    "node_modules/@egjs/children-differ": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/@egjs/children-differ/-/children-differ-1.0.1.tgz",
      "integrity": "sha512-DRvyqMf+CPCOzAopQKHtW+X8iN6Hy6SFol+/7zCUiE5y4P/OB8JP8FtU4NxtZwtafvSL4faD5KoQYPj3JHzPFQ==",
      "license": "MIT",
      "dependencies": {
        "@egjs/list-differ": "^1.0.0"
      }
    },
    "node_modules/@egjs/component": {
      "version": "3.0.5",
      "resolved": "https://registry.npmmirror.com/@egjs/component/-/component-3.0.5.tgz",
      "integrity": "sha512-cLcGizTrrUNA2EYE3MBmEDt2tQv1joVP1Q3oDisZ5nw0MZDx2kcgEXM+/kZpfa/PAkFvYVhRUZwytIQWoN3V/w==",
      "license": "MIT"
    },
    "node_modules/@egjs/list-differ": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/@egjs/list-differ/-/list-differ-1.0.1.tgz",
      "integrity": "sha512-OTFTDQcWS+1ZREOdCWuk5hCBgYO4OsD30lXcOCyVOAjXMhgL5rBRDnt/otb6Nz8CzU0L/igdcaQBDLWc4t9gvg==",
      "license": "MIT"
    },
    "node_modules/@element-plus/icons-vue": {
      "version": "2.3.1",
      "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz",
@@ -1224,6 +1267,34 @@
        "win32"
      ]
    },
    "node_modules/@scena/dragscroll": {
      "version": "1.4.0",
      "resolved": "https://registry.npmmirror.com/@scena/dragscroll/-/dragscroll-1.4.0.tgz",
      "integrity": "sha512-3O8daaZD9VXA9CP3dra6xcgt/qrm0mg0xJCwiX6druCteQ9FFsXffkF8PrqxY4Z4VJ58fFKEa0RlKqbsi/XnRA==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.6.0",
        "@scena/event-emitter": "^1.0.2"
      }
    },
    "node_modules/@scena/event-emitter": {
      "version": "1.0.5",
      "resolved": "https://registry.npmmirror.com/@scena/event-emitter/-/event-emitter-1.0.5.tgz",
      "integrity": "sha512-AzY4OTb0+7ynefmWFQ6hxDdk0CySAq/D4efljfhtRHCOP7MBF9zUfhKG3TJiroVjASqVgkRJFdenS8ArZo6Olg==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.1.1"
      }
    },
    "node_modules/@scena/matrix": {
      "version": "1.1.1",
      "resolved": "https://registry.npmmirror.com/@scena/matrix/-/matrix-1.1.1.tgz",
      "integrity": "sha512-JVKBhN0tm2Srl+Yt+Ywqu0oLgLcdemDQlD1OxmN9jaCTwaFPZ7tY8n6dhVgMEaR9qcR7r+kAlMXnSfNyYdE+Vg==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.4.0"
      }
    },
    "node_modules/@simonwep/pickr": {
      "version": "1.8.2",
      "resolved": "https://registry.npmmirror.com/@simonwep/pickr/-/pickr-1.8.2.tgz",
@@ -2904,6 +2975,52 @@
        "node": ">= 0.10"
      }
    },
    "node_modules/croact": {
      "version": "1.0.4",
      "resolved": "https://registry.npmmirror.com/croact/-/croact-1.0.4.tgz",
      "integrity": "sha512-9GhvyzTY/IVUrMQ2iz/mzgZ8+NcjczmIo/t4FkC1CU0CEcau6v6VsEih4jkTa4ZmRgYTF0qXEZLObCzdDFplpw==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@egjs/list-differ": "^1.0.0"
      }
    },
    "node_modules/croact-css-styled": {
      "version": "1.1.9",
      "resolved": "https://registry.npmmirror.com/croact-css-styled/-/croact-css-styled-1.1.9.tgz",
      "integrity": "sha512-G7yvRiVJ3Eoj0ov2h2xR4312hpOzATay2dGS9clK8yJQothjH1sBXIyvOeRP5wBKD9mPcKcoUXPCPsl0tQog4w==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "css-styled": "~1.0.8",
        "framework-utils": "^1.1.0"
      }
    },
    "node_modules/croact-moveable": {
      "version": "0.9.0",
      "resolved": "https://registry.npmmirror.com/croact-moveable/-/croact-moveable-0.9.0.tgz",
      "integrity": "sha512-fc3bieV6CdqqZFtzsSLi9KmvUMFW3oakUfhPCls1BxKjOfUfn8rktteGED2341A/Qghy8tI3Hm6SdocIc68IKg==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@egjs/agent": "^2.2.1",
        "@egjs/children-differ": "^1.0.1",
        "@egjs/list-differ": "^1.0.0",
        "@scena/dragscroll": "^1.4.0",
        "@scena/event-emitter": "^1.0.5",
        "@scena/matrix": "^1.1.1",
        "croact-css-styled": "^1.1.9",
        "css-to-mat": "^1.1.1",
        "framework-utils": "^1.1.0",
        "gesto": "^1.19.3",
        "overlap-area": "^1.1.0",
        "react-css-styled": "^1.1.9",
        "react-moveable": "~0.56.0"
      },
      "peerDependencies": {
        "croact": "^1.0.4"
      }
    },
    "node_modules/cross-spawn": {
      "version": "7.0.6",
      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -3014,6 +3131,25 @@
        "url": "https://github.com/fb55/entities?sponsor=1"
      }
    },
    "node_modules/css-styled": {
      "version": "1.0.8",
      "resolved": "https://registry.npmmirror.com/css-styled/-/css-styled-1.0.8.tgz",
      "integrity": "sha512-tCpP7kLRI8dI95rCh3Syl7I+v7PP+2JYOzWkl0bUEoSbJM+u8ITbutjlQVf0NC2/g4ULROJPi16sfwDIO8/84g==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0"
      }
    },
    "node_modules/css-to-mat": {
      "version": "1.1.1",
      "resolved": "https://registry.npmmirror.com/css-to-mat/-/css-to-mat-1.1.1.tgz",
      "integrity": "sha512-kvpxFYZb27jRd2vium35G7q5XZ2WJ9rWjDUMNT36M3Hc41qCrLXFM5iEKMGXcrPsKfXEN+8l/riB4QzwwwiEyQ==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@scena/matrix": "^1.0.0"
      }
    },
    "node_modules/css-tree": {
      "version": "1.1.3",
      "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz",
@@ -4354,6 +4490,12 @@
        "node": ">=0.10.0"
      }
    },
    "node_modules/framework-utils": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/framework-utils/-/framework-utils-1.1.0.tgz",
      "integrity": "sha512-KAfqli5PwpFJ8o3psRNs8svpMGyCSAe8nmGcjQ0zZBWN2H6dZDnq+ABp3N3hdUmFeMrLtjOCTXD4yplUJIWceg==",
      "license": "MIT"
    },
    "node_modules/fs-extra": {
      "version": "10.1.0",
      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -4485,6 +4627,16 @@
        "node": ">=10"
      }
    },
    "node_modules/gesto": {
      "version": "1.19.4",
      "resolved": "https://registry.npmmirror.com/gesto/-/gesto-1.19.4.tgz",
      "integrity": "sha512-hfr/0dWwh0Bnbb88s3QVJd1ZRJeOWcgHPPwmiH6NnafDYvhTsxg+SLYu+q/oPNh9JS3V+nlr6fNs8kvPAtcRDQ==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@scena/event-emitter": "^1.0.2"
      }
    },
    "node_modules/get-intrinsic": {
      "version": "1.3.0",
      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
@@ -5695,6 +5847,24 @@
        "setimmediate": "^1.0.5"
      }
    },
    "node_modules/keycode": {
      "version": "2.2.1",
      "resolved": "https://registry.npmmirror.com/keycode/-/keycode-2.2.1.tgz",
      "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==",
      "license": "MIT"
    },
    "node_modules/keycon": {
      "version": "1.4.0",
      "resolved": "https://registry.npmmirror.com/keycon/-/keycon-1.4.0.tgz",
      "integrity": "sha512-p1NAIxiRMH3jYfTeXRs2uWbVJ1WpEjpi8ktzUyBJsX7/wn2qu2VRXktneBLNtKNxJmlUYxRi9gOJt1DuthXR7A==",
      "license": "MIT",
      "dependencies": {
        "@cfcs/core": "^0.0.6",
        "@daybrush/utils": "^1.7.1",
        "@scena/event-emitter": "^1.0.2",
        "keycode": "^2.2.0"
      }
    },
    "node_modules/keyv": {
      "version": "4.5.4",
      "resolved": "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz",
@@ -6212,6 +6382,19 @@
        "pathe": "^2.0.1"
      }
    },
    "node_modules/moveable": {
      "version": "0.53.0",
      "resolved": "https://registry.npmmirror.com/moveable/-/moveable-0.53.0.tgz",
      "integrity": "sha512-71jS9zIoQzMhnNvduhg4tUEdm23+fO/40FN7muVMbZvVwbTku2MIxxLhnU4qFvxI4oVxn75l79SbtgjuA+s7Pw==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@scena/event-emitter": "^1.0.5",
        "croact": "^1.0.4",
        "croact-moveable": "~0.9.0",
        "react-moveable": "~0.56.0"
      }
    },
    "node_modules/ms": {
      "version": "2.1.3",
      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
@@ -6650,6 +6833,15 @@
        "node": ">= 0.8.0"
      }
    },
    "node_modules/overlap-area": {
      "version": "1.1.0",
      "resolved": "https://registry.npmmirror.com/overlap-area/-/overlap-area-1.1.0.tgz",
      "integrity": "sha512-3dlJgJCaVeXH0/eZjYVJvQiLVVrPO4U1ZGqlATtx6QGO3b5eNM6+JgUKa7oStBTdYuGTk7gVoABCW6Tp+dhRdw==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.7.1"
      }
    },
    "node_modules/own-keys": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/own-keys/-/own-keys-1.0.1.tgz",
@@ -7037,6 +7229,46 @@
        "safe-buffer": "^5.1.0"
      }
    },
    "node_modules/react-css-styled": {
      "version": "1.1.9",
      "resolved": "https://registry.npmmirror.com/react-css-styled/-/react-css-styled-1.1.9.tgz",
      "integrity": "sha512-M7fJZ3IWFaIHcZEkoFOnkjdiUFmwd8d+gTh2bpqMOcnxy/0Gsykw4dsL4QBiKsxcGow6tETUa4NAUcmJF+/nfw==",
      "license": "MIT",
      "dependencies": {
        "css-styled": "~1.0.8",
        "framework-utils": "^1.1.0"
      }
    },
    "node_modules/react-moveable": {
      "version": "0.56.0",
      "resolved": "https://registry.npmmirror.com/react-moveable/-/react-moveable-0.56.0.tgz",
      "integrity": "sha512-FmJNmIOsOA36mdxbrc/huiE4wuXSRlmon/o+/OrfNhSiYYYL0AV5oObtPluEhb2Yr/7EfYWBHTxF5aWAvjg1SA==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@egjs/agent": "^2.2.1",
        "@egjs/children-differ": "^1.0.1",
        "@egjs/list-differ": "^1.0.0",
        "@scena/dragscroll": "^1.4.0",
        "@scena/event-emitter": "^1.0.5",
        "@scena/matrix": "^1.1.1",
        "css-to-mat": "^1.1.1",
        "framework-utils": "^1.1.0",
        "gesto": "^1.19.3",
        "overlap-area": "^1.1.0",
        "react-css-styled": "^1.1.9",
        "react-selecto": "^1.25.0"
      }
    },
    "node_modules/react-selecto": {
      "version": "1.26.3",
      "resolved": "https://registry.npmmirror.com/react-selecto/-/react-selecto-1.26.3.tgz",
      "integrity": "sha512-Ubik7kWSnZyQEBNro+1k38hZaI1tJarE+5aD/qsqCOA1uUBSjgKVBy3EWRzGIbdmVex7DcxznFZLec/6KZNvwQ==",
      "license": "MIT",
      "dependencies": {
        "selecto": "~1.26.3"
      }
    },
    "node_modules/readable-stream": {
      "version": "2.3.8",
      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
@@ -7507,6 +7739,24 @@
      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
      "dev": true
    },
    "node_modules/selecto": {
      "version": "1.26.3",
      "resolved": "https://registry.npmmirror.com/selecto/-/selecto-1.26.3.tgz",
      "integrity": "sha512-gZHgqMy5uyB6/2YDjv3Qqaf7bd2hTDOpPdxXlrez4R3/L0GiEWDCFaUfrflomgqdb3SxHF2IXY0Jw0EamZi7cw==",
      "license": "MIT",
      "dependencies": {
        "@daybrush/utils": "^1.13.0",
        "@egjs/children-differ": "^1.0.1",
        "@scena/dragscroll": "^1.4.0",
        "@scena/event-emitter": "^1.0.5",
        "css-styled": "^1.0.8",
        "css-to-mat": "^1.1.1",
        "framework-utils": "^1.1.0",
        "gesto": "^1.19.4",
        "keycon": "^1.2.0",
        "overlap-area": "^1.1.0"
      }
    },
    "node_modules/semver": {
      "version": "7.7.2",
      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.7.2.tgz",
@@ -9765,6 +10015,16 @@
        "vue": "^3.0.0"
      }
    },
    "node_modules/vue3-moveable": {
      "version": "0.28.0",
      "resolved": "https://registry.npmmirror.com/vue3-moveable/-/vue3-moveable-0.28.0.tgz",
      "integrity": "sha512-vplQO0XkxVEtXMDh2/lZE+c5kMycGXAfYFMvbwFKi8UVYzVk8MTgVHr4fxO9Z+4i4Rb+U/IEIgkhHRMAbx8FJg==",
      "license": "MIT",
      "dependencies": {
        "framework-utils": "^1.1.0",
        "moveable": "~0.53.0"
      }
    },
    "node_modules/vuedraggable": {
      "version": "4.1.0",
      "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz",
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
    "vue-draggable-plus": "^0.6.0",
    "vue-i18n": "^9.6.1",
    "vue-router": "^4.0.3",
    "vue3-moveable": "^0.28.0",
    "vuedraggable": "^4.1.0",
    "vuex": "^4.0.0",
    "x-sender": "^1.1.6"
--- a/public/css/fonts/ARIAL.ttf
+++ b/public/css/fonts/ARIAL.ttf
--- a/public/css/fonts/ARIALBD.ttf
+++ b/public/css/fonts/ARIALBD.ttf
--- a/public/css/fonts/ArialMdm.ttf
+++ b/public/css/fonts/ArialMdm.ttf
--- a/public/css/fonts/InstrumentSans-Bold.ttf
+++ b/public/css/fonts/InstrumentSans-Bold.ttf
--- a/public/css/fonts/InstrumentSans-Regular.ttf
+++ b/public/css/fonts/InstrumentSans-Regular.ttf
--- a/public/css/fonts/Poppins-Medium.ttf
+++ b/public/css/fonts/Poppins-Medium.ttf
--- a/public/css/fonts/Poppins-Regular.ttf
+++ b/public/css/fonts/Poppins-Regular.ttf
--- a/public/css/fonts/Poppins-SemiBold.ttf
+++ b/public/css/fonts/Poppins-SemiBold.ttf
--- a/public/css/fonts/fontFamily.css
+++ b/public/css/fonts/fontFamily.css
@@ -0,0 +1,41 @@
 /* 字体定义 */
@font-face {
  font-family: 'Arial';
  src: url('./fonts/ARIAL.ttf') format('truetype');
 }
@font-face {
  font-family: 'ArialBold';
  src: url('./fonts/ARIALBD.ttf') format('truetype');
 }
@font-face {
  font-family: 'ArialMedium';
  src: url('./fonts/ArialMdm.ttf') format('truetype');
 }
@font-face {
  font-family: 'Poppins';
  src: url('./fonts/Poppins-Regular.ttf') format('truetype');
  font-weight: normal;
 }
@font-face {
  font-family: 'PoppinsMedium';
  src: url('./fonts/Poppins-Medium.ttf') format('truetype');
 }
@font-face {
  font-family: 'PoppinsBold';
  src: url('./fonts/Poppins-SemiBold.ttf') format('truetype');
 }
@font-face {
  font-family: 'Instrument';
  src: url('./InstrumentSans-Regular.ttf') format('truetype');
 }
@font-face {
  font-family: 'InstrumentBold';
  src: url('./InstrumentSans-Bold.ttf')  format('truetype');
 }
--- a/public/image/events/award-poster-zh.gif
+++ b/public/image/events/award-poster-zh.gif
--- a/public/image/events/award-poster.gif
+++ b/public/image/events/award-poster.gif
--- a/src/assets/icons/CBrush2.svg
+++ b/src/assets/icons/CBrush2.svg
@@ -0,0 +1,17 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
 width="201.000000pt" height="200.000000pt" viewBox="0 0 201.000000 200.000000"
 preserveAspectRatio="xMidYMid meet">
 <g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
 <path d="M1654 1990 c-26 -8 -153 -110 -162 -129 -1 -3 81 -89 183 -191 l185
 -185 56 55 c30 30 62 67 70 82 22 41 18 123 -8 176 -29 57 -126 158 -169 176
 -47 20 -118 27 -155 16z"/>
 <path d="M868 1243 c-525 -527 -498 -492 -568 -725 -54 -179 -59 -219 -30
 -248 19 -19 29 -21 64 -16 113 18 361 105 431 152 28 18 251 235 498 481 l447
 448 -188 188 -187 187 -467 -467z"/>
 </g>
 </svg>
--- a/src/assets/icons/CEraser2.svg
+++ b/src/assets/icons/CEraser2.svg
@@ -0,0 +1,17 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
 width="200.000000pt" height="200.000000pt" viewBox="0 0 200.000000 200.000000"
 preserveAspectRatio="xMidYMid meet">
 <g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
 <path d="M757 1273 c-214 -214 -402 -406 -418 -427 -32 -43 -37 -82 -15 -124
 23 -44 327 -338 376 -363 l45 -24 463 -3 462 -3 0 46 0 45 -342 0 -343 0 342
 343 c187 188 346 352 352 364 16 32 13 74 -7 105 -9 14 -110 116 -224 227
 l-207 201 -47 0 -48 0 -389 -387z m207 -342 l209 -209 -128 -131 c-76 -78
 -144 -138 -169 -151 -51 -24 -106 -26 -149 -4 -41 20 -337 314 -337 334 0 13
 347 370 360 370 3 0 99 -94 214 -209z"/>
 </g>
 </svg>
--- a/src/assets/icons/CFile.svg
+++ b/src/assets/icons/CFile.svg
@@ -0,0 +1 @@
 <svg focusable="false" class="" data-icon="paper-clip" width="1em" height="1em" fill="#00000073" aria-hidden="true" viewBox="64 64 896 896"><path d="M779.3 196.6c-94.2-94.2-247.6-94.2-341.7 0l-261 260.8c-1.7 1.7-2.6 4-2.6 6.4s.9 4.7 2.6 6.4l36.9 36.9a9 9 0 0012.7 0l261-260.8c32.4-32.4 75.5-50.2 121.3-50.2s88.9 17.8 121.2 50.2c32.4 32.4 50.2 75.5 50.2 121.2 0 45.8-17.8 88.8-50.2 121.2l-266 265.9-43.1 43.1c-40.3 40.3-105.8 40.3-146.1 0-19.5-19.5-30.2-45.4-30.2-73s10.7-53.5 30.2-73l263.9-263.8c6.7-6.6 15.5-10.3 24.9-10.3h.1c9.4 0 18.1 3.7 24.7 10.3 6.7 6.7 10.3 15.5 10.3 24.9 0 9.3-3.7 18.1-10.3 24.7L372.4 653c-1.7 1.7-2.6 4-2.6 6.4s.9 4.7 2.6 6.4l36.9 36.9a9 9 0 0012.7 0l215.6-215.6c19.9-19.9 30.8-46.3 30.8-74.4s-11-54.6-30.8-74.4c-41.1-41.1-107.9-41-149 0L463 364 224.8 602.1A172.22 172.22 0 00174 724.8c0 46.3 18.1 89.8 50.8 122.5 33.9 33.8 78.3 50.7 122.7 50.7 44.4 0 88.8-16.9 122.6-50.7l309.2-309C824.8 492.7 850 432 850 367.5c.1-64.6-25.1-125.3-70.7-170.9z"></path></svg>
--- a/src/assets/icons/CMarquee.svg
+++ b/src/assets/icons/CMarquee.svg
@@ -0,0 +1,20 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
 width="200.000000pt" height="200.000000pt" viewBox="0 0 200.000000 200.000000"
 preserveAspectRatio="xMidYMid meet">
 <g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
 <path d="M250 1545 l0 -205 80 0 80 0 0 -340 0 -340 -80 0 -80 0 0 -205 0
 -205 205 0 205 0 0 80 0 80 340 0 340 0 0 -80 0 -80 205 0 205 0 0 205 0 205
 -80 0 -80 0 0 340 0 340 80 0 80 0 0 205 0 205 -205 0 -205 0 0 -80 0 -80
 -340 0 -340 0 0 80 0 80 -205 0 -205 0 0 -205z m320 0 l0 -125 -120 0 -120 0
 0 125 0 125 120 0 120 0 0 -125z m1100 0 l0 -125 -120 0 -120 0 0 125 0 125
 120 0 120 0 0 -125z m-330 -125 l0 -80 85 0 85 0 0 -340 0 -340 -85 0 -85 0 0
 -80 0 -80 -340 0 -340 0 0 80 0 80 -85 0 -85 0 0 340 0 340 85 0 85 0 0 80 0
 80 340 0 340 0 0 -80z m-770 -965 l0 -125 -120 0 -120 0 0 125 0 125 120 0
 120 0 0 -125z m1100 0 l0 -125 -120 0 -120 0 0 125 0 125 120 0 120 0 0 -125z"/>
 </g>
 </svg>
--- a/src/assets/icons/CPart.svg
+++ b/src/assets/icons/CPart.svg
@@ -0,0 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg id="_图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 184.06 163.52">
  <defs>
    <style>
      .cls-1, .cls-2 {
        fill: #333;
      }
      .cls-2 {
        stroke: #333;
        stroke-miterlimit: 10;
      }
    </style>
  </defs>
  <path class="cls-2" d="M35.53,54.52c-.76-.96-.84-1.16-2.06-1.12-4.02.13-16.7,6.5-19.81,4.48C12.45,52.21-1.21,21.14.68,18.17c56.98-23.47,125.74-23.63,182.7,0,1.88,2.98-11.77,34.04-12.98,39.72-3.11,2.01-15.78-4.36-19.81-4.48-1.23-.04-1.3.16-2.06,1.12v48c2.87,3.81,14.6,2.98,14.05,8.95-1.06,5.75-12.53,3.84-13.85,8.24l.34,39.85c.08.98-1.55,3.46-2.04,3.46H37.03c-2.08,0-1.5-3.59-1.5-4.5V54.52ZM41.53,47.52v108.5h101v-36c-7.66,1.58-6.82,23.41-12.7,24.86-1.18.17-2.67-.14-3.63-.79-2.98-2.02-6.47-24.26-10.3-25.81-.94-.38-4.46.95-5.31-1.9-1.01-3.4,3.85-4,4.01-5.02-.12-4.15-6.85-15.14-3.84-18.1,4.45-3.04,8.95,1.93,13.76,1.74-1.35-3.15-2.75-11.61,2.46-11.03s3.05,9.89,1.55,13.02l14,4.01v-53.5c0-5.17,22.25,4.69,23.94,3.46,1.7-8.98,7.54-18.42,9.64-26.94.32-1.3.79-1.48-.58-2.5-2.81-2.08-21.4-6.93-25.98-8.02-10.05-2.4-20.36-3.72-30.52-5.53-2.44.17-3.98,7.98-6.05,10.97-13.1,18.91-41.58,12.05-45.92-9.95l-2-1.02c-19.44,3.3-39.69,6.08-57.48,14.6l10.03,28.4c4.22.52,22.41-8.34,23.94-3.46ZM110.53,8.02h-37c4,20.53,33,20.53,37,0Z"/>
  <path class="cls-1" d="M89.27,117.8c-.94.96-10.2,1.42-11.25-.78-4.1-8.61,17.67-5.76,11.25.78Z"/>
  <path class="cls-1" d="M94.79,117.8c-6.42-6.54,15.35-9.39,11.25-.78-1.05,2.19-10.31,1.74-11.25.78Z"/>
  <path class="cls-1" d="M60.62,113.11c1.1-1.64,14.59-2.57,12.84,3.27-1.14,3.81-16.87,2.76-12.84-3.27Z"/>
  <path class="cls-1" d="M62.18,46.17h9.69s1.53,3.19,1.53,3.19c-1.22,4.73-18.53,3.97-11.22-3.19Z"/>
  <path class="cls-1" d="M112.19,46.18l10.91.77.34,3.47c-.87,2.65-12.93,2.92-12.96-1.9l1.7-2.34Z"/>
  <path class="cls-1" d="M56.23,84.18c6.63-1.86,6.45,14.76-.7,11.35-2.24-1.07-2.61-10.42.7-11.35Z"/>
  <path class="cls-1" d="M89.37,46.16l.96,3.22c-.81,4.5-16.92,3.98-12.37-2.43l11.42-.79Z"/>
  <path class="cls-1" d="M94.68,46.16l11.42.79.34,3.47c-1.03,3.13-16.69,2.9-11.76-4.26Z"/>
  <path class="cls-1" d="M54.75,63.76c-1.01-.99-2.01-12.94,3.11-11.63,5.4,1.38,2.78,17.42-3.11,11.63Z"/>
  <path class="cls-1" d="M129.31,63.76c-5.88,5.78-8.51-10.25-3.11-11.63,5.12-1.31,4.12,10.64,3.11,11.63Z"/>
  <path class="cls-1" d="M59.44,68.12c1.19.8,3.28,13.19-3.02,12.43l-2.23-1.77c-.57-2.83-.34-14.39,5.25-10.66Z"/>
  <path class="cls-1" d="M59.44,111.92c-5.59,3.73-5.82-7.83-5.25-10.66l2.23-1.77c6.3-.76,4.22,11.63,3.02,12.43Z"/>
  <path class="cls-1" d="M129.32,79.79c-5.12,5.18-7.81-7.81-4.7-11.67l3.28.02,1.48,1.52c-.35,2.45,1.51,8.54-.07,10.13Z"/>
 </svg>
--- a/src/assets/icons/CPoint.svg
+++ b/src/assets/icons/CPoint.svg
@@ -0,0 +1,31 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
 width="96.000000pt" height="96.000000pt" viewBox="0 0 96.000000 96.000000"
 preserveAspectRatio="xMidYMid meet">
 <g transform="translate(0.000000,96.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
 <path d="M346 936 c-21 -13 -49 -41 -62 -62 -41 -67 -27 -180 27 -218 47 -32
 53 -12 12 40 -71 94 -2 229 116 229 37 0 58 -7 87 -28 32 -22 40 -24 42 -12
 14 64 -142 100 -222 51z"/>
 <path d="M368 877 c-33 -28 -48 -57 -48 -96 0 -39 9 -61 26 -61 10 0 14 13 14
 46 0 57 12 79 50 93 61 21 110 -22 110 -96 0 -48 14 -56 31 -19 31 67 -35 156
 -114 156 -29 0 -50 -7 -69 -23z"/>
 <path d="M580 794 c0 -58 -9 -84 -43 -121 -19 -21 -19 -23 -2 -29 34 -13 85
 75 85 148 0 37 -10 58 -26 58 -10 0 -14 -15 -14 -56z"/>
 <path d="M410 749 c-13 -6 -28 -15 -32 -22 -4 -7 -8 -106 -8 -222 l-1 -210
 -27 34 c-62 80 -89 101 -126 101 -27 0 -39 -6 -52 -25 -15 -24 -15 -28 0 -68
 21 -53 78 -123 94 -113 18 11 16 17 -28 75 -44 58 -48 72 -25 91 21 18 54 -6
 93 -68 31 -47 74 -78 93 -67 5 4 9 101 9 224 0 225 3 241 42 241 10 0 19 -1
 19 -2 1 -2 5 -86 8 -188 5 -165 8 -185 24 -188 15 -3 17 5 17 61 0 72 17 100
 45 77 10 -9 15 -32 15 -77 0 -56 2 -64 18 -61 12 2 16 11 14 34 -5 48 14 86
 41 82 20 -3 22 -9 25 -66 3 -53 6 -63 20 -60 12 2 19 16 22 43 4 32 10 41 27
 43 36 5 46 -36 39 -166 -6 -127 -19 -160 -75 -195 -48 -29 -176 -34 -246 -10
 -48 18 -56 25 -130 128 -16 22 -25 26 -37 19 -15 -8 -11 -18 31 -75 78 -105
 94 -113 236 -117 119 -3 121 -3 167 27 69 44 82 74 86 214 6 179 -8 221 -72
 216 -22 -2 -39 4 -55 20 -17 17 -32 22 -55 19 -19 -2 -38 2 -45 9 -6 7 -25 13
 -40 13 l-29 0 -4 100 c-3 103 -11 122 -53 133 -11 3 -31 1 -45 -4z"/>
 </g>
 </svg>
--- a/src/assets/icons/overallMore.svg
+++ b/src/assets/icons/overallMore.svg
@@ -0,0 +1,9 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <rect width="24" height="24" fill="url(#pattern0_2641_12790)"/>
 <defs>
 <pattern id="pattern0_2641_12790" patternContentUnits="objectBoundingBox" width="1" height="1">
 <use xlink:href="#image0_2641_12790" transform="scale(0.0078125)"/>
 </pattern>
 <image id="image0_2641_12790" width="128" height="128" preserveAspectRatio="none" xlink:href="data:image/png;base64,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"/>
 </defs>
 </svg>
--- a/src/assets/images/award/apply_bg.png
+++ b/src/assets/images/award/apply_bg.png
--- a/src/assets/images/award/arrow.png
+++ b/src/assets/images/award/arrow.png
--- a/src/assets/images/award/arrow_down.svg
+++ b/src/assets/images/award/arrow_down.svg
@@ -0,0 +1,3 @@
 <svg width="22" height="12" viewBox="0 0 22 12" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M1 1L11 11L21 1" stroke="#585858" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/src/assets/images/award/arrow_right.png
+++ b/src/assets/images/award/arrow_right.png
--- a/src/assets/images/award/banner.mp4
+++ b/src/assets/images/award/banner.mp4
--- a/src/assets/images/award/banner_chinese.mp4
+++ b/src/assets/images/award/banner_chinese.mp4
--- a/src/assets/images/award/bloom_bg.png
+++ b/src/assets/images/award/bloom_bg.png
--- a/src/assets/images/award/bloom_logo.png
+++ b/src/assets/images/award/bloom_logo.png
--- a/src/assets/images/award/certification_bg.png
+++ b/src/assets/images/award/certification_bg.png
--- a/src/assets/images/award/checked.png
+++ b/src/assets/images/award/checked.png
--- a/src/assets/images/award/close.svg
+++ b/src/assets/images/award/close.svg
@@ -0,0 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M19.6144 18.7388L5.16736 4.29184C4.95412 4.0786 4.60838 4.0786 4.39514 4.29184C4.18189 4.50509 4.18189 4.85082 4.39514 5.06407L18.8421 19.5111C19.0554 19.7243 19.4011 19.7243 19.6144 19.5111C19.8276 19.2978 19.8276 18.9521 19.6144 18.7388Z" fill="#232323"/>
 <path d="M5.15908 19.5378L19.6061 5.09079C19.8193 4.87755 19.8193 4.53181 19.6061 4.31857C19.3928 4.10533 19.0471 4.10533 18.8339 4.31857L4.38685 18.7656C4.17361 18.9788 4.17361 19.3246 4.38685 19.5378C4.6001 19.751 4.94583 19.751 5.15908 19.5378Z" fill="#232323"/>
 </svg>
--- a/src/assets/images/award/code_create_logo.png
+++ b/src/assets/images/award/code_create_logo.png
--- a/src/assets/images/award/criteria_1.png
+++ b/src/assets/images/award/criteria_1.png
--- a/src/assets/images/award/criteria_2.png
+++ b/src/assets/images/award/criteria_2.png
--- a/src/assets/images/award/criteria_3.png
+++ b/src/assets/images/award/criteria_3.png
--- a/src/assets/images/award/criteria_4.png
+++ b/src/assets/images/award/criteria_4.png
--- a/src/assets/images/award/criteria_bg.png
+++ b/src/assets/images/award/criteria_bg.png
--- a/src/assets/images/award/design_bg.png
+++ b/src/assets/images/award/design_bg.png
--- a/src/assets/images/award/desmond.png
+++ b/src/assets/images/award/desmond.png
--- a/src/assets/images/award/diego.png
+++ b/src/assets/images/award/diego.png
--- a/src/assets/images/award/expired.png
+++ b/src/assets/images/award/expired.png
--- a/src/assets/images/award/facebook.svg
+++ b/src/assets/images/award/facebook.svg
@@ -0,0 +1,9 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <rect width="20" height="20" rx="2.79453" fill="url(#pattern0_226_198)"/>
 <defs>
 <pattern id="pattern0_226_198" patternContentUnits="objectBoundingBox" width="1" height="1">
 <use xlink:href="#image0_226_198" transform="scale(0.0104167)"/>
 </pattern>
 <image id="image0_226_198" width="96" height="96" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAKcUlEQVR4AeydSewlRR3H3xtHUXAZdz2YGQ+aeDDiCYgCMxwENFGMMdF4cDx48gB6VOOuiR4UPWlkGSAsBxK2BMI6wxYgLMOSEJYAQ9jXGbZh58/n0/Oq6ffmLd3Vr1/369f/1PfV0lW/qvr+flVdr7pe/9f1Cv6tra1tAseDU8FDYDdYVWffd9L584CcbCpIZy+3AqhgK9hOBQ+BE8FWYIUb8FfV2feD6fxxQE40SBXyU+K53EwFQPpmIOmnInEz6Nx0BlTINjkDMxUxUQEU3gDUqlavpU+vtrs6yoCcqYh/waMjZfR6Eh+rAApYWOKPT3J1H2UYOIHCTktySnDY7aeADPkOpeHcXSyWAcnfPuB2SMaQAsjgUNHyLTCUsYuUZkBOXS3JcSpsSAGk/gGYEa9zFTDgrPL7rNxUAVi/y8puzs+yU034BLhOV5OpAqhrSDPEO1cdAy7pE+mJAtCI1r86U0/S9Vo/3E1IviMkCqApqzj1rNHvebl3EFRUnkbfW4f1a/neHJDRuUgGipJvNe4wbHQEfM/YCmCUpP6gz1rvs4QfBXeDO8GN4HpwNdgxgiuJXwvM8zD+XvA+EOQRzO2OUwHpHTl3seXLOEp+tgevEbkX3ADOBaeD/4C/gz8O4PJc/I74b8Ffwb/BNeAZEOsOVgFOQbEClqGc5Gudwva+zccT4H5wIXBF8n/8k8Apot/vnw0uAtvBDnD1ANfi3wguBeeQ92LwJIh1m9uuAMkfJedVErT2M/G1dBXgtHI7ca35Zfy8bg8Z3wCxboMKGPpqHCupoeW0eqEiXqSNEn0G/n/B/7DiK8Gt4FHwNNgL3uTaRMeiRXnhugqYmj9knOAnCphwrVXJr9Abb6qn4Z8FbgLeePGKORSkMkOh9xPQiPHiXKnCcVVWXipLkCuc56jR6cZ53rn9Okh8EbxFeuJGrDpJy/nh6idn1vHZ2qiAbE93E7kMuLrZmSWdtNSRnlVamr6IwAIVUHl3AonO0Ya9mUr8yRB8BdgVWoDFN6bfjWlIICfSl/BsUW+4flnS+h/IXjCMMpyaDNaOtihAqxeB0FsInA0uhOys5WfzcLl+1xYFBCb9kuXUcx8JD0J+eqMl3iM+OlJMrhVtUECW1Kdh83JwPrgLJG6ecz6ysqNIhSd1xH60QQHZvr9E5A7ghpqbZAR7Wn5Vc74jrJTsNigga5H39Ho992ueZLqRHKL53IhlTyyE3OyI+xgZ/TKGF+faoAB7rhVq8Y8QeQEUcnnJHyP046R9AES7tijgeRi4DdwM0t3JPMSaR6sWlO0RPwB8AXwVHAGOBFuAD1AOxz8UHAN+TP5jwOdAtGuLAtzhfBwWJD/dnQykkj7WQWJ2+pJ8404r36TAT8BvgIcV/oQfng34LODXxH2MeyT+p0G0a4sCvPk6/wuXobkIUUEik/nrhH8AfgF+Dr4FtgAVcgS+4aPwDweHgI3gQOD9JntvIGmfm/XZFgVIgN9+heFZ/R66zkhw2vksiZJ67MD/BH5e56acoydv/jRfWxTgDfgxrHk3iNmfl3wt22nHeX19ytC+wCzrjiJf0W1RgFav9dunGDjvf42CXwGj5JPUiybYwtPQFgVo9bnn/jGEuJx0/nfaqYzsMfXm/4nSuMINSpM0Edsky5b6QhVbcVtGQGz/Qzl5yCpg1pwfypX2rbi0kBYIkHC/TYeuOCJCuFJ/mRUgaYGc6GXgQICEi0G0l5Ud0irxl1kBWUJcuZTpi+QrIytzIeEyja6igVpediqYVoekhesuQV0JhXhR32Ws36ZDuazskDbNt93Trk+81jQF2NCYznj6Id0D6imlGFSeSixW6r3cGk1Muxu3DNXynM89SOXJYw9Q+XD9KvrqjwfDSWXTPJ18Keme0bwE3404vChnWc95eopCmR5d9OBtqC/4tuEKavCQ1058z5h6uNc223aSirkmjgB74Kk1j4b7Q3F3Hz2R7K5k2JH0lLI7lV4zj3k912nZGPgoU3L/SeG/AevzNHSoL/jW607oP8jjQV6V4PFEonGuqQrQsi5hX+cc4EnkG/B90uVJ5YCrBmk34T8M9rKpth7ktkTy+gOV9ZR9BewC1nMNvrLDyehQn76n6m7muqeqt0G5I0FjIRjnmqoA52Tn9aK9ehtycs/F5HXujn2w7j3H+4ZtLdrONH9TFWDn0keLWGouq4bQ3OQHBmLKDNrjvF+4vlBv8JuqANuVbg3EkBQ6WJF/AHLdQRVpO0kr7Oxo4UILKKDFa2ELqCqqChXwGUoKwwTjXFMVENebxZXSOD5EdaLUN+hOAbAY4bT6T1LuU6A7lgIJi3ZhBHyQig3jxbk5joC4BixpKUeAx1GE4ehudAqIo06rP4iiwjDBONdUBbi+Tr8gDdbdcT2sppRLT+8BrR0BKsAt4mroi5A6YgQuk53/RStXQXbqI4GnvF/ERkgKxSf65ge5ZoGRNnwYoZ4lso2tnIIc4n7LpJ+FnJtrWmeRQkXzK9v1/0cNlEUu7ZetJKL85ylzLNb5Q3A0OAx4UtkTygFHkRZOK28kfCBWWnQzbs0ylD0IKOMQfGUqO5yItj7r/gbXTPe86Hdp35dBaddUBXhz8yDsr+ih++9/wXd/3mcCwtPKPgvwmYCnlD04axmyRTm/UHnS2Xd8hvp8BmBdwvCfkezzAOv8DmGNBK+ca5oC3B725uvyzre4HEr3JNdzmyrEV+sITyd77Wiu/wh8G5Q5py+ZHspVlmdDD0OedVhXgPWrJNvzJa47/7tSc8FANM41TQG2J+am5gtHymwJeM/xeGJRFm1vzD0krUcBaaQhgTwd0upEaLIKkMQQL+pbNnvTz8qeJqs/7WKea01UQJ52qyQR8vpUyukrxIv6Eq6MUC4rO6RV4i+rAkbJcC4eTSsSVwFlZRSpL83bFgWkHVq2QKeAmjXWKaBTQM0M1Fx9NwI6BdTMQM3VdyOgU0DNDNRc/XKOgJpJm2f1nQLmyWaErE4BEaTNs0ingHmyGSGrU0AEafMsogJK/cRmno1ZQVl7OgXUq/VdKsBfANbbjNWtPVGA/zlidSmot+c7HAEX1NuGla79gnX9ft+XW3fT0OLt4Ha5dwRYtf/aQ38KuktzZsAfmO97VQGa8EfHjoQ519GJm8CAPwpPjD6MAPP9zI8OC2HAY5ZJRakCGAXeB5JhkVzpPqpi4ES4TqzfClIFGAEeQu2WpRBRkXOal+NU/JAC0IzbEt/nqhnxOjdHBuR0y4DjVOyQAkwlQ5KRsD5eY52n2ULjYg70hrL6fT6yMrKyuVTaOatI/n6c7qcAqxoowReZLss9wZ80je2L/ckBFaCMHFkLZ5HDseQraWKjUcIe8EsyuTraT3Ok1+0kLbThKQK+uQovyr1OKV/ahJe4rOwkIeJDzjbLIXBqHytiogJCbgpvA18kriIcSgQb4zwRnby4mxb5PwTwopxlfUmUilBmlJBBIVeTW+UM+CavQfJ4b6YCQjGEqQinJZXhT3n8T0UqZKJ2Q9kKfa1ey3UESF5sVZb1lWe+/cp3FaVyZgTsu5buF1k52QRPTjfpMnNG+d67AAAA///vdBW6AAAABklEQVQDAJAXvRKwmZ6CAAAAAElFTkSuQmCC"/>
 </defs>
 </svg>
--- a/src/assets/images/award/first_bg.png
+++ b/src/assets/images/award/first_bg.png
--- a/src/assets/images/award/form_bg.png
+++ b/src/assets/images/award/form_bg.png
--- a/src/assets/images/award/grand_bg.png
+++ b/src/assets/images/award/grand_bg.png
--- a/src/assets/images/award/gregory.png
+++ b/src/assets/images/award/gregory.png
--- a/src/assets/images/award/jae.png
+++ b/src/assets/images/award/jae.png
--- a/src/assets/images/award/judges_bg.png
+++ b/src/assets/images/award/judges_bg.png
--- a/src/assets/images/award/linkdin.svg
+++ b/src/assets/images/award/linkdin.svg
@@ -0,0 +1,10 @@
 <svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_226_195)">
 <path d="M-0.00195312 1.4335C-0.00195312 0.641696 0.656004 0 1.46782 0H18.5422C19.354 0 20.0119 0.641696 20.0119 1.4335V18.5804C20.0119 19.3722 19.354 20.0139 18.5422 20.0139H1.46782C0.656004 20.0139 -0.00195312 19.3722 -0.00195312 18.5804V1.4335ZM6.18109 16.7541V7.71661H3.17776V16.7541H6.18109ZM4.68005 6.482C5.72703 6.482 6.37873 5.78902 6.37873 4.92092C6.35996 4.03405 5.72828 3.35983 4.70006 3.35983C3.67185 3.35983 3.00013 4.0353 3.00013 4.92092C3.00013 5.78902 3.65183 6.482 4.66003 6.482H4.68005ZM10.8193 16.7541V11.7069C10.8193 11.4367 10.8393 11.1665 10.9194 10.9739C11.1358 10.4347 11.6299 9.87561 12.4605 9.87561C13.5475 9.87561 13.9815 10.7037 13.9815 11.9195V16.7541H16.9848V11.5705C16.9848 8.79361 15.5038 7.50271 13.5274 7.50271C11.9338 7.50271 11.2196 8.37832 10.8193 8.995V9.02627H10.7993L10.8193 8.995V7.71661H7.81723C7.85475 8.5647 7.81723 16.7541 7.81723 16.7541H10.8193Z" fill="white"/>
 </g>
 <defs>
 <clipPath id="clip0_226_195">
 <rect width="20.0139" height="20.0139" rx="1.55252" fill="white"/>
 </clipPath>
 </defs>
 </svg>
--- a/src/assets/images/award/point.png
+++ b/src/assets/images/award/point.png
--- a/src/assets/images/award/prizes_bg.png
+++ b/src/assets/images/award/prizes_bg.png
--- a/src/assets/images/award/progress.png
+++ b/src/assets/images/award/progress.png
--- a/src/assets/images/award/qrcode.jpg
+++ b/src/assets/images/award/qrcode.jpg
--- a/src/assets/images/award/second_bg.png
+++ b/src/assets/images/award/second_bg.png
--- a/src/assets/images/award/selection_bg.png
+++ b/src/assets/images/award/selection_bg.png
--- a/src/assets/images/award/successful.png
+++ b/src/assets/images/award/successful.png
--- a/src/assets/images/award/tiktok.svg
+++ b/src/assets/images/award/tiktok.svg
--- a/src/assets/images/award/tim.png
+++ b/src/assets/images/award/tim.png
--- a/src/assets/images/award/timeline_bg.png
+++ b/src/assets/images/award/timeline_bg.png
--- a/src/assets/images/award/upload.png
+++ b/src/assets/images/award/upload.png
--- a/src/assets/images/award/upload_video_icon.png
+++ b/src/assets/images/award/upload_video_icon.png
--- a/src/assets/images/award/vincenzo.png
+++ b/src/assets/images/award/vincenzo.png
--- a/src/assets/images/award/weichat.svg
+++ b/src/assets/images/award/weichat.svg
@@ -0,0 +1,12 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_226_203)">
 <path d="M20 17C20 18.6569 18.6569 20 17 20H3C1.34307 20 0 18.6569 0 17V3C0 1.34313 1.34313 0 3 0H17C18.6569 0 20 1.34313 20 3V17Z" fill="white"/>
 <path d="M13.3881 7.45803C11.7739 7.54236 10.3702 8.03169 9.2306 9.13723C8.0792 10.2542 7.55366 11.6228 7.69726 13.3195C7.06633 13.2414 6.49166 13.1554 5.91373 13.1067C5.71413 13.0899 5.47726 13.1138 5.3082 13.2092C4.747 13.5258 4.20906 13.8834 3.57133 14.282C3.68833 13.7528 3.76406 13.2894 3.89813 12.8437C3.99673 12.5161 3.95106 12.3338 3.64926 12.1204C1.71153 10.7523 0.894728 8.70496 1.50599 6.59703C2.07153 4.64703 3.46033 3.46443 5.3474 2.84796C7.92313 2.00663 10.8177 2.86483 12.3839 4.90976C12.9495 5.64843 13.2964 6.47749 13.3881 7.45803ZM5.95893 6.80123C5.9738 6.41569 5.63973 6.06836 5.24293 6.05676C4.83666 6.04483 4.50253 6.35529 4.49066 6.75563C4.47866 7.16136 4.789 7.48649 5.1982 7.49689C5.60386 7.50716 5.94393 7.19629 5.95893 6.80123ZM9.835 6.05649C9.43673 6.06383 9.1002 6.40303 9.10726 6.79009C9.11453 7.19129 9.44466 7.50516 9.8542 7.50023C10.2648 7.49529 10.5762 7.17809 10.5723 6.76843C10.5689 6.36629 10.2403 6.04909 9.835 6.05649Z" fill="#232323"/>
 <path d="M17.0146 17.5216C16.5035 17.294 16.0346 16.9525 15.5354 16.9004C15.0381 16.8484 14.5154 17.1353 13.9951 17.1885C12.4104 17.3506 10.9907 16.909 9.82001 15.8264C7.59355 13.767 7.91168 10.6094 10.4876 8.92184C12.777 7.42197 16.1345 7.92197 17.7487 10.0031C19.1573 11.8191 18.9917 14.2298 17.2721 15.7554C16.7745 16.1969 16.5955 16.5602 16.9148 17.1423C16.9737 17.2498 16.9804 17.3858 17.0146 17.5216ZM11.1963 11.8883C11.5217 11.8886 11.7897 11.634 11.802 11.3126C11.815 10.9723 11.5413 10.6869 11.2006 10.6855C10.8632 10.684 10.5806 10.9734 10.5924 11.3086C10.6035 11.6288 10.8733 11.8879 11.1963 11.8883ZM14.9471 10.6868C14.6314 10.6846 14.3631 10.9431 14.3502 11.2621C14.3365 11.6032 14.6017 11.8834 14.9393 11.8842C15.2658 11.8854 15.5239 11.6384 15.5357 11.3134C15.5483 10.9715 15.2831 10.6892 14.9471 10.6868Z" fill="#232323"/>
 </g>
 <defs>
 <clipPath id="clip0_226_203">
 <rect width="20" height="20" fill="white"/>
 </clipPath>
 </defs>
 </svg>
--- a/src/assets/images/award/xiaohongshu.svg
+++ b/src/assets/images/award/xiaohongshu.svg
--- a/src/assets/images/award/∞.png
+++ b/src/assets/images/award/∞.png
--- a/src/assets/images/canvas/add.png
+++ b/src/assets/images/canvas/add.png
--- a/src/assets/images/canvas/remove.png
+++ b/src/assets/images/canvas/remove.png
--- a/src/assets/images/canvas/shubiao-l.png
+++ b/src/assets/images/canvas/shubiao-l.png
--- a/src/assets/images/canvas/shubiao-r.png
+++ b/src/assets/images/canvas/shubiao-r.png
--- a/src/assets/images/icon/xyz.png
+++ b/src/assets/images/icon/xyz.png
--- a/src/assets/json/events.json
+++ b/src/assets/json/events.json
@@ -4,13 +4,41 @@
 			"id": 1,
 			"title": "Just post your design work, you could have the chance to come to Hong Kong and interact with industry leaders face-to-face！",
 			"imgUrl": "/image/events/workshop-En.jpg"
-		},{
+		},
 		{
 			"id": 2,
 			"title": "AiDA X SFT AI Fashion Award 2024",
 			"imgUrl": "/image/events/Fashion-Award-2024.png"
 		},
 		{
 			"id": 3,
 			"title": "AiDA Global Design Awards 2026",
 			"imgUrl": "/image/events/award-poster.gif"
 		}
 	],
 	"eventsItem": [
 		{
 			"id": 3,
 			"title": "AiDA Global Design Awards 2026",
 			"imgUrl": "/image/events/award-poster.gif",
 			"tips": "For inquiries: awards2026@code-create.com.hk",
 			"textList": [
 				{
 					"paragraph": [
 						{
 							"text": "Click the “View Details” button for more information and to join the competition! The AiDA Global Design Award 2026 is an international design competition hosted by Code‑Create, a globally leading AI fashion solutions provider, celebrating the future of creativity powered by artificial intelligence. Open to designers worldwide the competition brings together global talent, empowering AI as a creative partner—pushing fashion beyond traditional boundaries and unlocking new possibilities where technology amplifies human imagination."
 						}
 					]
 				},
 				{
 					"paragraph": [
 						{
 							"text": "Participants have the opportunity to compete for cash prizes totaling up to US$9,000, gain global media exposure showcased by top international platforms, and connect with designers and industry leaders worldwide. Finalists will also attend an exclusive award ceremony in Hong Kong, with travel allowance, allowing them to showcase their talent, network with professionals, and celebrate their achievements on an international stage."
 						}
 					]
 				}
 			]
 		},
 		{
 			"id": 1,
 			"title": "Just post your design work, you could have the chance to come to Hong Kong and interact with industry leaders face-to-face！",
@@ -22,45 +50,53 @@
 							"text": "🎨AiDA Workshop!"
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "The process is simple: use AiDA to post your design work on the 'Gallery', and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! "
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "<b>⚠️ATTENTION❗❗</b>"
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "1. Add the tag in the work description #AiDAworkshop_2024"
-					  },{
+						},
 						{
 							"text": "2. One winner only"
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "<b>🤩Code-Create will provide (Terms and conditions apply):</b>"
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "✅Round-trip transportation fee (only within China)"
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "✅One night accommodation fee"
 						}
 					]
-			  },{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "⌛️Deadline: October 31, 2024"
@@ -80,7 +116,8 @@
 							"text": "With the aim of inspiring students to innovate in fashion design using AI, Code-Create and The Hong Kong Polytechnic University School of Fashion and Textiles (SFT) have jointly launched the 'AiDA X SFT AI Fashion Award 2024'. This competition provides students with valuable practical AiDA experience, laying the foundation for the future fashion design industry and positioning them as pioneers in AI fashion."
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "The competition is open to all SFT students, with the winners having the chance to win cash prizes (up to 20,000 HKD), internship opportunity at BESFXXK (will work with the renowned designer, Mr Jae Hyuk Lim, for the BESFXXK collection, that will be featured at NY Fashion Week and Paris Fashion Week) and more surprises! Scan the QR code to learn more."
--- a/src/assets/json/events_cn.json
+++ b/src/assets/json/events_cn.json
@@ -4,13 +4,41 @@
 			"id": 1,
 			"title": "什么？只要发布设计作品就有机会来香港与大佬面对面交流？！",
 			"imgUrl": "/image/events/workshop-Cn.jpg"
-      },{
+		},
 		{
 			"id": 2,
 			"title": "AiDA X SFT AI时尚设计比赛2024",
 			"imgUrl": "/image/events/Fashion-Award-2024.png"
 		},
 		{
 			"id": 3,
 			"title": "AiDA全球设计奖 2026",
 			"imgUrl": "/image/events/award-poster-zh.gif"
 		}
 	],
 	"eventsItem": [
 		{
 			"id": 3,
 			"title": "AiDA全球设计奖 2026",
 			"imgUrl": "/image/events/award-poster-zh.gif",
 			"tips": "如有疑问，请联系：awards2026@code-create.com.hk",
 			"textList": [
 				{
 					"paragraph": [
 						{
 							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
 						}
 					]
 				},
 				{
 					"paragraph": [
 						{
 							"text": "参赛者将有机会赢取总奖金 9,000 美元，作品还将获得国际媒体展示机会，并与全球设计师和行业领袖建立联系。入围决赛者将受邀参加在香港举办的 专属颁奖典礼，主办方提供差旅津贴，让设计师在国际舞台展示才华、拓展人脉，并共同庆祝创意成果。"
 						}
 					]
 				}
 			]
 		},
 		{
 			"id": 1,
 			"title": "什么？只要发布设计作品就有机会来香港与大佬面对面交流？！",
@@ -22,45 +50,53 @@
 							"text": "🎨这是一趟艺术巅峰之旅！AiDA Workshop！"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "参与过程很简单，利用AiDA 在 “Gallery广场 ”发布设计作品，最终获赞最高者(至少20个赞）将被邀请至11月14日 举办的AiDA Workshop香港线下活动，与英国皇家艺术学院（RCA）、韩国知名时尚品牌BESFXXK创始人JAE以及优秀设计师一同交流！(名额仅限1名）"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "<b>⚠️注意❗❗</b>"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "1. 作品描述添加tag: #AiDAworkshop_2024"
-					},{
+						},
 						{
 							"text": "2. 一个冠军名额"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "<b>🤩Code-Create将提供（适用条款条规）：</b>"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "✅往返机票/动车费用(仅限中国地区）"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "✅一晚酒店住宿费用"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": "⌛️截止时间：2024.10.31"
@@ -80,7 +116,8 @@
 							"text": "秉承着激发学生使用AI进行时尚设计的创新能力的初衷，Code-Create和香港理工大学时装及纺织学院（SFT）共同举办了“AiDA X SFT AI时尚设计比赛2024”让学生们在比赛中获得宝贵的AiDA实践经验，为未来的时尚设计行业打下了坚实的基础，成为时尚界的AI先锋。"
 						}
 					]
-			},{
+				},
 				{
 					"paragraph": [
 						{
 							"text": " 此次比赛面向全体SFT 学生，最终获奖者将赢取丰厚奖金（最高可达2万港币），获得在BESFXXK的实习机会（将与著名设计师Lim Jae Hyuk先生合作设计BESFXXK 系列，该系列将在纽约时装周和巴黎时装周上展出）及更多惊喜哦！扫描二维码获取更多比赛信息。"
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -2488,3 +2488,25 @@ textarea:focus {
  background: #ffffff;
  color: #000;
 }
 .flex {
  display: flex;
 }
 .flex-col {
  flex-direction: column;
 }
 .flex-center {
  justify-content: center;
  align-items: center;
 }
 .align-center {
  align-items: center;
 }
 .space-between {
  justify-content: space-between;
 }
 .justify-center {
  justify-content: center;
 }
 .flex-1{
 	flex: 1;
 }
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -2406,3 +2406,25 @@ textarea:focus{
 		color: #000;
 	}
 }
 .flex {
  display: flex;
 }
 .flex-col {
  flex-direction: column;
 }
 .flex-center {
  justify-content: center;
  align-items: center;
 }
 .align-center {
  align-items: center;
 }
 .space-between {
  justify-content: space-between;
 }
 .justify-center {
  justify-content: center;
 }
 .flex-1{
 	flex: 1;
 }
--- a/src/component/Account/message/system.vue
+++ b/src/component/Account/message/system.vue
@@ -2,21 +2,36 @@
 	<div class="account_systemMessage">
 		<div class="account_generalMessage_title modal_title_text">
 			<!-- <span>系统消息</span> -->
-			<div class="account_generalMessage_title_setting" @click="allRead">{{$t('account.AllRead')}}</div>
+			<div class="account_generalMessage_title_setting" @click="allRead">
 				{{ $t("account.AllRead") }}
 			</div>
-		<div class="account_generalMessage_item modal_title_text" v-for="item in dataList" :key="item.id" @click="setRead(item)">
+		</div>
 		<div
 			class="account_generalMessage_item modal_title_text"
 			v-for="item in dataList"
 			:key="item.id"
 			@click="setRead(item)"
 		>
 			<a-badge :dot="item.isRead == 0"></a-badge>
 			<div class="account_generalMessage_item_title">
-				<div class="account_generalMessage_item_title_text" :title="item.content">{{ item.content.title }}</div>
+				<div class="account_generalMessage_item_title_text" :title="item.content">
 					{{ item.content.title }}
 				</div>
 				<div class="modal_title_text_intro">{{ item.createTime }}</div>
 			</div>
 			<div class="modal_title_text_intro">
 				{{ item.content.content }}
-				<span v-if="item.content.link" class="account_generalMessage_item_link">{{ item.content.link }}</span>
+				<span v-if="item.content.link" class="account_generalMessage_item_link">{{
 					item.content.link
 				}}</span>
 			</div>
 		</div>
-		<div class="account_generalMessage_item  modal_title_text" style="display:flex;justify-content: center;" v-if="dataList.length == 0 && isNoData">
+		<div
-			{{$t('account.dataNull')}}
+			class="account_generalMessage_item modal_title_text"
 			style="display: flex; justify-content: center"
 			v-if="dataList.length == 0 && isNoData"
 		>
 			{{ $t("account.dataNull") }}
 		</div>
 		<div class="page_loading_box" v-show="!isNoData">
 			<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
@@ -27,34 +42,44 @@
 	</div>
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,reactive,nextTick,toRefs,createVNode, onMounted} from 'vue'
+import {
-import { Https } from "@/tool/https";
+	defineComponent,
-import { useRouter,useRoute } from 'vue-router'
+	computed,
-import { useStore } from "vuex";
+	ref,
-import { useI18n } from 'vue-i18n'
+	reactive,
 	nextTick,
 	toRefs,
 	createVNode,
 	onMounted
 } from "vue"
 import { Https } from "@/tool/https"
 import { useRouter, useRoute } from "vue-router"
 import { useStore } from "vuex"
 import { useI18n } from "vue-i18n"
 import { isValidUrl } from "@/tool/util"
 export default defineComponent({
-    components:{
+	components: {},
    },
 	// emits:['putListData'],
-    props:['setReadStatus','setAllmessage','getHistory'],
+	props: ["setReadStatus", "setAllmessage", "getHistory"],
 	setup(prop, { emit }) {
 		const router = useRouter()
-        const store = useStore();
+		const store = useStore()
 		let accountMessage = reactive({
 			dataList: [],
 			page: 1,
 			size: 10,
 			isNoData: false,
-			isShowMark: false,
+			isShowMark: false
 		})
 		let loadingDom: any = ref(null)
 		let setmessageList = () => {
 			accountMessage.isShowMark = true
 			let data = {
 				page: accountMessage.page,
-				size: accountMessage.size,
+				size: accountMessage.size
 			}
-			prop.getHistory(data).then((rv:any)=>{
+			prop.getHistory(data)
 				.then((rv: any) => {
 					accountMessage.isShowMark = false
 					if (rv.content.length == 0) {
@@ -62,58 +87,67 @@ export default defineComponent({
 					} else {
 						rv.content.forEach((item: any) => {
 							item.content = JSON.parse(item.content)
-					});
+						})
 						accountMessage.dataList.push(...rv.content)
 					}
-			}).catch(() => {
+				})
 				.catch(() => {
 					accountMessage.isShowMark = false
 					accountMessage.isNoData = true
 				})
 		}
 		let setRead = (item: any) => {
-			prop.setReadStatus(item).then((rv:any)=>{
+			let content = item.content.content
 			if (isValidUrl(content)) {
 				if (import.meta.env.VITE_APP_BASE_URL === "https://develop.api.aida.com.hk") {
 					content += "&env=dev"
 				}
 				window.open(content, "_blank")
 			}
 			prop.setReadStatus(item)
 				.then((rv: any) => {
 					item.isRead = 1
 			}).catch((err:any)=>{
 				})
 				.catch((err: any) => {})
 		}
 		let allRead = () => {
 			// emit('setAllmessage')
-			prop.setAllmessage().then(()=>{
+			prop.setAllmessage()
 				.then(() => {
 					accountMessage.dataList.forEach((item: any) => {
 						item.isRead = 1
 					})
 			}).catch((err:any)=>{
 				})
 				.catch((err: any) => {})
 		}
 		// provide('exhibitionList',exhibitionList)
 		onMounted(() => {
 			accountMessage.isNoData = false
 			accountMessage.page = 0
-			let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
+			let imgParent: any = document.querySelector(".account_systemMessage .page_loading")
 			new IntersectionObserver(
 				(entries, observer) => {
 					// 如果不是相交，则直接返回
 					// console.log(entries[0]);
-					if (!entries[0].intersectionRatio) return;
+					if (!entries[0].intersectionRatio) return
 					accountMessage.page += 1
 					setmessageList()
-				},
+				}
 				// { root:worksPage }
-			).observe(loadingDom.value);
+			).observe(loadingDom.value)
 		})
 		return {
 			...toRefs(accountMessage),
 			setmessageList,
 			setRead,
 			allRead,
-		   loadingDom,
+			loadingDom
 		}
 	},
 	data() {
-        return{
+		return {}
 	}
    },
 })
 </script>
 <style lang="less" scoped>
@@ -133,7 +167,6 @@ export default defineComponent({
 			}
 			.modal_title_text_intro {
 				margin-left: 4rem;
 			}
 		}
 	}
--- a/src/component/Administrator/SE/allUser/index.vue
+++ b/src/component/Administrator/SE/allUser/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="admin_page">
+	<div class="admin_page all-user">
 	  <div class="admin_table_search">
 		<div class="admin_state">
 		  <div class="admin_state_item">
@@ -18,7 +18,18 @@
 		  </div>
 		  <div class="admin_state_item">
 			<span>{{ $t('admin.UserName') }}:</span>
-          <SelectUser v-model:value="ids" multiple valueKey="label" labelKey="email" />
+			<!-- <a-select
 			  v-model:value="ids"
 			  mode="multiple"
 			  style="width: 230px"
 			  :field-names="{ label: 'label', value: 'label' }"
 			  :filter-option="filterOption"
 			  :placeholder="$t('admin.selectUserName')"
 			  max-tag-count="responsive"
 			  :options="allUserList"
 			  @keydown.enter="gettrialList"
 			></a-select> -->
 			 <SelectUser v-model="ids" labelKey="label" valueKey="label" multiple />
 		  </div>
 		</div>
 		<div class="admin_search">
@@ -81,18 +92,11 @@
 			}"
 			@click="plan.status !== 'PENDING' && selectPlanFilter(plan.id)"
 		  >
          <a-tooltip v-if="plan.status === 'PENDING'">
            <template #title>{{ $t('admin.PlanStart') }} {{ plan.startTime }}</template>
            <span class="plan_name">{{ plan.name }}</span>
            <MoreOutlined class="plan_more_icon" />
          </a-tooltip>
          <template v-else>
 			<span class="plan_name">{{ plan.name }}</span>
 			<MoreOutlined
 			  class="plan_more_icon"
 			  @click.stop="plan.status !== 'PENDING' && openPlanRenameModal(plan)"
 			/>
          </template>
 		  </div>
 		</div>
 		<a-table
@@ -193,6 +197,9 @@ export default defineComponent({
 	  let filter: any = reactive({
 		dataList: [],
 		tableLoading: false,
 		allUserList: computed(() => {
 		  return store.state.adminPage.allUserList
 		}),
 		allCountry: [],
 		rowSelection: computed(() => {
 		  return {
@@ -432,9 +439,6 @@ export default defineComponent({
 		  organizationId: orgId,
 		  status: ['ACTIVE', 'PENDING']
 		}).then(res => {
        res.forEach(plan => {
          plan.startTime = formatTime(plan.currentPeriodStart, 'YYYY-MM-DD hh:mm:ss')
        })
 		  // 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个
 		  const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
 		  if (userSubscriptionPlanId && Array.isArray(res)) {
@@ -449,7 +453,6 @@ export default defineComponent({
 		  } else {
 			planFilterOptions.value = res
 		  }
        console.log(planFilterOptions.value)
 		})
 	  }
 	  // 监听组织ID，获取到值后再拉取订阅计划
@@ -766,4 +769,12 @@ export default defineComponent({
 	  }
 	}
  }
  .all-user {
 	.admin_table_content {
 	  :deep(.ant-table-wrapper) {
 		overflow: hidden;
 	  }
 	}
  }
  </style>
--- a/src/component/Administrator/Transaction/TransactionTable.vue
+++ b/src/component/Administrator/Transaction/TransactionTable.vue
@@ -148,6 +148,7 @@
                    total: total,
                    showQuickJumper: true,
                    bordered: false,
                    showTotal: (total) => `Total Transaction: ${total}`
                }"
            >
 				<template #bodyCell="{ column, text, record, index }">
@@ -465,13 +466,16 @@ export default defineComponent({
                (rv: any) => {
                    if (rv) {
                        // this.dataList = rv
                        // console.log('rv----',rv);
                        filter.dataList = rv.content;
                        filterData.total = rv.total;
                        filter.tableLoading = false;
-                        filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
+                        filterData.totalPayer = rv.totalAmount;
-                            const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
+                        // filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
-                            return total + (isNaN(value) ? 0 : value);
+                        //     const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
-                        }, 0);
+                        //     return total + (isNaN(value) ? 0 : value);
                        // }, 0);
                        // this.workspaceItem.position = this.singleTypeList[0].label
                    }
--- a/src/component/Administrator/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -8,16 +8,11 @@
 						style="width: 250px"
 						class="range_picker"
 						v-model:value="rangePickerValue"
-                        :placeholder="[
+						:placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]"
                            $t('HistoryPage.StartDate'),
                            $t('HistoryPage.EndDate'),
                        ]"
 						valueFormat="YYYY-MM-DD"
 					>
 						<template #suffixIcon>
-                            <span
+							<span class="icon iconfont range_picker_icon icon-rili"></span>
                                class="icon iconfont range_picker_icon icon-rili"
                            ></span>
 						</template>
 					</a-range-picker>
 				</div>
@@ -63,38 +58,50 @@
 						show-search
 					></a-select>
 				</div>
 				<div class="admin_state_item">
 					<span>Orgnization:</span>
 					<a-select
 						v-model:value="organizationId"
 						placeholder="Select the organization"
 						allow-clear
 						style="width: 250px"
 						@popupScroll="handleOrganizationScroll"
 					>
 						<a-select-option
 							v-for="item in organizationOptions"
 							:key="item.id"
 							:value="item.id"
 						>
 							{{ item.name }}
 						</a-select-option>
 					</a-select>
 				</div>
 			</div>
 			<div class="admin_search">
-                <div class="admin_search_item" @click="searchHistoryList" :style="{height:isAwayOrUnfold?'4rem':''}">
+				<div
 					class="admin_search_item"
 					@click="searchHistoryList"
 					:style="{ height: isAwayOrUnfold ? '4rem' : '' }"
 				>
 					Search
 				</div>
-                <div class="admin_search_item" @click="addhHistoryList">
+				<div class="admin_search_item" @click="addhHistoryList">Add</div>
                    Add
                </div>
 			</div>
 			<div class="admin_state_list">
-                <div
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">
                    class="admin_state_list_item"
                    @click="lastGeTrialList('year')"
                >
 					Nearly a year
 				</div>
-                <div
+				<div class="admin_state_list_item" @click="lastGeTrialList('month')">
                    class="admin_state_list_item"
                    @click="lastGeTrialList('month')"
                >
 					Last month
 				</div>
-                <div
+				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
                    class="admin_state_list_item"
                    @click="lastGeTrialList('week')"
                >
                    Last week
                </div>
 			</div>
 		</div>
 		<div class="awayOrUnfold" :class="{ active: isAwayOrUnfold }">
-			<span class="icon iconfont menu_icon icon-xiala" @click="()=>isAwayOrUnfold = !isAwayOrUnfold"></span>
+			<span
 				class="icon iconfont menu_icon icon-xiala"
 				@click="() => (isAwayOrUnfold = !isAwayOrUnfold)"
 			></span>
 		</div>
 		<div class="admin_table_content" ref="historyTable">
 			<a-table
@@ -104,24 +111,19 @@
 				:data-source="dataList"
 				:scroll="{ y: historyTableHeight }"
 				@change="changePage"
-				:showSorterTooltip='false'
+				:showSorterTooltip="false"
 				:pagination="{
 					showSizeChanger: true,
 					current: currentPage,
 					pageSize: pageSize,
 					total: total,
 					showQuickJumper: true,
-                    bordered: false,
+					bordered: false
 				}"
 			>
 				<template #bodyCell="{ column, text, record, index }">
 					<div class="operate_list" v-if="column?.Operations">
-                        <div
+						<div class="operate_item" @click="setAagree(record)">Edit</div>
                            class="operate_item"
                            @click="setAagree(record)"
                        >
                            Edit
                        </div>
 						<!-- <div
 							class="operate_item"
 							@click="deleteGroup(record, index)"
@@ -132,24 +134,19 @@
 				</template>
 			</a-table>
 		</div>
-		<allUserPoerationsVue ref="allUserPoerationsVue" @searchHistoryList="searchHistoryList"></allUserPoerationsVue>
+		<allUserPoerationsVue
 			ref="allUserPoerationsVue"
 			@searchHistoryList="searchHistoryList"
 		/>
 	</div>
 </template>
 <script lang="ts">
-import {
+import { defineComponent, ref, createVNode, computed, reactive, toRefs, onMounted } from "vue"
-    defineComponent,
+import { formatTime } from "@/tool/util"
-    ref,
+import { useStore } from "vuex"
-    createVNode,
+import { Https } from "@/tool/https"
-    computed,
+import allUserPoerationsVue from "./allUserPoerations.vue"
-    reactive,
+import SelectUser from "@/component/common/SelectUser.vue"
    toRefs,
    onMounted,
 } from "vue";
 import { formatTime } from "@/tool/util";
 import { useStore } from "vuex";
 import { Https } from "@/tool/https";
 import allUserPoerationsVue from "./allUserPoerations.vue";
 import SelectUser from '@/component/common/SelectUser.vue'
 export default defineComponent({
 	components: { allUserPoerationsVue, SelectUser },
 	setup() {
@@ -159,7 +156,7 @@ export default defineComponent({
 			tableLoading: false,
 			allCountry: [],
 			isAwayOrUnfold: false
-        });
+		})
 		let filterData: any = reactive({
 			rangePickerValue: [],
 			currentPage: 1,
@@ -172,40 +169,41 @@ export default defineComponent({
 			occupation: "",
 			systemUser: "",
 			order: "", //'Ascending  升序 Descending 降序'
-			orderBy:'',
+			orderBy: "",
 			userName: "",
-        });
+			organizationId: null
 		})
 		let state: any = ref([
 			{
 				label: "all",
-                value: "",
+				value: ""
 			},
 			{
-				label:'visitor',
+				label: "visitor",
-				value:'0',
+				value: "0"
 			},
 			{
-				label:'yearly',
+				label: "yearly",
-				value:'1',
+				value: "1"
 			},
 			{
-				label:'monthly',
+				label: "monthly",
-				value:'2',
+				value: "2"
 			},
 			{
-				label:'trial',
+				label: "trial",
-				value:'3',
+				value: "3"
 			},
 			{
 				label: "userInEvent",
-                value: "4",
+				value: "4"
 			},
 			{
 				label: "Edu Admin",
-                value: "7",
+				value: "7"
-            },
+			}
-        ]);
+		])
-        let renameData: any = ref({}); //修改名字选中的数据
+		let renameData: any = ref({}) //修改名字选中的数据
 		const columns: any = computed(() => {
 			return [
 				{
@@ -215,7 +213,7 @@ export default defineComponent({
 					key: "id",
 					width: 100,
 					fixed: "left",
-					sorter: true,
+					sorter: true
 				},
 				{
 					title: "Email",
@@ -246,7 +244,7 @@ export default defineComponent({
 					dataIndex: "language",
 					key: "language",
 					width: 100,
-					ellipsis:true,
+					ellipsis: true
 				},
 				{
 					title: "Valid Start Time",
@@ -256,12 +254,12 @@ export default defineComponent({
 					width: 200,
 					ellipsis: true,
 					customRender: (record: any) => {
-						let time = ''
+						let time = ""
 						if (record.text) {
-							time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+							time = formatTime(record.text / 1000, "YYYY-MM-DD hh:mm:ss")
 						}
 						return time
-                    },
+					}
 				},
 				{
 					title: "Valid End Time",
@@ -271,19 +269,19 @@ export default defineComponent({
 					width: 200,
 					ellipsis: true,
 					customRender: (record: any) => {
-						let time = ''
+						let time = ""
 						if (record.text) {
-							time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+							time = formatTime(record.text / 1000, "YYYY-MM-DD hh:mm:ss")
 						}
 						return time
-                    },
+					}
 				},
 				{
 					title: "Country or Region",
 					align: "center",
 					dataIndex: "country",
 					key: "country",
-					width:200,
+					width: 200
 				},
 				{
 					title: "Create Date",
@@ -291,7 +289,7 @@ export default defineComponent({
 					dataIndex: "createDate",
 					key: "createDate",
 					width: 200,
-					sorter: true,
+					sorter: true
 				},
 				{
 					title: "Is Beginner",
@@ -301,21 +299,21 @@ export default defineComponent({
 					width: 80,
 					ellipsis: true,
 					customRender: (record: any) => {
-                        let str;
+						let str
 						if (record.value == 1) {
-                            str = "Yes";
+							str = "Yes"
 						} else {
-                            str = "No";
+							str = "No"
 						}
 						return str
 					}
                        return str;
                    },
 				},
 				{
-                    title: 'Machine Room Ip',
+					title: "Machine Room Ip",
 					align: "center",
 					dataIndex: "browserIdentifiers",
 					key: "browserIdentifiers",
-					width:200,
+					width: 200
 				},
 				{
 					title: "Credits",
@@ -327,10 +325,10 @@ export default defineComponent({
 					dataIndex: "credits",
 					key: "credits",
 					width: 100,
-					sorter: true,
+					sorter: true
 				},
 				{
-                    title: 'User Type',
+					title: "User Type",
 					align: "center",
 					// width: 150,
 					// minWidth: 100,
@@ -340,22 +338,22 @@ export default defineComponent({
 					key: "systemUser",
 					width: 100,
 					customRender: (record: any) => {
-                        let str;
+						let str
 						if (record.value == 0) {
-                            str = "visitor";
+							str = "visitor"
 						} else if (record.value == 1) {
-                            str = "yearly";
+							str = "yearly"
 						} else if (record.value == 2) {
-                            str = "monthly";
+							str = "monthly"
 						} else if (record.value == 3) {
-                            str = "trial";
+							str = "trial"
 						} else if (record.value == 4) {
-                            str = "userInEvent";
+							str = "userInEvent"
 						} else if (record.value == 7) {
-                            str = "Edu Admin";
+							str = "Edu Admin"
 						}
 						return str
 					}
                        return str;
                    },
 				},
 				{
 					title: "Operations",
@@ -364,58 +362,58 @@ export default defineComponent({
 					align: "center",
 					fixed: "right",
 					// slots:{customRender:'action'}
-                    Operations: true,
+					Operations: true
-                },
+				}
-            ];
+			]
-        });
+		})
 		//改变页码
 		let changePage = (e: any, filters: any, sorter: any) => {
-            filterData.currentPage = e.current;
+			filterData.currentPage = e.current
-            filterData.pageSize = e.pageSize;
+			filterData.pageSize = e.pageSize
 			if (sorter.order) {
-				if(sorter.columnKey == 'id'){
+				if (sorter.columnKey == "id") {
-					filterData.orderBy = 'id'
+					filterData.orderBy = "id"
 				} else if (sorter.columnKey == "createDate") {
-					filterData.orderBy = 'time'
+					filterData.orderBy = "time"
 				} else if (sorter.columnKey == "credits") {
-					filterData.orderBy = 'credits'
+					filterData.orderBy = "credits"
 				}
 			}
 			if (sorter.order) {
-				filterData.order = sorter.order == "descend" ? "Descending" : "Ascending";
+				filterData.order = sorter.order == "descend" ? "Descending" : "Ascending"
 			} else {
-				filterData.order = ''
+				filterData.order = ""
 			}
 			gettrialList()
 		}
            gettrialList();
        };
 		//查询列表
 		let searchHistoryList = () => {
-            filterData.currentPage = 1;
+			filterData.currentPage = 1
-            gettrialList();
+			gettrialList()
-        };
+		}
 		let clearHistoryList = () => {
-            filterData.rangePickerValue = [],
+			;((filterData.rangePickerValue = []),
-			filterData.currentPage = 1,
+				(filterData.currentPage = 1),
-			filterData.pageSize = 10,
+				(filterData.pageSize = 10),
-			filterData.total = 0,
+				(filterData.total = 0),
-			filterData.country = "",
+				(filterData.country = ""),
-			filterData.email = "",
+				(filterData.email = ""),
-			filterData.userType = "",
+				(filterData.userType = ""),
-			filterData.ids = [],
+				(filterData.ids = []),
-			filterData.occupation = "",
+				(filterData.occupation = ""),
-			filterData.order = "", //'Ascending  升序 Descending 降序'
+				(filterData.order = ""), //'Ascending  升序 Descending 降序'
-			filterData.orderBy = "", //'Ascending  升序 Descending 降序'
+				(filterData.orderBy = ""), //'Ascending  升序 Descending 降序'
-			filterData.systemUser = "",
+				(filterData.systemUser = ""),
-			filterData.userName = "";
+				(filterData.userName = ""))
-        };
+		}
 		let setHistoryListData = () => {
 			let startDate: any = filterData.rangePickerValue?.[0]
 				? filterData.rangePickerValue[0] + " " + "00:00:00"
-                : "";
+				: ""
 			let endDate: any = filterData.rangePickerValue?.[1]
 				? filterData.rangePickerValue[1] + " " + "23:59:59"
-                : "";
+				: ""
 			let data = {
 				endTime: endDate,
 				startTime: startDate,
@@ -430,63 +428,118 @@ export default defineComponent({
 				order: filterData.order,
 				orderBy: filterData.orderBy,
 				userName: filterData.userName,
-            };
+				organizationId: filterData.organizationId
-            return data;
+			}
-        };
+			return data
 		}
 		//获取列表
 		let gettrialList = () => {
-            filter.tableLoading = true;
+			filter.tableLoading = true
-            let data = setHistoryListData();
+			let data = setHistoryListData()
-            Https.axiosPost(Https.httpUrls.getUserInfo, data).then(
+			Https.axiosPost(Https.httpUrls.getUserInfo, data).then((rv: any) => {
                (rv: any) => {
 				if (rv) {
 					// this.dataList = rv
-                        filter.dataList = rv.records;
+					filter.dataList = rv.records
-                        filterData.total = rv.total;
+					filterData.total = rv.total
-                        filter.tableLoading = false;
+					filter.tableLoading = false
 					// this.workspaceItem.position = this.singleTypeList[0].label
 				}
 			})
 		}
            );
        };
 		let lastGeTrialList = (str: string) => {
-            clearHistoryList();
+			clearHistoryList()
-            let currentDate = new Date();
+			let currentDate = new Date()
-            let currentTimestamp = Math.floor(currentDate.getTime() / 1000);
+			let currentTimestamp = Math.floor(currentDate.getTime() / 1000)
 			// 计算30天前的时间戳
-            let thirtyDaysAgoTimestamp;
+			let thirtyDaysAgoTimestamp
 			if (str == "year") {
-                thirtyDaysAgoTimestamp = currentTimestamp - 360 * 24 * 60 * 60;
+				thirtyDaysAgoTimestamp = currentTimestamp - 360 * 24 * 60 * 60
 			} else if (str == "month") {
-                thirtyDaysAgoTimestamp = currentTimestamp - 30 * 24 * 60 * 60;
+				thirtyDaysAgoTimestamp = currentTimestamp - 30 * 24 * 60 * 60
 			} else if (str == "week") {
-                thirtyDaysAgoTimestamp = currentTimestamp - 7 * 24 * 60 * 60;
+				thirtyDaysAgoTimestamp = currentTimestamp - 7 * 24 * 60 * 60
 			}
 			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp, "YYYY-MM-DD")
 			gettrialList()
 		}
            filterData.rangePickerValue[0] = formatTime(
                thirtyDaysAgoTimestamp,
                "YYYY-MM-DD"
            );
            gettrialList();
        };
 		let filterOption = (input: any, option: any) => {
 			// 使用 option.label 进行搜索
-            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+			return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        };
+		}
 		let addhHistoryList = () => {
-			allUserPoerationsVue.value.init('Add','')
+			allUserPoerationsVue.value.init("Add", "")
-		};
+		}
 		let allUserPoerationsVue = ref()
 		let setAagree = (data: any) => {
-			allUserPoerationsVue.value.init('Edit',data)
+			allUserPoerationsVue.value.init("Edit", data)
 		}
 		const organizationOptions = ref([])
 		const organizationParams = reactive({
 			page: 1,
 			size: 10,
 			total: 0
 		})
 		const organizationLoading = ref(false)
 		const getOrganizationList = async (isLoadMore = false) => {
 			console.log("111111")
 			if (organizationLoading.value) return
 			if (isLoadMore) {
 				const loaded = organizationParams.page * organizationParams.size
 				if (organizationParams.total && loaded >= organizationParams.total) return
 				organizationParams.page += 1
 			} else {
 				organizationParams.page = 1
 				organizationOptions.value = []
 			}
 			organizationLoading.value = true
 			try {
 				const { total, ...requestParams } = organizationParams
 				const rv: any = await Https.axiosPost(
 					Https.httpUrls.queryOrganization,
 					requestParams
 				)
 				if (rv) {
 					const newRecords = rv.records || []
 					// 遍历新数据，如果已存在则覆盖，不存在则追加
 					newRecords.forEach((newOrg: any) => {
 						const newOrgId = String(newOrg.id)
 						const existingIndex = organizationOptions.value.findIndex(
 							(org: any) => String(org.id) === newOrgId
 						)
 						if (existingIndex !== -1) {
 							// 如果已存在，用新数据覆盖旧项
 							organizationOptions.value[existingIndex] = newOrg
 						} else {
 							// 如果不存在，追加到末尾
 							organizationOptions.value.push(newOrg)
 						}
 					})
 					organizationParams.total = rv.total || 0
 				}
 			} finally {
 				organizationLoading.value = false
 			}
 		}
 		const handleOrganizationScroll = (e: any) => {
 			const target = e?.target
 			if (!target) return
 			const nearBottom = target.scrollTop + target.clientHeight >= target.scrollHeight - 20
 			if (nearBottom) {
 				getOrganizationList(true)
 			}
 		}
 		onMounted(() => {
-			let allCountry: any = sessionStorage.getItem("allCountry");
+			let allCountry: any = sessionStorage.getItem("allCountry")
 			if (allCountry) {
-                filter.allCountry = JSON.parse(allCountry);
+				filter.allCountry = JSON.parse(allCountry)
 			}
-            gettrialList();
+			gettrialList()
-        });
+			getOrganizationList()
 		})
 		return {
 			...toRefs(filter),
 			...toRefs(filterData),
@@ -501,22 +554,26 @@ export default defineComponent({
 			filterOption,
 			allUserPoerationsVue,
 			setAagree,
-        };
+			handleOrganizationScroll,
 			getOrganizationList,
 			organizationOptions,
 			organizationParams
 		}
 	},
 	data() {
 		return {
 			historyTableHeight: 0,
 			handleResizeColumn: (w: any, col: any) => {
-                col.width = w;
+				col.width = w
-            },
+			}
-        };
+		}
 	},
 	mounted() {
-        let historyTable: any = this.$refs.historyTable;
+		let historyTable: any = this.$refs.historyTable
-        this.historyTableHeight = historyTable.clientHeight - 200;
+		this.historyTableHeight = historyTable.clientHeight - 200
 	},
-    methods: {},
+	methods: {}
-});
+})
 </script>
 <style lang="less" scoped>
 .admin_page .admin_table_search .admin_state {
@@ -524,6 +581,5 @@ export default defineComponent({
 	flex-wrap: wrap;
 }
 .admin_page {
 }
 </style>
--- a/src/component/Administrator/allUserPoerations.vue
+++ b/src/component/Administrator/allUserPoerations.vue
@@ -321,6 +321,7 @@ export default defineComponent({
        data = setEditData()
        if (!data.userName || !data.userEmail || !data.validEndTime || !data.systemUser)
          return message.warning('Please check the input box marked with *')
 		delete data.userName
        Https.axiosPost(Https.httpUrls.modifyUser, {}, { params: data }).then(rv => {
          if (rv) {
            cancelDsign()
--- a/src/component/Administrator/globalAwardPopularity.vue
+++ b/src/component/Administrator/globalAwardPopularity.vue
@@ -0,0 +1,99 @@
 <template>
    <div class="admin_page globalAwardPopularity" ref="adminPage">
        <div class="admin_table_search">
 			<div class="admin_state">
 				<div class="admin_state_item">
 					<span>Current Time:</span>
 					<span>{{ currentTimeStr }}</span>
 				</div>
 				<div class="admin_state_item">
 					<span>Raw Visi Count:</span>
 					<span>{{ rawVisitCount }}</span>
 				</div>
 				<div class="admin_state_item">
 					<span>Unique Visit Count:</span>
 					<span>{{ uniqueVisitCount }}</span>
 				</div>
 			</div>
 			<div class="admin_search">
 				<div class="admin_search_item" @click="getGlobalAwardPopularity">
 					<i class="fi fi-br-refresh"></i>
 				</div>
 			</div>
 		</div>
        <!-- <div class="admin_table_content" ref="questionnaireTable">
        </div> -->
    </div>
 </template>
 <script lang="ts">
 import { defineComponent, ref, createVNode,toRefs, computed,reactive, onMounted, nextTick } from "vue";
 import { Https } from "@/tool/https";
 import type { TableColumnsType } from 'ant-design-vue';
 export default defineComponent({
    components: {},
    setup() {
 		const currentTime = ref(new Date())
 		const currentTimeStr = computed(()=>{
 			return currentTime.value.toLocaleString()
 		})
 		const rawVisitCount = ref(0)
 		const uniqueVisitCount = ref(0)
 		const getGlobalAwardPopularity = () => {
 			Https.axiosGet(Https.httpUrls.getGlobalAwardPopularity,).then((rv)=>{
 				currentTime.value = new Date()
 				rawVisitCount.value = rv.rawVisitCount
 				uniqueVisitCount.value = rv.uniqueVisitCount
 			})
        }
 		onMounted(()=>{
 			getGlobalAwardPopularity()
 		})
        return {
 			currentTimeStr,
 			getGlobalAwardPopularity,
 			rawVisitCount,
 			uniqueVisitCount,
 		};
    },
    data() {
        return {
 		};
    },
    mounted() {
 	},
    methods: {},
 });
 </script>
 <style lang="less" scoped>
 .admin_page.globalAwardPopularity{
 	.admin_table_search{
 		// flex: 1;
 		width: min-content;
 		justify-content: flex-start;
 		border-radius: 2rem;
 		box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
 		margin-left: 2rem;
 		flex-wrap: nowrap;
 		gap: 3rem;
 	}
 	.admin_state{
 		flex-direction: column;
 		width: auto;
 		cursor: auto;
 		.admin_state_item{
 			> span{
 				font-size: 2rem;
 			}
 		}
 	}
 	.admin_search{
 		i{
 			display: flex;
 		}
 	}
 }
 </style>
--- a/src/component/Administrator/subscriptionPlan.vue
+++ b/src/component/Administrator/subscriptionPlan.vue
@@ -5,8 +5,8 @@
 				class="search-form"
 				layout="inline"
 				:model="searchForm"
-        :label-col="{ style: { width: '12rem' } }"
+				:label-col="{ style: { width: '14rem' } }"
-        :wrapper-col="{ style: { width: '22rem' } }"
+				:wrapper-col="{ style: { width: '20rem' } }"
 			>
 				<a-form-item label="ID">
 					<a-input v-model:value="searchForm.id" allow-clear placeholder="Input the id" />
@@ -72,7 +72,7 @@
 						:options="countryList"
 					/>
 				</a-form-item>
-        <a-form-item>
+				<a-form-item class="search-form__actions">
 					<a-space>
 						<a-button type="primary" @click="handleSearch">Search</a-button>
 						<a-button @click="handleReset">Reset</a-button>
@@ -92,6 +92,7 @@
 					:loading="tableLoading"
 					:bordered="false"
 					row-key="id"
 					:customRow="customPlanRow"
 					@change="changePage"
 					@resizeColumn="handleResizeColumn"
 					:scroll="{ y: historyTableHeight }"
@@ -107,10 +108,11 @@
 					<template #bodyCell="{ column, record }">
 						<template
 							v-if="
-                column.key === 'currentPeriodStart' || column.key === 'currentPeriodEnd'
+								column.key === 'currentPeriodStart' ||
 								column.key === 'currentPeriodEnd'
 							"
 						>
-              {{ formatTime(record[column.key], 'YYYY-MM-DD hh:mm:ss') }}
+							{{ formatTime(record[column.key], "YYYY-MM-DD hh:mm:ss") }}
 						</template>
 						<template v-if="column.key === 'status'">
@@ -120,15 +122,15 @@
 						</template>
 						<template v-else-if="column.key === 'actions'">
-              <a-space>
+							<a-space class="plan-row-actions" @click.stop>
-                <a @click="openEdit(record)">Edit</a>
+								<a @click.stop="openEdit(record)">Edit</a>
 								<a-popconfirm
 									title="Confirm to delete this subscription plan?"
 									ok-text="Confirm"
 									cancel-text="Cancel"
 									@confirm="removePlan(record.id)"
 								>
-                  <a class="danger-text">Delete</a>
+									<a class="danger-text" @click.stop>Delete</a>
 								</a-popconfirm>
 							</a-space>
 						</template>
@@ -137,6 +139,50 @@
 			</div>
 		</a-card>
 		<a-modal
 			v-model:visible="userInfoModalVisible"
 			title="User Info"
 			width="80%"
 			:footer="null"
 			:destroy-on-close="true"
 			class="user-info-modal"
 		>
 			<a-table
 				:columns="userInfoColumns"
 				:data-source="userInfoList"
 				:loading="userInfoLoading"
 				:pagination="{
 					showSizeChanger: true,
 					current: userInfoPage.current,
 					pageSize: userInfoPage.size,
 					total: userInfoPage.total,
 					showQuickJumper: true,
 					bordered: false
 				}"
 				row-key="id"
 				:scroll="{ x: 1280, y: 420 }"
 				@change="changeUserInfoPage"
 			>
 				<template #bodyCell="{ column, record }">
 					<template
 						v-if="
 							column.key === 'validStartTime' ||
 							column.key === 'validEndTime' ||
 							column.key === 'createDate'
 						"
 					>
 						{{ formatUserTime(record[column.key]) }}
 					</template>
 					<template v-else-if="column.key === 'systemUser'">
 						{{ getSystemUserLabel(record.systemUser) }}
 					</template>
 					<template v-else-if="column.key === 'isBeginner'">
 						{{ record.isBeginner == 1 ? "Yes" : "No" }}
 					</template>
 				</template>
 			</a-table>
 		</a-modal>
 		<div class="subscriptionPlanModal" ref="subscriptionPlanModal"></div>
 		<a-modal
 			class="subscriptionPlan_modal generalModel"
@@ -213,7 +259,10 @@
 							@select="handleOrganizationSelect"
 							@change="handleOrganizationChange"
 						>
-              <a-select-option value="ADD_ORGANIZATION" class="add-organization-option">
+							<a-select-option
 								value="ADD_ORGANIZATION"
 								class="add-organization-option"
 							>
 								+ Create Organization
 							</a-select-option>
 							<a-select-option
@@ -393,27 +442,30 @@ import {
 		ref,
 		onMounted,
 		onBeforeUnmount,
 		onActivated,
 		computed,
 		nextTick,
 		useTemplateRef
-} from 'vue'
+	} from "vue"
-import SelectUser from '@/component/common/SelectUser.vue'
+	import SelectUser from "@/component/common/SelectUser.vue"
-import { message } from 'ant-design-vue'
+	import { message } from "ant-design-vue"
-import { Https } from '@/tool/https'
+	import { Https } from "@/tool/https"
-import { formatTime } from '@/tool/util'
+	import { formatTime } from "@/tool/util"
-import store from '@/store'
+	import store from "@/store"
-import type { FormInstance, Rule } from 'ant-design-vue/es/form'
+	import type { FormInstance, Rule } from "ant-design-vue/es/form"
-import { debounce } from 'lodash-es'
+	import { debounce } from "lodash-es"
-import dayjs, { Dayjs } from 'dayjs'
+	import dayjs, { Dayjs } from "dayjs"
-type PlanStatus = 'PENDING' | 'ACTIVE' | 'EXPIRED'
+	type PlanStatus = "PENDING" | "ACTIVE" | "EXPIRED"
 	interface SubscriptionPlan {
 		id: number
 		userId?: string | number
 		name: string
 		currentPeriodStart: string
 		currentPeriodEnd: string
 		organizationId: string
 		adminAccId: string
 		adminAccEmail?: string
 		status: PlanStatus
 		creditLimit: number
 		accountNum?: number
@@ -421,17 +473,32 @@ interface SubscriptionPlan {
 		endStamp: number
 	}
 	interface UserInfoRecord {
 		id: number
 		userEmail?: string
 		userName?: string
 		language?: string
 		validStartTime?: number | string
 		validEndTime?: number | string
 		country?: string
 		createDate?: number | string
 		isBeginner?: number
 		browserIdentifiers?: string
 		credits?: number
 		systemUser?: number | string
 	}
 	const countryList = ref([])
 	const userRef = ref(null)
 	const searchForm = reactive({
-  name: '',
+		name: "",
-  startTime: '',
+		startTime: "",
-  endTime: '',
+		endTime: "",
 		organizationId: undefined as string | undefined,
 		adminAccId: undefined as string | undefined,
 		status: [] as PlanStatus[] | [],
-  id: '',
+		id: "",
 		countryOrRegion: null,
 		page: 1,
 		size: 10,
@@ -442,15 +509,24 @@ const toSeconds = (dateStr: string) => Math.floor(new Date(dateStr).getTime() /
 	const tableData = ref<SubscriptionPlan[]>([])
 	const tableLoading = ref(false)
 	const userInfoModalVisible = ref(false)
 	const userInfoLoading = ref(false)
 	const userInfoList = ref<UserInfoRecord[]>([])
 	const currentUserInfoPlanId = ref<string | number | null>(null)
 	const userInfoPage = reactive({
 		current: 1,
 		size: 10,
 		total: 0
 	})
 	const modalVisible = ref(false)
 	const confirmLoading = ref(false)
-const modalTitle = ref('New Subscription Plan')
+	const modalTitle = ref("New Subscription Plan")
 	const isEditMode = ref(false)
 	const formState = reactive({
-  name: '',
+		name: "",
-  currentPeriodStart: '',
+		currentPeriodStart: "",
-  currentPeriodEnd: '',
+		currentPeriodEnd: "",
 		organizationId: undefined as string | undefined,
 		adminAccId: undefined as string | undefined,
 		creditLimit: null as number | null,
@@ -461,44 +537,44 @@ const formState = reactive({
 	const organizationModalVisible = ref(false)
 	const organizationForm = reactive({
-  name: '',
+		name: "",
 		type: undefined as string | undefined
 	})
 	const statusLabelMap: Record<PlanStatus, string> = {
-  PENDING: 'Pending',
+		PENDING: "Pending",
-  ACTIVE: 'Active',
+		ACTIVE: "Active",
-  EXPIRED: 'Expired'
+		EXPIRED: "Expired"
 	}
 	const statusColorMap: Record<PlanStatus, string> = {
-  PENDING: 'blue',
+		PENDING: "blue",
-  ACTIVE: 'green',
+		ACTIVE: "green",
-  EXPIRED: 'red'
+		EXPIRED: "red"
 	}
 	const statusOption = ref([
 		{
-    label: 'Pending',
+			label: "Pending",
-    value: 'PENDING'
+			value: "PENDING"
 		},
 		{
-    label: 'Active',
+			label: "Active",
-    value: 'ACTIVE'
+			value: "ACTIVE"
 		},
 		{
-    label: 'Expired',
+			label: "Expired",
-    value: 'EXPIRED'
+			value: "EXPIRED"
 		}
 	])
 	const disabledDate = (current: Dayjs) => {
-  return current && current < dayjs().subtract(1, 'days').endOf('day')
+		return current && current < dayjs().subtract(1, "days").endOf("day")
 	}
 	const disableEndDate = (current: Dayjs) => {
 		if (isEditMode.value) {
 			const specificTime = dayjs(formState.currentPeriodEnd)
-    return current && current < dayjs(formState.currentPeriodEnd * 1000).startOf('day')
+			return current && current < dayjs(formState.currentPeriodEnd * 1000).startOf("day")
 		}
 		return disabledDate(current)
 	}
@@ -509,7 +585,7 @@ const range = (start: number, end: number) => {
 		}
 		return result
 	}
-const disableEndTime = date => {
+	const disableEndTime = (date) => {
 		if (!formState.currentPeriodEnd || !isEditMode.value)
 			return {
 				disabledHours: () => [],
@@ -519,7 +595,7 @@ const disableEndTime = date => {
 		const specificTime = dayjs.unix(formState.currentPeriodEnd)
-  if (date && date.isSame(specificTime, 'day')) {
+		if (date && date.isSame(specificTime, "day")) {
 			// 如果是指定日期当天，禁用时间戳之前的时间
 			const hour = specificTime.hour()
 			const minute = specificTime.minute()
@@ -527,7 +603,7 @@ const disableEndTime = date => {
 			return {
 				disabledHours: () => Array.from({ length: hour }, (_, i) => i), // 禁用小时之前
-      disabledMinutes: selectedHour => {
+				disabledMinutes: (selectedHour) => {
 					if (selectedHour === hour) {
 						return Array.from({ length: minute }, (_, i) => i) // 同小时，禁用分钟之前
 					}
@@ -555,114 +631,328 @@ const normalizeStatus = (status?: string): PlanStatus | undefined => {
 		return upper
 	}
 	const getStatusColor = (status?: string) =>
-  statusColorMap[normalizeStatus(status) as PlanStatus] || 'default'
+		statusColorMap[normalizeStatus(status) as PlanStatus] || "default"
 	const columns = [
-  { title: 'Name', dataIndex: 'name', key: 'name', align: 'center', width: 180 },
+		{ title: "Name", dataIndex: "name", key: "name", align: "center", width: 180 },
-  { title: 'ID', dataIndex: 'id', key: 'id', align: 'center', width: 80 },
+		{ title: "ID", dataIndex: "id", key: "id", align: "center", width: 80 },
 		{
-    title: 'Organization',
+			title: "Organization",
-    dataIndex: 'organizationName',
+			dataIndex: "organizationName",
-    key: 'organizationName',
+			key: "organizationName",
-    align: 'center',
+			align: "center",
 			width: 180
 		},
 		{
-    title: 'Admin Account',
+			title: "Admin Account",
-    dataIndex: 'adminAccEmail',
+			dataIndex: "adminAccEmail",
-    key: 'adminAccEmail',
+			key: "adminAccEmail",
-    align: 'center',
+			align: "center",
 			width: 180,
 			ellipsis: true
 		},
 		{
-    title: 'Sub-Account Num',
+			title: "Sub-Account Num",
-    dataIndex: 'accountNum',
+			dataIndex: "accountNum",
-    key: 'accountNum',
+			key: "accountNum",
-    align: 'center',
+			align: "center",
 			width: 120,
 			ellipsis: true
 		},
 		{
-    title: 'Country or Region',
+			title: "Country or Region",
-    dataIndex: 'countryOrRegion',
+			dataIndex: "countryOrRegion",
-    key: 'countryOrRegion',
+			key: "countryOrRegion",
-    align: 'center',
+			align: "center",
 			width: 120,
 			ellipsis: true
 		},
 		{
-    title: 'Start Time',
+			title: "Start Time",
-    dataIndex: 'currentPeriodStart',
+			dataIndex: "currentPeriodStart",
-    key: 'currentPeriodStart',
+			key: "currentPeriodStart",
-    align: 'center',
+			align: "center",
 			width: 200
 		},
 		{
-    title: 'End Time',
+			title: "End Time",
-    dataIndex: 'currentPeriodEnd',
+			dataIndex: "currentPeriodEnd",
-    key: 'currentPeriodEnd',
+			key: "currentPeriodEnd",
-    align: 'center',
+			align: "center",
 			width: 200
 		},
-  { title: 'Status', dataIndex: 'status', key: 'status', align: 'center', width: 100 },
+		{ title: "Status", dataIndex: "status", key: "status", align: "center", width: 100 },
 		{
-    title: 'Credit Limit',
+			title: "Credit Limit",
-    dataIndex: 'creditLimit',
+			dataIndex: "creditLimit",
-    key: 'creditLimit',
+			key: "creditLimit",
-    align: 'center',
+			align: "center",
 			width: 120
 		},
-  { title: 'Operations', key: 'actions', width: 160, align: 'center', fixed: 'right' }
+		{ title: "Operations", key: "actions", width: 160, align: "center", fixed: "right" }
 	]
-const historyTable = ref()
+	const userInfoColumns = [
 		{ title: "User Id", dataIndex: "id", key: "id", align: "center", width: 100 },
 		{
 			title: "Email",
 			dataIndex: "userEmail",
 			key: "userEmail",
 			align: "center",
 			width: 200,
 			ellipsis: true
 		},
 		{
 			title: "User Name",
 			dataIndex: "userName",
 			key: "userName",
 			align: "center",
 			width: 150,
 			ellipsis: true
 		},
 		{
 			title: "Valid Start Time",
 			dataIndex: "validStartTime",
 			key: "validStartTime",
 			align: "center",
 			width: 200
 		},
 		{
 			title: "Valid End Time",
 			dataIndex: "validEndTime",
 			key: "validEndTime",
 			align: "center",
 			width: 200
 		},
 		{
 			title: "Country or Region",
 			dataIndex: "country",
 			key: "country",
 			align: "center",
 			width: 180,
 			ellipsis: true
 		},
 		{
 			title: "Credits",
 			dataIndex: "credits",
 			key: "credits",
 			align: "center",
 			width: 100
 		},
 		{
 			title: "User Type",
 			dataIndex: "systemUser",
 			key: "systemUser",
 			align: "center",
 			width: 120
 		}
 	]
 	const systemUserLabelMap: Record<string, string> = {
 		"0": "visitor",
 		"1": "yearly",
 		"2": "monthly",
 		"3": "trial",
 		"4": "userInEvent",
 		"7": "Edu Admin"
 	}
 	const getSystemUserLabel = (systemUser?: number | string) => {
 		if (systemUser === undefined || systemUser === null) return ""
 		return systemUserLabelMap[String(systemUser)] || String(systemUser)
 	}
 	const formatUserTime = (value?: number | string) => {
 		if (!value) return ""
 		if (typeof value === "number") {
 			return formatTime(value / 1000, "YYYY-MM-DD hh:mm:ss")
 		}
 		if (/^\d+$/.test(value)) {
 			return formatTime(Number(value) / 1000, "YYYY-MM-DD hh:mm:ss")
 		}
 		return value
 	}
 	const normalizeUserInfoList = (res: any): UserInfoRecord[] => {
 		if (Array.isArray(res)) return res
 		if (Array.isArray(res?.records)) return res.records
 		if (res) return [res]
 		return []
 	}
 	const buildUserInfoParams = (id: string | number) => ({
 		endTime: "",
 		startTime: "",
 		size: userInfoPage.size,
 		page: userInfoPage.current,
 		systemUser: "",
 		country: "",
 		email: "",
 		userType: "",
 		ids: [],
 		occupation: "",
 		order: "",
 		orderBy: "",
 		userName: "",
 		subscriptionPlanId: id
 	})
 	const fetchUserInfo = async () => {
 		if (currentUserInfoPlanId.value === null) return
 		userInfoLoading.value = true
 		userInfoList.value = []
 		try {
 			const res = await Https.axiosPost(
 				Https.httpUrls.getUserInfo,
 				buildUserInfoParams(currentUserInfoPlanId.value)
 			)
 			const records = normalizeUserInfoList(res)
 			userInfoList.value = records
 			userInfoPage.total = Number(res?.total ?? records.length)
 		} catch (error: any) {
 			message.error(error.message || "Failed to load user info")
 			console.error(error)
 		} finally {
 			userInfoLoading.value = false
 		}
 	}
 	const openUserInfo = async (record: SubscriptionPlan) => {
 		console.log(record)
 		// debugger
 		currentUserInfoPlanId.value = record.id
 		userInfoPage.current = 1
 		userInfoModalVisible.value = true
 		await fetchUserInfo()
 	}
 	const changeUserInfoPage = (pagination: any) => {
 		userInfoPage.current = pagination.current
 		userInfoPage.size = pagination.pageSize
 		fetchUserInfo()
 	}
 	const customPlanRow = (record: SubscriptionPlan) => {
 		return {
 			onClick: (event: MouseEvent) => {
 				const target = event.target as HTMLElement | null
 				if (target?.closest(".plan-row-actions")) return
 				openUserInfo(record)
 			}
 		}
 	}
 	const historyTable = ref<HTMLElement | null>(null)
 	const historyTableHeight = ref(0)
 	const minTableBodyHeight = 120
 	let tableResizeObserver: ResizeObserver | null = null
 	let tableResizeTimer: ReturnType<typeof window.setTimeout> | null = null
 	const handleResizeColumn = (w: any, col: any) => {
 		col.width = w
 	}
-const calculateTableHeight = () => {
+	const getElementOuterHeight = (element: Element | null) => {
-  nextTick(() => {
+		if (!element) return 0
-    if (historyTable.value) {
+		const htmlElement = element as HTMLElement
-      historyTableHeight.value = historyTable.value.clientHeight - 200
+		const style = window.getComputedStyle(htmlElement)
 		return (
 			htmlElement.offsetHeight +
 			Number.parseFloat(style.marginTop || "0") +
 			Number.parseFloat(style.marginBottom || "0")
 		)
 	}
 	const calculateTableHeight = () => {
 		if (tableResizeTimer) {
 			window.clearTimeout(tableResizeTimer)
 		}
 		tableResizeTimer = window.setTimeout(() => {
 			nextTick(() => {
 				const tableWrapper = historyTable.value
 				if (!tableWrapper) {
 					tableResizeTimer = null
 					return
 				}
 				const tableHead = tableWrapper.querySelector(".ant-table-thead") ?? null
 				const pagination = tableWrapper.querySelector(".ant-pagination") ?? null
 				const tableHeadHeight = getElementOuterHeight(tableHead) || 55
 				const paginationHeight = getElementOuterHeight(pagination) || 48
 				const reservedHeight = tableHeadHeight + paginationHeight + 8
 				historyTableHeight.value = Math.max(
 					minTableBodyHeight,
 					tableWrapper.clientHeight - reservedHeight
 				)
 				tableResizeTimer = null
 			})
 		}, 50)
 	}
 	const handleResize = () => {
 		calculateTableHeight()
 	}
 	const setupTableResizeObserver = () => {
 		if (!historyTable.value || typeof ResizeObserver === "undefined") return
 		tableResizeObserver?.disconnect()
 		tableResizeObserver = new ResizeObserver(() => {
 			calculateTableHeight()
 		})
 		tableResizeObserver.observe(historyTable.value)
 		const searchCard = historyTable.value
 			.closest(".subscription-plan")
 			?.querySelector(".search-card")
 		if (searchCard) {
 			tableResizeObserver.observe(searchCard)
 		}
 	}
 	onMounted(async () => {
 		await getOrganizationList()
 		await handleSearch()
 		calculateTableHeight()
-  window.addEventListener('resize', handleResize)
+		setupTableResizeObserver()
-  const list = sessionStorage.getItem('allCountry')
+		window.addEventListener("resize", handleResize)
 		const list = sessionStorage.getItem("allCountry")
 		countryList.value = list ? JSON.parse(list) : []
 	})
 	onActivated(() => {
 		calculateTableHeight()
 	})
 	onBeforeUnmount(() => {
-  window.removeEventListener('resize', handleResize)
+		window.removeEventListener("resize", handleResize)
 		tableResizeObserver?.disconnect()
 		if (tableResizeTimer) {
 			window.clearTimeout(tableResizeTimer)
 			tableResizeTimer = null
 		}
 	})
 	const handleFetchTableData = async () => {
 		tableLoading.value = true
 		return Https.axiosPost(Https.httpUrls.searchAllSubscribePlan, searchForm)
-    .then(res => {
+			.then((res) => {
 				tableData.value = res.records
 				searchForm.total = res.total
 			})
 			.finally(() => {
 				tableLoading.value = false
 				calculateTableHeight()
 			})
 	}
 	const resetFormState = () => {
-  formState.name = ''
+		formState.name = ""
-  formState.currentPeriodStart = ''
+		formState.currentPeriodStart = ""
-  formState.currentPeriodEnd = ''
+		formState.currentPeriodEnd = ""
 		formState.organizationId = undefined
 		formState.adminAccId = undefined
 		formState.creditLimit = null
@@ -683,26 +973,26 @@ const handleSearch = () => {
 	}
 	const handleReset = () => {
-  searchForm.name = ''
+		searchForm.name = ""
-  searchForm.startTime = ''
+		searchForm.startTime = ""
-  searchForm.endTime = ''
+		searchForm.endTime = ""
 		searchForm.organizationId = undefined
 		searchForm.adminAccId = undefined
 		searchForm.status = []
-  searchForm.id = ''
+		searchForm.id = ""
 		searchForm.countryOrRegion = null
 		handleSearch()
 	}
 	const openCreate = () => {
-  modalTitle.value = 'New Subscription Plan'
+		modalTitle.value = "New Subscription Plan"
 		isEditMode.value = false
 		resetFormState()
 		modalVisible.value = true
 	}
 	const openEdit = (record: SubscriptionPlan) => {
-  modalTitle.value = 'Edit Subscription Plan'
+		modalTitle.value = "Edit Subscription Plan"
 		isEditMode.value = true
 		formState.name = record.name
 		formState.currentPeriodStart = String(record.currentPeriodStart)
@@ -755,25 +1045,25 @@ const validateForm = (): boolean => {
 		}
 		const requiredFields: FieldRule[] = [
-    { value: formState.currentPeriodStart, message: 'Please select the start time' },
+			{ value: formState.currentPeriodStart, message: "Please select the start time" },
-    { value: formState.currentPeriodEnd, message: 'Please select the end time' },
+			{ value: formState.currentPeriodEnd, message: "Please select the end time" },
-    { value: formState.adminAccId, message: 'Please select the admin account' },
+			{ value: formState.adminAccId, message: "Please select the admin account" },
 			{
 				value: formState.creditLimit,
-      message: 'Please input credit limit',
+				message: "Please input credit limit",
 				checkNull: true
 			},
 			{
 				value: formState.accountNum,
-      message: 'Please input account number',
+				message: "Please input account number",
 				checkNull: true
 			}
 		]
 		if (!isEditMode.value) {
 			requiredFields.push(
-      { value: formState.name, message: 'Please input the name' },
+				{ value: formState.name, message: "Please input the name" },
-      { value: formState.organizationId, message: 'Please select organization' }
+				{ value: formState.organizationId, message: "Please select organization" }
 			)
 		}
@@ -806,7 +1096,7 @@ const handleSubmit = async () => {
 				res = await Https.axiosPost(Https.httpUrls.createSubscribePlan, params)
 			}
 			message.success(
-      `${isEditMode.value ? 'Subscription plan updated' : 'Subscription plan created'}`
+				`${isEditMode.value ? "Subscription plan updated" : "Subscription plan created"}`
 			)
 		} catch (error: any) {
 			message.error(error.message)
@@ -835,8 +1125,8 @@ const cancelModal = () => {
 	const removePlan = (id: number) => {
 		tableLoading.value = true
 		Https.axiosGet(Https.httpUrls.deleteSubscribePlan, { params: { id } })
-    .then(res => {
+			.then((res) => {
-      message.success('Subscription plan deleted')
+				message.success("Subscription plan deleted")
 				handleReset()
 			})
 			.catch((error: any) => {
@@ -901,15 +1191,15 @@ const handleOrganizationScroll = (e: any) => {
 	}
 	const handleOrganizationSelect = (value: string) => {
-  if (value === 'ADD_ORGANIZATION') {
+		if (value === "ADD_ORGANIZATION") {
 			// 打开添加组织弹窗
 			organizationModalVisible.value = true
 			// 使用nextTick确保值被重置，使其不被选中
 			nextTick(() => {
-      if (searchForm.organizationId === 'ADD_ORGANIZATION') {
+				if (searchForm.organizationId === "ADD_ORGANIZATION") {
 					searchForm.organizationId = undefined
 				}
-      if (formState.organizationId === 'ADD_ORGANIZATION') {
+				if (formState.organizationId === "ADD_ORGANIZATION") {
 					formState.organizationId = undefined
 				}
 			})
@@ -918,12 +1208,12 @@ const handleOrganizationSelect = (value: string) => {
 	const handleOrganizationChange = (value: string) => {
 		// 如果change事件触发时值是"添加组织"，立即重置
-  if (value === 'ADD_ORGANIZATION') {
+		if (value === "ADD_ORGANIZATION") {
 			nextTick(() => {
-      if (searchForm.organizationId === 'ADD_ORGANIZATION') {
+				if (searchForm.organizationId === "ADD_ORGANIZATION") {
 					searchForm.organizationId = undefined
 				}
-      if (formState.organizationId === 'ADD_ORGANIZATION') {
+				if (formState.organizationId === "ADD_ORGANIZATION") {
 					formState.organizationId = undefined
 				}
 			})
@@ -932,13 +1222,13 @@ const handleOrganizationChange = (value: string) => {
 	const cancelOrganizationModal = () => {
 		organizationModalVisible.value = false
-  organizationForm.name = ''
+		organizationForm.name = ""
 		organizationForm.type = undefined
 	}
 	const handleCreateOrganization = async () => {
 		if (!organizationForm.name || !organizationForm.type) {
-    message.warning('Please fill in name and type')
+			message.warning("Please fill in name and type")
 			return
 		}
 		try {
@@ -948,7 +1238,7 @@ const handleCreateOrganization = async () => {
 					type: organizationForm.type
 				}
 			})
-    message.success('Organization created successfully')
+			message.success("Organization created successfully")
 			cancelOrganizationModal()
 			// 刷新组织列表
 			await getOrganizationList()
@@ -960,26 +1250,28 @@ const handleCreateOrganization = async () => {
 				}
 			}
 		} catch (error: any) {
-    message.error(error.message || 'Failed to create organization')
+			message.error(error.message || "Failed to create organization")
 			console.error(error)
 		}
 	}
 	const filterOption = (input: string, option: any) => {
-  const label = option?.label ?? option?.children ?? option?.key?.label ?? ''
+		const label = option?.label ?? option?.children ?? option?.key?.label ?? ""
 		return String(label).toLowerCase().includes(input.toLowerCase())
 	}
 </script>
 <style lang="less" scoped>
 	.subscription-plan {
-  padding: 2rem 2.4rem 3.2rem 0;
+		padding: 2rem 2.4rem 0 0;
 		display: flex;
 		height: 100%;
 		min-height: 0;
 		flex-direction: column;
 		.search-card {
 			margin-bottom: 1.6rem;
 			flex-shrink: 0;
 		}
 		.table-card {
@@ -987,13 +1279,15 @@ const filterOption = (input: string, option: any) => {
 			display: flex;
 			flex-direction: column;
 			overflow: hidden;
 			min-height: 0;
 			:deep(.ant-card-body) {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				overflow: hidden;
-      padding: 2.4rem;
+				padding: 2.4rem 2.4rem 0;
 				min-height: 0;
 			}
 			.table-card__header {
@@ -1007,6 +1301,42 @@ const filterOption = (input: string, option: any) => {
 				flex: 1;
 				overflow: hidden;
 				min-height: 0;
 				:deep(.ant-table-wrapper),
 				:deep(.ant-spin-nested-loading),
 				:deep(.ant-spin-container) {
 					height: 100%;
 				}
 				:deep(.ant-spin-container) {
 					display: flex;
 					flex-direction: column;
 					overflow: hidden;
 				}
 				:deep(.ant-table) {
 					flex: 1;
 					min-height: 0;
 					overflow: hidden;
 				}
 				:deep(.ant-table-container) {
 					height: 100%;
 					display: flex;
 					flex-direction: column;
 				}
 				:deep(.ant-table-content) {
 					height: 100%;
 				}
 				:deep(.ant-table-body) {
 					overflow-y: auto !important;
 				}
 				:deep(.ant-pagination) {
 					flex-shrink: 0;
 				}
 			}
 			.danger-text {
@@ -1026,8 +1356,23 @@ const filterOption = (input: string, option: any) => {
 			:deep(.ant-table-tbody > tr:hover > td) {
 				background: rgb(202, 202, 202);
 			}
 			:deep(.ant-table-tbody > tr) {
 				cursor: pointer;
 			}
 			:deep(.plan-row-actions) {
 				cursor: default;
 			}
 		}
 	}
 	.user-info-modal {
 		:deep(.ant-modal-body) {
 			padding: 2.4rem;
 		}
 	}
 	:deep(.subscriptionPlan_modal) {
 		.ant-modal-body {
 			// height: calc(65rem * 1.2);
@@ -1079,11 +1424,69 @@ const filterOption = (input: string, option: any) => {
 	}
 	:deep(.search-form) {
-  column-gap: 2rem;
+		--search-label-width: 14rem;
-  row-gap: 2rem;
+		--search-control-width: 20rem;
 		align-items: flex-start;
 		column-gap: 1.8rem;
 		row-gap: 1.8rem;
 		.ant-form-item {
 			min-width: calc(var(--search-label-width) + var(--search-control-width));
 			margin-right: 0;
 			margin-bottom: 0;
 		}
 		.ant-form-item-label {
 			flex: 0 0 var(--search-label-width);
 			max-width: var(--search-label-width);
 			overflow: visible;
 			white-space: nowrap;
 			> label {
 				white-space: nowrap;
 			}
 		}
 		.ant-form-item-control {
 			flex: 0 0 var(--search-control-width);
 			max-width: var(--search-control-width);
 		}
 		.ant-input,
 		.ant-input-affix-wrapper,
 		.ant-picker,
 		.ant-select {
 			width: 100% !important;
 		}
 		.search-form__actions {
 			min-width: auto;
 			.ant-form-item-control {
 				flex: 0 0 auto;
 				max-width: none;
 			}
 		}
 	}
 	@media (min-width: 1600px) {
 		:deep(.search-form) {
 			--search-control-width: 22rem;
 		}
 	}
 	@media (max-width: 760px) {
 		:deep(.search-form) {
 			.ant-form-item {
 				flex: 1 1 100%;
 				min-width: 100%;
 			}
 			.ant-form-item-control {
 				flex: 1 1 auto;
 				max-width: calc(100% - var(--search-label-width));
 			}
 		}
 	}
 	:deep(.ant-select-dropdown) {
--- a/src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js
@@ -207,7 +207,8 @@ export class BackgroundSizeCommand extends Command {
    this.bgLayer = this.layers.value.find((layer) => layer.isBackground);
    // 记录原尺寸
-    this.backgroundObject = findObjectById(this.canvas, this.bgLayer.fabricObject.id).object;
+	this.bgId = this.bgLayer.fabricObject?.id || this.bgLayer.fabricObjects?.[0]?.id;
    this.backgroundObject = findObjectById(this.canvas, this.bgId).object;
    this.oldWidth = this.backgroundObject.width;
    this.oldHeight = this.backgroundObject.height;
--- a/src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js
+++ b/src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js
@@ -50,7 +50,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
    );
    this.layer = layer;
    this.parent = parent;
 	console.log("==========",layer);
    if (!layer) return false;
 	if(!isUndo){
@@ -107,7 +106,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
        });
      }
    }
    // 判断fabricObjects是否是组对象
    const firstObj = layer.fabricObjects?.[0] || null;
    // 如果没有找到第一个对象，则直接添加到当前画布
@@ -174,8 +172,8 @@ export class FillGroupLayerBackgroundCommand extends Command {
    }
    const canvasObj = findObjectById(this.canvas, firstObj?.id)?.object;
    if (
-      (canvasObj && canvasObj.type === "group") ||
+      canvasObj && (canvasObj.type === "group" ||
-      canvasObj._objects?.length > 0
+      canvasObj._objects?.length > 0)
    ) {
      this.newFill.set({
        left: 0,
@@ -343,10 +341,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
      minTop = Infinity,
      maxRight = -Infinity,
      maxBottom = -Infinity;
    console.log(
      "计算当前所有对象的边界信息:===>",
      this.originalfabricObjects.length
    );
    this.originalfabricObjects?.forEach((obj) => {
      const { object } = findObjectById(this.canvas, obj.id) || {};
      if (object) {
--- a/src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js
+++ b/src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js
@@ -7,11 +7,11 @@ import {
 	insertObjectAtZIndex,
 	removeCanvasObjectByObject,
 	createPatternTransform,
 	getTransformScaleAngle,
 	imageAddGapToCanvas,
 } from "../utils/helper";
 import { restoreFabricObject } from "../utils/objectHelper";
 const scale = 0.3;// 默认缩放比例
 export const FillSourceToBase64 = (source) => {
 	if (source?.toDataURL) {
 		return source.toDataURL?.();
@@ -38,7 +38,6 @@ export class FillRepeatCommand extends Command {
 		this.fillRepeat = options.fillRepeat;
 		this.oldObjects = null;
 		this.oldLocked = null;
 		this.oldIsDisableUnlock = null;
 	}
 	async execute() {
@@ -52,19 +51,35 @@ export class FillRepeatCommand extends Command {
 			console.warn("当前对象不能平铺", object.type);
 			return false;
 		}
 		console.log("===========", object.toObject(["id", "layerId", "layerName"]))
 		this.oldObjects = object;
 		if (this.fillRepeat === "no-repeat") {
 			const fill_ = object.fill_;
 			const image = await new Promise((resolve, reject) => {
 				fabric.Image.fromURL(
 					fill_.source,
 					v => resolve(v),
 					{ crossOrigin: "anonymous" }
 				);
 			});
 			image.set({
 				...this.copyObjectProperties(object),
 				...(fill_.originalInfo || {
 					top: object.top,
 					left: object.left,
 				})
 			});
 			layer.fabricObjects = [image.toObject(["id", "layerId", "layerName"])];
 			// this.oldLocked = layer.locked;
 			// layer.locked = false;
 			this.canvas.add(image);
 			this.canvas.remove(object);
 		} else {
 			const img = await new Promise((resolve, reject) => {
 				if (object.type === "rect") {
 					let source = object.fill.source;
 					resolve(source);
 				} else if (object.type === "image") {
 				// resolve(object.getElement());
 				// fabric.Image.fromURL(
 				// 	object.src,
 				// 	v => resolve(v),
 				// 	{ crossOrigin: "anonymous" }
 				// );
 					const imgElement = object.getElement();
 					// 创建透明 Canvas
 					const tcanvas = document.createElement('canvas');
@@ -76,31 +91,50 @@ export class FillRepeatCommand extends Command {
 					resolve(tcanvas);
 				}
 			});
-		const fill_ = {
+			const fill_ = object.fill_ || {
 				source: FillSourceToBase64(img),
 				gapX: 0,
 				gapY: 0,
 				width: img.width,
 				height: img.height,
 				originalInfo: {
 					top: object.top,
 					left: object.left,
 					scaleX: object.scaleX,
 					scaleY: object.scaleY,
 					width: object.width,
 					height: object.height,
 				}
 			};
 			const fdObject = this.canvasManager.getFixedLayerObject();
 			const bgObject = this.canvasManager.getBackgroundLayerObject();
 			const tObject = fdObject || bgObject;
 			const tWidth = tObject.width;
 			const tHeight = tObject.height;
 			// const offsetX = object.fill?.hasOwnProperty("offsetX") ? object.fill.offsetX : tObject.width / 2;
 			// const offsetY = object.fill?.hasOwnProperty("offsetY") ? object.fill.offsetY : tObject.height / 2;
 			const scaleX_ = tWidth / img.width / 5;
 			const scaleY_ = tHeight / img.height / 5;
 			const scale_ = tWidth > tHeight ? scaleX_ : scaleY_;
 			const patternTransform = object.fill?.hasOwnProperty("patternTransform") ? object.fill.patternTransform : createPatternTransform(scale_, 0);
 			const scale = getTransformScaleAngle(patternTransform).scale;
 			const offsetX = tWidth / 2 - img.width * scale / 2;
 			const offsetY = tHeight / 2 - img.height * scale / 2;
 			const pattern = new fabric.Pattern({
 				source: img,
 				repeat: this.fillRepeat,
-			patternTransform: object.fill?.hasOwnProperty("patternTransform") ? object.fill.patternTransform : createPatternTransform(scale, 0),
+				patternTransform,
-			offsetX: object.fill?.hasOwnProperty("offsetX") ? object.fill.offsetX : bgObject.width / 2, // 水平偏移
+				offsetX, // 水平偏移
-			offsetY: object.fill?.hasOwnProperty("offsetY") ? object.fill.offsetY : bgObject.height / 2, // 垂直偏移
+				offsetY, // 垂直偏移
 			});
 			const rect = new fabric.Rect({
-			id: object.id,
+				...this.copyObjectProperties(object),
 			layerId: object.layerId,
 			layerName: object.layerName,
 				fill_,
 			});
 			layer.fabricObjects = [rect.toObject(["id", "layerId", "layerName"])];
-		this.oldLocked = layer.locked;
+			// this.oldLocked = layer.locked;
 		// this.oldIsDisableUnlock = layer.isDisableUnlock;
 		// layer.isDisableUnlock = true;
 			if (this.oldObjects.type === "rect") {
 				rect.set({
 					width: object.width,
@@ -116,21 +150,22 @@ export class FillRepeatCommand extends Command {
 					flipY: object.flipY,
 				});
 			} else {
-			let scaleX = bgObject.scaleX || 1;
+				let scaleX = tObject.scaleX || 1;
-			let scaleY = bgObject.scaleY || 1;
+				let scaleY = tObject.scaleY || 1;
 				rect.set({
-				width: bgObject.width,
+					width: tWidth,
-				height: bgObject.height,
+					height: tHeight,
-				top: bgObject.top - bgObject.height * scaleY / 2,
+					top: tObject.top - tHeight * scaleY / 2,
-				left: bgObject.left - bgObject.width * scaleX / 2,
+					left: tObject.left - tWidth * scaleX / 2,
 					scaleX,
 					scaleY,
 				});
-			layer.locked = true;
+				// layer.locked = true;
 			}
 			rect.set("fill", pattern);
 			this.canvas.add(rect);
 			this.canvas.remove(object);
 		}
 		await this.layerManager?.updateLayersObjectsInteractivity();
 		await this.layerManager?.sortLayersWithTool?.();
 		await this.canvasManager.thumbnailManager?.generateLayerThumbnail(
@@ -154,14 +189,23 @@ export class FillRepeatCommand extends Command {
 		this.canvas.remove(object);
 		this.canvas.add(this.oldObjects);
 		layer.fabricObjects = [this.oldObjects.toObject(["id", "layerId", "layerName"])];
-		layer.locked = this.oldLocked;
+		// layer.locked = this.oldLocked;
 		// layer.isDisableUnlock = this.oldIsDisableUnlock;
 		await this.layerManager?.updateLayersObjectsInteractivity();
 		await this.layerManager?.sortLayersWithTool?.();
 		this.canvas.renderAll();
 		this.canvasManager.thumbnailManager?.generateLayerThumbnail(this.layerId);
 		return true;
 	}
 	// 复制原对象的属性
 	copyObjectProperties(object) {
 		return {
 			id: object.id,
 			layerId: object.layerId,
 			layerName: object.layerName,
 			isPrintTrims: object.isPrintTrims,
 		}
 	}
 }
@@ -200,6 +244,10 @@ export class FillRepeatChangeCommand extends Command {
 			...this.newPattern,
 		});
 		object.set("fill", pattern);
 		if (object.globalCompositeOperation_) {
 			object.globalCompositeOperation = object.globalCompositeOperation_;
 			object.globalCompositeOperation_ = null;
 		}
 		this.canvas.renderAll();
 		return true;
 	}
@@ -246,7 +294,7 @@ export class FillRepeatGapChangeCommand extends Command {
 		this.oldGapY = null;
 	}
-	async execute(isUndo = false) {
+	async execute(isCommand = true, isUndo = false) {
 		const { layer } = findLayerRecursively(this.layers.value, this.layerId);
 		if (!layer || !layer.fabricObjects || layer.fabricObjects.length === 0) {
 			console.warn("图层不存在或没有 fabric 对象");
@@ -277,21 +325,18 @@ export class FillRepeatGapChangeCommand extends Command {
 			object.fill_.gapY = this.newGapY;
 		}
 		const image = new Image();
 		image.crossOrigin = "anonymous";
 		image.src = object.fill_.source;
 		await image.decode();
 		object.fill_.width = image.width;
 		object.fill_.height = image.height;
 		// 创建透明 Canvas
 		const tcanvas = document.createElement('canvas');
 		tcanvas.width = image.width + object.fill_.gapX;
 		tcanvas.height = image.height + object.fill_.gapY;
 		const ctx = tcanvas.getContext('2d');
 		ctx.clearRect(0, 0, tcanvas.width, tcanvas.height);
 		ctx.drawImage(image, 0, 0);
 		const fill = object.get("fill");
-		fill.source = tcanvas;
+		fill.source = imageAddGapToCanvas(image, object.fill_.gapX, object.fill_.gapY);
 		object.set("fill", new fabric.Pattern(fill));
 		if (isCommand && object.globalCompositeOperation_) {
 			object.globalCompositeOperation = object.globalCompositeOperation_;
 			object.globalCompositeOperation_ = null;
 		}
 		this.canvas.renderAll();
 		return true;
 	}
@@ -301,7 +346,7 @@ export class FillRepeatGapChangeCommand extends Command {
 			console.warn("没有旧间隙可恢复");
 			return false;
 		}
-		await this.execute(true);
+		await this.execute(true, true);
 		return true;
 	}
--- a/src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js
+++ b/src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js
@@ -147,11 +147,11 @@ export class LassoCutoutCommand extends CompositeCommand {
      }
      // 确定源图层
-      const sourceLayer = this.layerManager.getActiveLayer();
+    //   const sourceLayer = this.layerManager.getActiveLayer();
-      if (!sourceLayer) {
+    //   if (!sourceLayer) {
-        console.error("无法执行套索抠图：源图层无效");
+    //     console.error("无法执行套索抠图：源图层无效");
-        return false;
+    //     return false;
-      }
+    //   }
      // 获取源图层的所有对象（包括子图层）
      // const sourceObjects = this._getLayerObjects(sourceLayer);
@@ -225,7 +225,7 @@ export class LassoCutoutCommand extends CompositeCommand {
 			const layers = this.layerManager.layers.value;
 			var topLayerIndex = 0;
-			layers.forEach((layer, index) => {
+			if(this.originalLayer)layers.forEach((layer, index) => {
 				if (layer.id === this.originalLayer.id) {
 					topLayerIndex = index;
 				}else if (layer.children.length > 0) {
--- a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
@@ -144,7 +144,7 @@ export class AddLayerCommand extends Command {
    // 先在一级图层中查找
    for (let i = 0; i < layers.length; i++) {
      const layer = layers[i];
-
+	  if (layer.isPrintTrimsGroup) continue;
      if (layer.id === layerId) {
        return {
          layer: layer,
@@ -280,8 +280,13 @@ export class PasteLayerCommand extends Command {
        isCut: undefined,
        serializedObjects: undefined,
      };
-
+      if(this.newLayer.isPrintTrims){
-      if (this.insertIndex !== undefined && this.insertIndex !== null) {
+		this.layers.value.forEach((layer) => {
          if (layer.isPrintTrimsGroup) {
            layer.children.unshift(this.newLayer);
          }
        })
 	  }else if (this.insertIndex !== undefined && this.insertIndex !== null) {
        this.layers.value.splice(this.insertIndex, 0, this.newLayer);
      } else {
        this.layers.value.push(this.newLayer);
@@ -872,13 +877,13 @@ export class ToggleChildLayerVisibilityCommand extends Command {
    // this.oldVisibility = this.childLayer ? this.childLayer.visible : null;
  }
-  async execute() {
+  async execute(visible) {
    if (!this.childLayer) {
      throw new Error("找不到要切换可见性的子图层");
    }
    // 切换可见性
-    this.childLayer.visible = !this.childLayer.visible;
+    this.childLayer.visible = typeof visible === "boolean" ? visible : !this.childLayer.visible;
    // 更新画布上图层对象的可见性
    if (this.canvas) {
@@ -3684,7 +3689,7 @@ export class ChangeFixedImageCommand extends Command {
        opacity: currentObj.opacity,
      };
-      console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
+    //   console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
    }
  }
@@ -3794,7 +3799,7 @@ export class ChangeFixedImageCommand extends Command {
          false
        );
        if (insertSuccess) {
-          console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
+        //   console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
        } else {
          // 如果插入失败，回退到普通添加
          this.canvas.add(newImage);
--- a/src/component/Canvas/CanvasEditor/commands/ObjectLayerCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/ObjectLayerCommands.js
@@ -600,7 +600,7 @@ export class ChangeFixedImageCommand extends Command {
        opacity: currentObj.opacity,
      };
-      console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
+    //   console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
    }
  }
@@ -716,7 +716,7 @@ export class ChangeFixedImageCommand extends Command {
          false
        );
        if (insertSuccess) {
-          console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
+        //   console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
        } else {
          // 如果插入失败，回退到普通添加
          this.canvas.add(newImage);
--- a/src/component/Canvas/CanvasEditor/commands/PartCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/PartCommands.js
@@ -0,0 +1,56 @@
 import { Command } from "./Command.js";
 /**
 * 部件绘制命令
 */
 export class PartDrawCommand extends Command {
 	constructor(options) {
 		super({
 			name: "部件绘制命令",
 			saveState: false,
 		});
 		this.canvas = options.canvas;
 		this.partManager = options.partManager;
 		this.partCanvas = options.partCanvas;
 		this.oldPartCanvas = this.partManager.partCanvas;
 	}
 	execute() {
 		this.partManager.drawPartCanvas(this.partCanvas);
 		return true;
 	}
 	undo() {
 		this.partManager.drawPartCanvas(this.oldPartCanvas);
 		return true;
 	}
 }
 /**
 * 部件点选绘制命令
 */
 export class PartPointDrawCommand extends Command {
 	constructor(options) {
 		super({
 			name: "部件点选绘制命令",
 			saveState: false,
 		});
 		this.canvas = options.canvas;
 		this.partManager = options.partManager;
 		this.partCanvas = options.partCanvas;
 		this.pointList = options.pointList;
 		this.oldPartCanvas = this.partManager.partCanvas;
 		this.oldPointList = [...this.partManager.pointList];
 	}
 	async execute() {
 		const list = [...this.pointList];
 		const canvas = this.partCanvas;
 		const res = await this.partManager.pointDrawPartCanvas(list, canvas);
 		return res;
 	}
 	async undo() {
 		const list = [...this.oldPointList];
 		const canvas = this.oldPartCanvas;
 		const res = await this.partManager.pointDrawPartCanvas(list, canvas);
 		return res;
 	}
 }
--- a/src/component/Canvas/CanvasEditor/commands/RasterizeLayerCommand.js
+++ b/src/component/Canvas/CanvasEditor/commands/RasterizeLayerCommand.js
@@ -285,17 +285,15 @@ export class RasterizeLayerCommand extends Command {
    // 提取排序后的对象
    this.objectsToRasterize = objectsWithZIndex.map((item) => item.object);
-    console.log(
+    // console.log(`📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合` );
-      `📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合`
+    // console.log(
-    );
+    //   "🔢 对象z-index顺序:",
-    console.log(
+    //   objectsWithZIndex.map((item) => ({
-      "🔢 对象z-index顺序:",
+    //     id: item.object.id,
-      objectsWithZIndex.map((item) => ({
+    //     type: item.object.type,
-        id: item.object.id,
+    //     zIndex: item.zIndex,
-        type: item.object.type,
+    //   }))
-        zIndex: item.zIndex,
+    // );
      }))
    );
  }
  /**
@@ -611,17 +609,17 @@ export class ExportLayerToImageCommand extends Command {
    // 提取排序后的对象
    this.objectsToRasterize = objectsWithZIndex.map((item) => item.object);
-    console.log(
+    // console.log(
-      `📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合`
+    //   `📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合`
-    );
+    // );
-    console.log(
+    // console.log(
-      "🔢 对象z-index顺序:",
+    //   "🔢 对象z-index顺序:",
-      objectsWithZIndex.map((item) => ({
+    //   objectsWithZIndex.map((item) => ({
-        id: item.object.id,
+    //     id: item.object.id,
-        type: item.object.type,
+    //     type: item.object.type,
-        zIndex: item.zIndex,
+    //     zIndex: item.zIndex,
-      }))
+    //   }))
-    );
+    // );
  }
  /**
--- a/src/component/Canvas/CanvasEditor/commands/RedGreenCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/RedGreenCommands.js
@@ -159,6 +159,8 @@ export class BatchInitializeRedGreenModeCommand extends Command {
            absolutePositioned: true,
            opacity: 0.01, // 设置为几乎透明
            id: generateId("redGreenImageMask_"),
 			rx: 15,
 			ry: 15,
          });
          // this.canvas.add(this.redGreenImageMask);
          this.canvas.clipPath = this.redGreenImageMask;
--- a/src/component/Canvas/CanvasEditor/commands/StateCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/StateCommands.js
@@ -25,7 +25,7 @@ export class TransformCommand extends Command {
    this.layerManager = options.layerManager;
    this.layers = options.layers || null;
    this.lastSelectLayerId = options.lastSelectLayerId || null; // 最后选择的图层ID
-
+	this.isCommand = options.isCommand == undefined ? true : options.isCommand
    const targetObject =
      findObjectById(this.canvas, this.objectId)?.object || null;
@@ -189,6 +189,11 @@ export class TransformCommand extends Command {
      object.set(key, value);
    });
 	if(this.isCommand && object.globalCompositeOperation_){
 		object.globalCompositeOperation = object.globalCompositeOperation_;
 		object.globalCompositeOperation_ = null;
 	}
    // 确保对象更新
    object.setCoords();
  }
--- a/src/component/Canvas/CanvasEditor/commands/TextCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/TextCommands.js
@@ -493,7 +493,7 @@ export class CreateTextCommand extends Command {
    // 先在一级图层中查找
    for (let i = 0; i < layers.length; i++) {
      const layer = layers[i];
-
+      if (layer.isPrintTrimsGroup) continue;
      if (layer.id === layerId) {
        return {
          layer: layer,
--- a/src/component/Canvas/CanvasEditor/components/BrushControlPanel.vue
+++ b/src/component/Canvas/CanvasEditor/components/BrushControlPanel.vue
@@ -154,6 +154,8 @@ const isVisible = computed(() => {
    OperationType.ERASER,
    OperationType.RED_BRUSH,
    OperationType.GREEN_BRUSH,
    OperationType.PART_BRUSH,
    OperationType.PART_ERASER,
  ].includes(props.activeTool);
 });
--- a/src/component/Canvas/CanvasEditor/components/HeaderMenu.vue
+++ b/src/component/Canvas/CanvasEditor/components/HeaderMenu.vue
@@ -11,6 +11,7 @@ const layerManager = inject("layerManager");
 const isShowLayerPanel = inject("isShowLayerPanel", ref(false));
 const props = defineProps({
  title: String,
  activeTool: String,
  canvasWidth: Number,
  canvasHeight: Number,
@@ -22,6 +23,7 @@ const props = defineProps({
    default: true, // 是否显示图层面板
  },
  isBackgroundChangeable: Boolean,
  isChangeCanvasSize: Boolean,
 });
 const emit = defineEmits([
@@ -273,7 +275,7 @@ onMounted(() => {
 <template>
  <div class="canvas-header">
    <div class="canvas-header-wrapper">
-      <span class="canvas-title">{{ $t('Canvas.Canvas') }}</span>
+      <span class="canvas-title">{{ props.title || $t("Canvas.Canvas") }}</span>
      <!-- 默认设置 -->
      <!-- v-if="
        !activeTool ||
@@ -284,6 +286,7 @@ onMounted(() => {
        <div class="setting-group">
          <span class="setting-label">{{ $t("Canvas.width") }}</span>
          <a-input-number
 		    :disabled="!isChangeCanvasSize"
            :value="canvasWidth?.toFixed(2)"
            class="setting-input"
            :min="1"
@@ -300,6 +303,7 @@ onMounted(() => {
        <div class="setting-group">
          <span class="setting-label">{{ $t("Canvas.height") }}</span>
          <a-input-number
 		    :disabled="!isChangeCanvasSize"
            :value="canvasHeight?.toFixed(2)"
            class="setting-input"
            :min="1"
--- a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue
+++ b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue
@@ -242,7 +242,7 @@ const canDeleteComputed = computed(() => {
    return parentLayer?.children?.length > 1;
  }
  // 否则直接返回根图层的可删除状态
-  return props.layers.length > 3;
+  return true;
 });
 </script>
@@ -287,7 +287,7 @@ const canDeleteComputed = computed(() => {
            :is-child="isChild"
            :is-active="layer.id === activeLayerId"
            :is-selected="isLayerSelected(layer.id)"
-            :is-multi-select-mode="isMultiSelectMode && !layer.specialType"
+            :is-multi-select-mode="isMultiSelectMode && !(layer.isPrintTrims || layer.isPrintTrimsGroup)"
            :is-editing="editingLayerId === layer.id"
            :editing-name="editingLayerName"
            :can-delete="
@@ -296,7 +296,7 @@ const canDeleteComputed = computed(() => {
            :expanded-group-ids="expandedGroupIds"
            @click="(...args) => forwardEvent('layer-click', ...args)"
            @double-click="(...args) => forwardEvent('layer-double-click', ...args)"
-            @context-menu="(...args) => !layer.specialType && forwardEvent('context-menu', ...args)"
+            @context-menu="(...args) => !(layer.isPrintTrims || layer.isPrintTrimsGroup) && forwardEvent('context-menu', ...args)"
            @checkbox-change="(...args) => forwardEvent('checkbox-change', ...args)"
            @toggle-visibility="(...args) => forwardEvent('toggle-visibility', ...args)"
            @toggle-lock="(...args) => forwardEvent('toggle-lock', ...args)"
@@ -337,7 +337,7 @@ const canDeleteComputed = computed(() => {
              :expanded-group-ids="expandedGroupIds"
              :isChild="true"
              :parentLayerId="layer.id"
-              :group-name="layer.specialType || groupName"
+              :group-name="groupName"
              @layer-click="(...args) => forwardEvent('layer-click', ...args)"
              @layer-double-click="(...args) => forwardEvent('layer-double-click', ...args)"
              @context-menu="(...args) => forwardEvent('context-menu', ...args)"
--- a/Show More
+++ b/Show More
`@@ -5,4 +5,3 @@ VITE_USER_NODE_ENV = 'development'`
	`VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'`	`VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'`

	`# VITE_APP_BASE_URL = 'http://localhost:22170'`	`# VITE_APP_BASE_URL = 'http://localhost:22170'`
		`@@ -0,0 +1 @@`
							<svg focusable="false" class="" data-icon="paper-clip" width="1em" height="1em" fill="#00000073" aria-hidden="true" viewBox="64 64 896 896"><path d="M779.3 196.6c-94.2-94.2-247.6-94.2-341.7 0l-261 260.8c-1.7 1.7-2.6 4-2.6 6.4s.9 4.7 2.6 6.4l36.9 36.9a9 9 0 0012.7 0l261-260.8c32.4-32.4 75.5-50.2 121.3-50.2s88.9 17.8 121.2 50.2c32.4 32.4 50.2 75.5 50.2 121.2 0 45.8-17.8 88.8-50.2 121.2l-266 265.9-43.1 43.1c-40.3 40.3-105.8 40.3-146.1 0-19.5-19.5-30.2-45.4-30.2-73s10.7-53.5 30.2-73l263.9-263.8c6.7-6.6 15.5-10.3 24.9-10.3h.1c9.4 0 18.1 3.7 24.7 10.3 6.7 6.7 10.3 15.5 10.3 24.9 0 9.3-3.7 18.1-10.3 24.7L372.4 653c-1.7 1.7-2.6 4-2.6 6.4s.9 4.7 2.6 6.4l36.9 36.9a9 9 0 0012.7 0l215.6-215.6c19.9-19.9 30.8-46.3 30.8-74.4s-11-54.6-30.8-74.4c-41.1-41.1-107.9-41-149 0L463 364 224.8 602.1A172.22 172.22 0 00174 724.8c0 46.3 18.1 89.8 50.8 122.5 33.9 33.8 78.3 50.7 122.7 50.7 44.4 0 88.8-16.9 122.6-50.7l309.2-309C824.8 492.7 850 432 850 367.5c.1-64.6-25.1-125.3-70.7-170.9z"></path></svg>