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
69 changed files with 5580 additions and 8795 deletions
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
--- a/src/assets/icons/seller/add.svg
+++ b/src/assets/icons/seller/add.svg
@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19.1667 9.16667H10.8333V0.833333C10.8333 0.61232 10.7455 0.400358 10.5893 0.244078C10.433 0.0877974 10.221 0 10 0C9.77899 0 9.56702 0.0877974 9.41074 0.244078C9.25446 0.400358 9.16667 0.61232 9.16667 0.833333V9.16667H0.833333C0.61232 9.16667 0.400358 9.25446 0.244078 9.41074C0.0877974 9.56702 0 9.77899 0 10C0 10.221 0.0877974 10.433 0.244078 10.5893C0.400358 10.7455 0.61232 10.8333 0.833333 10.8333H9.16667V19.1667C9.16667 19.3877 9.25446 19.5996 9.41074 19.7559C9.56702 19.9122 9.77899 20 10 20C10.221 20 10.433 19.9122 10.5893 19.7559C10.7455 19.5996 10.8333 19.3877 10.8333 19.1667V10.8333H19.1667C19.3877 10.8333 19.5996 10.7455 19.7559 10.5893C19.9122 10.433 20 10.221 20 10C20 9.77899 19.9122 9.56702 19.7559 9.41074C19.5996 9.25446 19.3877 9.16667 19.1667 9.16667Z" fill="#B0B0B0"/>
-</svg>
--- a/src/assets/icons/seller/arrow_right_solid.svg
+++ b/src/assets/icons/seller/arrow_right_solid.svg
@@ -1,3 +0,0 @@
-<svg width="10" height="11" viewBox="0 0 10 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 4.46552C9.66667 4.85042 9.66667 5.81267 9 6.19757L1.5 10.5277C0.833332 10.9126 -1.90735e-06 10.4315 -1.90735e-06 9.66167V1.00142C-1.90735e-06 0.231615 0.833331 -0.24951 1.5 0.13539L9 4.46552Z" fill="#999999"/>
-</svg>
--- a/src/assets/icons/seller/back.svg
+++ b/src/assets/icons/seller/back.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="24" viewBox="0 0 12 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.3489 24C10.2173 24.0008 10.0869 23.9755 9.96503 23.9258C9.84319 23.876 9.73238 23.8027 9.63894 23.71L1.46894 15.54C1.00331 15.0755 0.633877 14.5238 0.381813 13.9163C0.129748 13.3089 0 12.6577 0 12C0 11.3423 0.129748 10.6911 0.381813 10.0837C0.633877 9.47621 1.00331 8.92446 1.46894 8.46L9.63894 0.290002C9.73218 0.196764 9.84287 0.122803 9.96469 0.0723426C10.0865 0.0218822 10.2171 -0.00408935 10.3489 -0.00408936C10.4808 -0.00408936 10.6114 0.0218822 10.7332 0.0723426C10.855 0.122803 10.9657 0.196764 11.0589 0.290002C11.1522 0.383241 11.2261 0.493931 11.2766 0.615753C11.3271 0.737575 11.353 0.868143 11.353 1C11.353 1.13186 11.3271 1.26243 11.2766 1.38425C11.2261 1.50607 11.1522 1.61676 11.0589 1.71L2.88894 9.88C2.32714 10.4425 2.01158 11.205 2.01158 12C2.01158 12.795 2.32714 13.5575 2.88894 14.12L11.0589 22.29C11.1527 22.383 11.2271 22.4936 11.2778 22.6154C11.3286 22.7373 11.3547 22.868 11.3547 23C11.3547 23.132 11.3286 23.2627 11.2778 23.3846C11.2271 23.5064 11.1527 23.617 11.0589 23.71C10.9655 23.8027 10.8547 23.876 10.7328 23.9258C10.611 23.9755 10.4805 24.0008 10.3489 24Z" fill="black"/>
-</svg>
--- a/src/assets/icons/seller/brandProfile.svg
+++ b/src/assets/icons/seller/brandProfile.svg
@@ -1,35 +0,0 @@
-<?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="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M92 5103 c-66 -32 -101 -105 -87 -180 6 -33 52 -84 376 -408 l369
-370 -75 -684 c-41 -377 -75 -716 -75 -753 0 -147 53 -312 140 -436 53 -76
-1977 -1988 2079 -2067 298 -229 717 -269 1051 -100 126 64 198 127 611 542
-446 447 493 503 560 665 57 137 73 226 73 393 -1 130 -4 164 -27 250 -34 127
-100 259 -177 355 -70 88 -2000 1999 -2068 2049 -63 45 -193 107 -267 126
-129 34 -199 31 -920 -44 l-680 -71 -365 364 c-201 201 -378 370 -393 376 -40
-14 -87 12 -125 -7z m2380 -924 c29 -6 82 -25 118 -42 59 -29 152 -118 1062
-1020 918 -910 1034 -1030 1081 -1122 66 -129 83 -342 38 -485 -39 -127 -82
-192 -230 -345 -311 -322 -650 -659 -701 -699 -124 -97 -248 -139 -410 -140
-128 -1 -187 13 -309 71 l-94 45 -634 626 c-1451 1434 -1388 1370 -1423 1443
-60 127 -60 131 4 724 32 292 60 550 63 573 l6 44 127 -127 128 -127 -19 -54
-c-77 -217 25 -464 232 -568 169 -85 340 -71 493 39 112 81 180 200 193 341 23
-244 -161 471 -410 507 -63 9 -87 8 -149 -7 -40 -9 -84 -19 -98 -22 -21 -4 -43
-13 -150 120 -118 119 -123 126 -95 127 17 0 255 24 530 54 552 58 571 60 647
-44z m-685 -649 c42 -18 77 -61 89 -108 18 -66 -37 -153 -109 -173 -177 -47
-271 206 -104 282 53 23 71 23 124 -1z"/>
-<path d="M3697 2450 c-26 -5 -76 -22 -110 -38 -54 -25 -95 -62 -312 -283 -516
-524 -522 -530 -557 -605 -31 -65 -33 -75 -33 -179 0 -105 2 -114 34 -180 29
-60 61 -97 230 -266 164 -165 206 -201 261 -228 148 -71 332 -53 450 45 19 16
-197 193 396 394 325 329 364 372 395 435 33 67 34 74 34 185 0 174 -7 186
-262 442 -221 222 -259 250 -370 273 -75 16 -86 16 -156 5z m295 -498 c176
-175 178 -178 178 -221 0 -43 0 -43 -314 -364 -416 -427 -405 -417 -458 -417
-42 0 -45 3 -220 178 -162 162 -178 181 -178 212 0 19 9 49 20 65 10 17 173
-186 362 378 l343 347 45 0 c44 0 45 -1 222 -178z"/>
-</g>
-</svg>
--- a/src/assets/icons/seller/myListings.svg
+++ b/src/assets/icons/seller/myListings.svg
@@ -1,24 +0,0 @@
-<?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="512.000000pt" height="488.000000pt" viewBox="0 0 512.000000 488.000000"
- preserveAspectRatio="xMidYMid meet">
-
-<g transform="translate(0.000000,488.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M2425 4873 c-518 -70 -923 -535 -929 -1063 0 -80 3 -102 21 -137 70
-131 234 -159 337 -57 45 46 58 81 67 190 17 195 89 349 218 466 120 108 254
-161 411 161 184 0 307 -51 441 -183 71 -70 94 -100 127 -170 54 -112 85 -262
-80 -381 -6 -131 -39 -191 -192 -345 -276 -277 -500 -453 -1656 -1307 -733
-541 -1115 -829 -1155 -871 -75 -78 -128 -167 -162 -271 -23 -69 -27 -98 -27
-205 -1 -90 4 -143 17 -189 55 -200 190 -362 372 -446 138 -64 -7 -60 2170
-60 1895 0 1993 1 2054 18 233 66 413 250 478 488 13 46 18 98 17 189 -1 107
-4 137 -27 205 -36 109 -89 196 -167 275 -40 40 -436 339 -1032 779 -533 393
-968 718 -968 722 0 3 64 62 142 130 347 301 481 474 539 694 41 154 25 417
-38 620 -121 387 -448 677 -838 740 -83 14 -229 18 -300 8z m1152 -3229 c549
-405 1015 -753 1037 -773 52 -49 76 -103 76 -176 0 -103 -58 -194 -147 -232
-44 -18 -3893 -20 -3954 -2 -93 28 -159 126 -159 234 0 73 24 127 76 176 74
-69 2047 1520 2060 1515 8 -3 462 -337 1011 -742z"/>
-</g>
-</svg>
--- a/src/assets/icons/seller/myOrders.svg
+++ b/src/assets/icons/seller/myOrders.svg
@@ -1,22 +0,0 @@
-<?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="M207 953 c-4 -3 -7 -21 -7 -39 0 -31 -2 -33 -37 -36 l-38 -3 -3 -378
-c-3 -418 -1 -429 60 -467 31 -19 46 -20 306 -18 l274 3 34 37 34 38 0 395 0
-395 -40 0 -40 0 0 41 0 40 -37 -3 c-36 -3 -38 -5 -41 -40 -3 -36 -5 -38 -37
-38 -32 0 -34 2 -37 38 -3 36 -4 37 -43 37 -40 0 -40 0 -40 -38 0 -36 -1 -37
-37 -37 -38 0 -38 0 -38 40 l0 40 -40 0 -40 0 0 -40 0 -40 -40 0 -40 0 0 40
-c0 39 -1 40 -33 40 -19 0 -37 -3 -40 -7z m543 -496 c0 -253 -3 -346 -12 -355
-9 -9 -79 -12 -254 -12 -133 0 -249 3 -258 6 -14 5 -16 46 -16 355 l0 349 270
-0 270 0 0 -343z"/>
-<path d="M280 640 l0 -40 198 2 197 3 3 38 3 37 -200 0 -201 0 0 -40z"/>
-<path d="M280 485 l0 -45 198 2 197 3 0 40 0 40 -197 3 -198 2 0 -45z"/>
-<path d="M280 330 l0 -40 120 0 120 0 0 40 0 40 -120 0 -120 0 0 -40z"/>
-</g>
-</svg>
--- a/src/assets/icons/seller/sellerIndex.svg
+++ b/src/assets/icons/seller/sellerIndex.svg
@@ -1,3 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.9797 13.2649C14.0637 13.5764 13.8788 13.896 13.5673 13.9794C13.5166 13.9928 13.4658 13.9998 13.4157 13.9998C13.1584 13.9998 12.9228 13.8277 12.8528 13.5676C12.6451 12.7918 11.9171 12.25 11.083 12.25C10.2489 12.25 9.52088 12.7918 9.31322 13.5676C9.22922 13.8785 8.90956 14.0634 8.59866 13.98C8.28717 13.8966 8.10225 13.5769 8.18625 13.2655C8.53099 11.9805 9.72212 11.0834 11.083 11.0834C12.4439 11.0834 13.635 11.9805 13.9797 13.2655V13.2649ZM11.083 7.58318C10.2786 7.58318 9.62471 8.23704 9.62471 9.04138C9.62471 9.84572 10.2786 10.4996 11.083 10.4996C11.8874 10.4996 12.5413 9.84572 12.5413 9.04138C12.5413 8.23704 11.8874 7.58318 11.083 7.58318ZM2.33326 8.74974H2.91658C3.61656 8.74974 4.23837 8.4336 4.66653 7.94365C5.09468 8.4336 5.71649 8.74974 6.41647 8.74974H7.5831C7.85026 8.74974 8.11217 8.70483 8.36125 8.61617C8.66515 8.50826 8.82382 8.17521 8.7159 7.87132C8.60741 7.56744 8.27375 7.40995 7.97159 7.51669C7.84793 7.56044 7.71668 7.5826 7.5831 7.5826H6.41647C5.77308 7.5826 5.24984 7.0594 5.24984 6.41605C5.24984 6.09408 4.98852 5.83277 4.66653 5.83277C4.34454 5.83277 4.08321 6.09408 4.08321 6.41605C4.08321 7.0594 3.55998 7.5826 2.91658 7.5826H2.33326C1.70445 7.5826 1.19055 7.08273 1.16721 6.45921L1.83569 2.40602C2.0591 1.67517 2.74275 1.16655 3.50981 1.16655H4.08321V2.91638C4.08321 3.23835 4.34454 3.49966 4.66653 3.49966C4.98852 3.49966 5.24984 3.23835 5.24984 2.91638V1.16655H8.74973V2.91638C8.74973 3.23835 9.01048 3.49966 9.33305 3.49966C9.65562 3.49966 9.91637 3.23835 9.91637 2.91638V1.16655H10.4892C11.2557 1.16655 11.9399 1.67459 12.1633 2.40602L12.8318 6.45921C12.8271 6.57761 12.8049 6.69369 12.7659 6.80509C12.6585 7.10898 12.8184 7.44203 13.1217 7.54935C13.4262 7.65726 13.7587 7.49744 13.866 7.19356C13.9535 6.94391 13.999 6.68202 13.999 6.41605C13.999 6.38397 13.2996 2.13654 13.2932 2.11496C12.9374 0.869666 11.7836 0 10.4886 0H3.50981C2.21485 0.000583277 1.06163 0.870249 0.705229 2.11555C0.698812 2.13713 0 6.38455 0 6.41663C0 7.00282 0.224577 7.53302 0.583316 7.94365V11.6661C0.583316 12.9528 1.62978 13.9992 2.91658 13.9992H6.41647C6.73846 13.9992 6.99979 13.7379 6.99979 13.416C6.99979 13.094 6.73846 12.8327 6.41647 12.8327H2.91658C2.27318 12.8327 1.74995 12.3095 1.74995 11.6661V8.66691C1.93777 8.71591 2.13085 8.74974 2.33326 8.74974Z" fill="#585858"/>
-</svg>
--- a/src/assets/icons/seller/sellerToolTipClose.svg
+++ b/src/assets/icons/seller/sellerToolTipClose.svg
@@ -1,3 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M29.75 0.5C30.2139 0.50007 30.6592 0.684683 30.9873 1.0127C31.3153 1.34085 31.499 1.78607 31.499 2.25C31.499 2.71394 31.3153 3.15919 30.9873 3.4873L18.4746 16L30.9873 28.5127C31.3153 28.8409 31.499 29.2861 31.499 29.75C31.499 30.2139 31.3153 30.6592 30.9873 30.9873C30.6592 31.3153 30.2139 31.499 29.75 31.499C29.2861 31.499 28.8409 31.3153 28.5127 30.9873L16 18.4746L3.4873 30.9873C3.15919 31.3153 2.71394 31.499 2.25 31.499C1.78607 31.499 1.34085 31.3153 1.0127 30.9873C0.684683 30.6592 0.50007 30.2139 0.5 29.75C0.5 29.286 0.684623 28.8409 1.0127 28.5127L13.5254 16L1.0127 3.4873C0.684684 3.15919 0.500071 2.71394 0.5 2.25C0.5 1.78596 0.684621 1.34087 1.0127 1.0127C1.34087 0.684621 1.78596 0.5 2.25 0.5C2.71394 0.500071 3.15919 0.684684 3.4873 1.0127L16 13.5254L28.5127 1.0127C28.8409 0.684623 29.286 0.5 29.75 0.5Z" fill="black" stroke="black"/>
-</svg>
--- a/src/assets/icons/seller/settings.svg
+++ b/src/assets/icons/seller/settings.svg
@@ -1,27 +0,0 @@
-<?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="M235 946 c-30 -13 -85 -69 -85 -86 0 -5 -30 -10 -66 -12 -51 -2 -70
-7 -78 -20 -21 -34 4 -52 77 -58 62 -5 67 -7 89 -40 27 -40 79 -70 123 -70 42
-0 96 31 123 71 l23 34 251 5 c225 4 252 7 262 23 8 12 8 22 0 35 -10 15 -36
-17 -267 20 l-255 2 -6 25 c-15 60 -125 101 -191 71z m103 -82 c47 -33 16 -124
-43 -124 -31 0 -75 41 -75 70 0 28 43 70 72 70 13 0 34 -7 46 -16z"/>
-<path d="M600 611 c-19 -10 -45 -33 -58 -52 l-23 -34 -251 -5 c-225 -4 -252
-7 -262 -22 -8 -13 -8 -23 0 -35 10 -16 36 -18 267 -21 l255 -2 6 -25 c3 -13
-23 -37 43 -52 29 -22 47 -28 89 -28 59 0 95 21 129 73 18 28 25 31 84 34 48 2
-67 7 75 21 21 33 -4 51 -77 57 -62 5 -67 7 -89 40 -44 65 -122 87 -188 51z
-m115 -86 c14 -13 25 -33 25 -45 0 -28 -43 -70 -72 -70 -40 0 -68 27 -68 66 0
-68 68 97 115 49z"/>
-<path d="M235 286 c-30 -13 -85 -69 -85 -86 0 -5 -30 -10 -66 -12 -51 -2 -70
-7 -78 -20 -21 -34 4 -52 77 -58 62 -5 67 -7 89 -40 27 -40 79 -70 123 -70 42
-0 96 31 123 71 l23 34 251 5 c225 4 252 7 262 23 8 12 8 22 0 35 -10 15 -36
-17 -267 20 l-255 2 -6 25 c-15 60 -125 101 -191 71z m103 -82 c47 -33 16 -124
-43 -124 -30 0 -75 41 -75 68 0 11 9 31 21 46 24 30 63 34 97 10z"/>
-</g>
-</svg>
--- a/src/assets/images/seller/sellerToolTip-1.png
+++ b/src/assets/images/seller/sellerToolTip-1.png
--- a/src/assets/images/seller/sellerToolTip-2.png
+++ b/src/assets/images/seller/sellerToolTip-2.png
--- a/src/assets/images/seller/sellerToolTip-3.png
+++ b/src/assets/images/seller/sellerToolTip-3.png
--- a/src/assets/images/seller/success-0.png
+++ b/src/assets/images/seller/success-0.png
--- a/src/assets/images/seller/success-1.png
+++ b/src/assets/images/seller/success-1.png
--- a/src/assets/json/events.json
+++ b/src/assets/json/events.json
@@ -9,6 +9,11 @@
 			"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": [
@@ -16,18 +21,19 @@
 			"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 from Hong Kong, China, Singapore, South Korea, and beyond, 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."
+							"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 support provided, allowing them to showcase their talent, network with professionals, and celebrate their achievements on an international stage."
+							"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."
 						}
 					]
 				}
--- a/src/assets/json/events_cn.json
+++ b/src/assets/json/events_cn.json
@@ -9,6 +9,11 @@
 			"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": [
@@ -16,18 +21,19 @@
 			"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 时尚先锋的机会吧！"
+							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
 						}
 					]
 				},
 				{
 					"paragraph": [
 						{
-							"text": "参赛者将有机会赢取总奖金 9,000 美元，作品还将获得国际媒体展示机会，并与全球设计师和行业领袖建立联系。入围决赛者将受邀参加在香港举办的 专属颁奖典礼，主办方提供差旅支持，让设计师在国际舞台展示才华、拓展人脉，并共同庆祝创意成果。"
+							"text": "参赛者将有机会赢取总奖金 9,000 美元，作品还将获得国际媒体展示机会，并与全球设计师和行业领袖建立联系。入围决赛者将受邀参加在香港举办的 专属颁奖典礼，主办方提供差旅津贴，让设计师在国际舞台展示才华、拓展人脉，并共同庆祝创意成果。"
 						}
 					]
 				}
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -2386,16 +2386,6 @@ textarea:focus{
        // background: #ffffff;
    }
 }
-// 迷你滚动条
-.mini-scrollbar {
-	&::-webkit-scrollbar {
-		width: 0.4rem;
-	}
-	&::-webkit-scrollbar-thumb {
-		border-radius: 0.4rem;
-		background: rgba(0, 0, 0, 0.2);
-	}
-}

 //蒙层样式
 .mark_loading{
--- 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">
-			{{$t('account.dataNull')}}
+		<div
+			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 { Https } from "@/tool/https";
-import { useRouter,useRoute } from 'vue-router'
-import { useStore } from "vuex";
-import { useI18n } from 'vue-i18n'
+import {
+	defineComponent,
+	computed,
+	ref,
+	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/allUser.vue
+++ b/src/component/Administrator/allUser.vue
@@ -8,16 +8,11 @@
 						style="width: 250px"
 						class="range_picker"
 						v-model:value="rangePickerValue"
-                        :placeholder="[
-                            $t('HistoryPage.StartDate'),
-                            $t('HistoryPage.EndDate'),
-                        ]"
+						:placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]"
 						valueFormat="YYYY-MM-DD"
 					>
 						<template #suffixIcon>
-                            <span
-                                class="icon iconfont range_picker_icon icon-rili"
-                            ></span>
+							<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">
-                    Add
-                </div>
+				<div class="admin_search_item" @click="addhHistoryList">Add</div>
 			</div>
 			<div class="admin_state_list">
-                <div
-                    class="admin_state_list_item"
-                    @click="lastGeTrialList('year')"
-                >
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">
 					Nearly a year
 				</div>
-                <div
-                    class="admin_state_list_item"
-                    @click="lastGeTrialList('month')"
-                >
+				<div class="admin_state_list_item" @click="lastGeTrialList('month')">
 					Last month
 				</div>
-                <div
-                    class="admin_state_list_item"
-                    @click="lastGeTrialList('week')"
-                >
-                    Last week
-                </div>
+				<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
-                            class="operate_item"
-                            @click="setAagree(record)"
-                        >
-                            Edit
-                        </div>
+						<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 {
-    defineComponent,
-    ref,
-    createVNode,
-    computed,
-    reactive,
-    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'
+import { defineComponent, ref, createVNode, computed, reactive, 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',
-				value:'0',
+				label: "visitor",
+				value: "0"
 			},
 			{
-				label:'yearly',
-				value:'1',
+				label: "yearly",
+				value: "1"
 			},
 			{
-				label:'monthly',
-				value:'2',
+				label: "monthly",
+				value: "2"
 			},
 			{
-				label:'trial',
-				value:'3',
+				label: "trial",
+				value: "3"
 			},
 			{
 				label: "userInEvent",
-                value: "4",
+				value: "4"
 			},
 			{
 				label: "Edu Admin",
-                value: "7",
-            },
-        ]);
-        let renameData: any = ref({}); //修改名字选中的数据
+				value: "7"
+			}
+		])
+		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.pageSize = e.pageSize;
+			filterData.currentPage = e.current
+			filterData.pageSize = e.pageSize
 			if (sorter.order) {
-				if(sorter.columnKey == 'id'){
-					filterData.orderBy = 'id'
+				if (sorter.columnKey == "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;
-            gettrialList();
-        };
+			filterData.currentPage = 1
+			gettrialList()
+		}
 		let clearHistoryList = () => {
-            filterData.rangePickerValue = [],
-			filterData.currentPage = 1,
-			filterData.pageSize = 10,
-			filterData.total = 0,
-			filterData.country = "",
-			filterData.email = "",
-			filterData.userType = "",
-			filterData.ids = [],
-			filterData.occupation = "",
-			filterData.order = "", //'Ascending  升序 Descending 降序'
-			filterData.orderBy = "", //'Ascending  升序 Descending 降序'
-			filterData.systemUser = "",
-			filterData.userName = "";
-        };
+			;((filterData.rangePickerValue = []),
+				(filterData.currentPage = 1),
+				(filterData.pageSize = 10),
+				(filterData.total = 0),
+				(filterData.country = ""),
+				(filterData.email = ""),
+				(filterData.userType = ""),
+				(filterData.ids = []),
+				(filterData.occupation = ""),
+				(filterData.order = ""), //'Ascending  升序 Descending 降序'
+				(filterData.orderBy = ""), //'Ascending  升序 Descending 降序'
+				(filterData.systemUser = ""),
+				(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,
-            };
-            return data;
-        };
+				organizationId: filterData.organizationId
+			}
+			return data
+		}
 		//获取列表
 		let gettrialList = () => {
-            filter.tableLoading = true;
-            let data = setHistoryListData();
-            Https.axiosPost(Https.httpUrls.getUserInfo, data).then(
-                (rv: any) => {
+			filter.tableLoading = true
+			let data = setHistoryListData()
+			Https.axiosPost(Https.httpUrls.getUserInfo, data).then((rv: any) => {
 				if (rv) {
 					// this.dataList = rv
-                        filter.dataList = rv.records;
-                        filterData.total = rv.total;
-                        filter.tableLoading = false;
+					filter.dataList = rv.records
+					filterData.total = rv.total
+					filter.tableLoading = false

 					// this.workspaceItem.position = this.singleTypeList[0].label
 				}
+			})
 		}
-            );
-        };
 		let lastGeTrialList = (str: string) => {
-            clearHistoryList();
-            let currentDate = new Date();
-            let currentTimestamp = Math.floor(currentDate.getTime() / 1000);
+			clearHistoryList()
+			let currentDate = new Date()
+			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;
-        this.historyTableHeight = historyTable.clientHeight - 200;
+		let historyTable: any = this.$refs.historyTable
+		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' } }"
-        :wrapper-col="{ style: { width: '22rem' } }"
+				:label-col="{ style: { width: '14rem' } }"
+				: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 @click="openEdit(record)">Edit</a>
+							<a-space class="plan-row-actions" @click.stop>
+								<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'
-import SelectUser from '@/component/common/SelectUser.vue'
-import { message } from 'ant-design-vue'
-import { Https } from '@/tool/https'
-import { formatTime } from '@/tool/util'
-import store from '@/store'
-import type { FormInstance, Rule } from 'ant-design-vue/es/form'
-import { debounce } from 'lodash-es'
-import dayjs, { Dayjs } from 'dayjs'
+	} from "vue"
+	import SelectUser from "@/component/common/SelectUser.vue"
+	import { message } from "ant-design-vue"
+	import { Https } from "@/tool/https"
+	import { formatTime } from "@/tool/util"
+	import store from "@/store"
+	import type { FormInstance, Rule } from "ant-design-vue/es/form"
+	import { debounce } from "lodash-es"
+	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: '',
-  startTime: '',
-  endTime: '',
+		name: "",
+		startTime: "",
+		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: '',
-  currentPeriodStart: '',
-  currentPeriodEnd: '',
+		name: "",
+		currentPeriodStart: "",
+		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',
-  ACTIVE: 'Active',
-  EXPIRED: 'Expired'
+		PENDING: "Pending",
+		ACTIVE: "Active",
+		EXPIRED: "Expired"
 	}
 	const statusColorMap: Record<PlanStatus, string> = {
-  PENDING: 'blue',
-  ACTIVE: 'green',
-  EXPIRED: 'red'
+		PENDING: "blue",
+		ACTIVE: "green",
+		EXPIRED: "red"
 	}

 	const statusOption = ref([
 		{
-    label: 'Pending',
-    value: 'PENDING'
+			label: "Pending",
+			value: "PENDING"
 		},
 		{
-    label: 'Active',
-    value: 'ACTIVE'
+			label: "Active",
+			value: "ACTIVE"
 		},
 		{
-    label: 'Expired',
-    value: 'EXPIRED'
+			label: "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: 'ID', dataIndex: 'id', key: 'id', align: 'center', width: 80 },
+		{ title: "Name", dataIndex: "name", key: "name", align: "center", width: 180 },
+		{ title: "ID", dataIndex: "id", key: "id", align: "center", width: 80 },
 		{
-    title: 'Organization',
-    dataIndex: 'organizationName',
-    key: 'organizationName',
-    align: 'center',
+			title: "Organization",
+			dataIndex: "organizationName",
+			key: "organizationName",
+			align: "center",
 			width: 180
 		},
 		{
-    title: 'Admin Account',
-    dataIndex: 'adminAccEmail',
-    key: 'adminAccEmail',
-    align: 'center',
+			title: "Admin Account",
+			dataIndex: "adminAccEmail",
+			key: "adminAccEmail",
+			align: "center",
 			width: 180,
 			ellipsis: true
 		},
 		{
-    title: 'Sub-Account Num',
-    dataIndex: 'accountNum',
-    key: 'accountNum',
-    align: 'center',
+			title: "Sub-Account Num",
+			dataIndex: "accountNum",
+			key: "accountNum",
+			align: "center",
 			width: 120,
 			ellipsis: true
 		},
 		{
-    title: 'Country or Region',
-    dataIndex: 'countryOrRegion',
-    key: 'countryOrRegion',
-    align: 'center',
+			title: "Country or Region",
+			dataIndex: "countryOrRegion",
+			key: "countryOrRegion",
+			align: "center",
 			width: 120,
 			ellipsis: true
 		},
 		{
-    title: 'Start Time',
-    dataIndex: 'currentPeriodStart',
-    key: 'currentPeriodStart',
-    align: 'center',
+			title: "Start Time",
+			dataIndex: "currentPeriodStart",
+			key: "currentPeriodStart",
+			align: "center",
 			width: 200
 		},
 		{
-    title: 'End Time',
-    dataIndex: 'currentPeriodEnd',
-    key: 'currentPeriodEnd',
-    align: 'center',
+			title: "End Time",
+			dataIndex: "currentPeriodEnd",
+			key: "currentPeriodEnd",
+			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',
-    dataIndex: 'creditLimit',
-    key: 'creditLimit',
-    align: 'center',
+			title: "Credit Limit",
+			dataIndex: "creditLimit",
+			key: "creditLimit",
+			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 = () => {
-  nextTick(() => {
-    if (historyTable.value) {
-      historyTableHeight.value = historyTable.value.clientHeight - 200
+	const getElementOuterHeight = (element: Element | null) => {
+		if (!element) return 0
+		const htmlElement = element as HTMLElement
+		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)
-  const list = sessionStorage.getItem('allCountry')
+		setupTableResizeObserver()
+		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.currentPeriodStart = ''
-  formState.currentPeriodEnd = ''
+		formState.name = ""
+		formState.currentPeriodStart = ""
+		formState.currentPeriodEnd = ""
 		formState.organizationId = undefined
 		formState.adminAccId = undefined
 		formState.creditLimit = null
@@ -683,26 +973,26 @@ const handleSearch = () => {
 	}

 	const handleReset = () => {
-  searchForm.name = ''
-  searchForm.startTime = ''
-  searchForm.endTime = ''
+		searchForm.name = ""
+		searchForm.startTime = ""
+		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.currentPeriodEnd, message: 'Please select the end time' },
-    { value: formState.adminAccId, message: 'Please select the admin account' },
+			{ value: formState.currentPeriodStart, message: "Please select the start time" },
+			{ value: formState.currentPeriodEnd, message: "Please select the end time" },
+			{ 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.organizationId, message: 'Please select organization' }
+				{ value: formState.name, message: "Please input the name" },
+				{ 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 => {
-      message.success('Subscription plan deleted')
+			.then((res) => {
+				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;
-  row-gap: 2rem;
+		--search-label-width: 14rem;
+		--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/components/ToolsSidebar.vue
+++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue
@@ -55,6 +55,7 @@ commandManager.setChangeCallback((info) => {
  emit("undo-redo-status-changed", {
    canUndo: canUndo.value,
    canRedo: canRedo.value,
+	type: info.type,
    commandManager,
  });
 });
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -907,7 +907,8 @@
 		}
 		emit("changeCanvas", commandData)
 		canvasManager.changeCanvas()
-		if ((command.canUndo || command.canRedo) && props.enabledRedGreenMode) {
+		const type = command.type
+		if (props.enabledRedGreenMode && (type === "undo" || type === "redo")) {
 			setTimeout(async () => {
 				try {
 					const imageData = await canvasManager.exportImage({
@@ -1040,6 +1041,7 @@
 		},
 		// 导出图片
 		exportImage: async ({
+			isFrontBackUpdata = false, // 更新红绿图时候需要用，直接更新红绿图
 			isContainBg = false, // 是否包含背景图层
 			isContainFixed = false, // 是否包含固定图层
 			isContainFixedOther = true, // 是否包含其他固定图层--颜色图层
@@ -1056,6 +1058,10 @@
 		} = {}) => {
 			loading.value = true
 			canvasManager?.canvas?.discardActiveObject()
+			if (isFrontBackUpdata) {
+				await canvasManager?.setSpecialCliptInfo(true, true)
+				canvasManager.canvas.renderAll()
+			}
 			var base64 = await canvasManager.exportImage({
 				isContainBg,
 				isContainFixed,
--- a/src/component/Canvas/CanvasEditor/managers/BrushIndicator.js
+++ b/src/component/Canvas/CanvasEditor/managers/BrushIndicator.js
@@ -409,7 +409,7 @@ export class BrushIndicator {
        //   this.show(e.e);
 		this._mouseEnterHandler && this._mouseEnterHandler(e)
        } else {
-          // requestIdleCallback(() => {
+          // setTimeout(() => {
          //   this.updatePosition(e.e);
          // });

--- a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
@@ -623,17 +623,7 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
 			this.updateMaskPosition(backgroundObject);
 		}

-	// 更新颜色层信息
-	// const colorObject = this.getLayerObjectById(SpecialLayerId.COLOR);
-	// if(colorObject){
-	// 	await this.setObjecCliptInfo(colorObject);
-	// }
-	const groupLayer = this.layerManager.getLayerById(SpecialLayerId.SPECIAL_GROUP);
-	if(groupLayer){
-		const groupRect = new fabric.Rect({});
-		await this.setObjecCliptInfo(groupRect);
-		groupLayer.clippingMask = groupRect.toObject();
-	}
+		this.setSpecialCliptInfo(false, true)

 		// 重新渲染画布
 		this.canvas.renderAll();
@@ -1556,6 +1546,26 @@ backgroundObject.scaleY,'CanvasManager resetCanvasSizeByFixedLayer')
 		this.awaitCanvasRun = null;
 	}

+	//设置印花元素颜色的裁剪信息
+	async setSpecialCliptInfo(isColor = true, isGroup = true) {
+		// 更新颜色层信息
+		if (isColor) {
+			const colorObject = this.getLayerObjectById(SpecialLayerId.COLOR);
+			if (colorObject) {
+				await this.setObjecCliptInfo(colorObject);
+			}
+
+		}
+		// 更新特殊组图层信息
+		if (isGroup) {
+			const groupLayer = this.layerManager.getLayerById(SpecialLayerId.SPECIAL_GROUP);
+			if (groupLayer) {
+				const groupRect = new fabric.Rect({});
+				await this.setObjecCliptInfo(groupRect);
+				groupLayer.clippingMask = groupRect.toObject();
+			}
+		}
+	}
 	// 设置画布对象的裁剪信息
 	async setObjecCliptInfo(tagObject, data) {
 		const fixedLayerObj = this.getFixedLayerObject();
--- a/src/component/Canvas/CanvasEditor/managers/ExportManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/ExportManager.js
@@ -606,7 +606,9 @@ export class ExportManager {
 			imageSmoothingEnabled: true,
 		});
 		// tempFabricCanvas.setZoom(1);
-	console.log("==========", fixedLayerObject)
+		const ox = fixedLayerObject.left - fixedLayerObject.width * fixedLayerObject.scaleX / 2
+		const oy = fixedLayerObject.top - fixedLayerObject.height * fixedLayerObject.scaleY / 2
+		// console.log("==========", fixedLayerObject, ox, oy)
 		try {
 			// 克隆并添加所有对象到临时画布，需要调整位置相对于固定图层
 			for (let i = 0; i < objectsToExport.length; i++) {
@@ -616,15 +618,20 @@ export class ExportManager {
 					restoreOpacityInRedGreen && true
 				);
 				if (cloned) {
+					let scaleX = cloned.scaleX / fixedLayerObject.scaleX
+					let scaleY = cloned.scaleY / fixedLayerObject.scaleY
+					let top = (cloned.top - oy) * scaleY
+					let left = (cloned.left - ox) * scaleX
+					if (cloned.originX === "center" && cloned.originY === "center") {
+						top = canvasHeight / 2
+						left = canvasWidth / 2
+					}
 					cloned.set({
-            left: canvasWidth / 2,
-            top: canvasHeight / 2,
-			scaleX: cloned.scaleX / fixedLayerObject.scaleX,
-			scaleY: cloned.scaleY / fixedLayerObject.scaleY,
-			originX: "center",
-			originY: "center",
+						left: left,
+						top: top,
+						scaleX: scaleX,
+						scaleY: scaleY,
 					});
-		  console.log("==========", {...cloned})
 					// 更新对象坐标
 					cloned.setCoords();
 					tempFabricCanvas.add(cloned);
--- a/src/component/Canvas/CanvasEditor/managers/PartManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/PartManager.js
@@ -391,8 +391,8 @@ export class PartManager {
 			this.canvas.loading.value = true;
 		});
 		return new Promise((resolve, reject) => {
-			const user_id = store.state.UserHabit.userDetail.userId;
-			// const user_id = 24299;
+			// const user_id = store.state.UserHabit.userDetail.userId;
+			const user_id = 24299;
 			const data = {
 				image_path: this.props.clothingMinIOPath,
 				user_id,
--- a/src/component/Canvas/CanvasEditor/managers/RedGreenModeManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/RedGreenModeManager.js
@@ -133,11 +133,12 @@ export class RedGreenModeManager {
    this.canvas.on("mouse:up", (event) => {
      // 可以在这里添加更多逻辑，比如生成图片或更新状态
      nextTick(() => {
-        requestIdleCallback(async () => {
+        setTimeout(async () => {
          if (!this.isInitialized) {
            console.warn("红绿图模式未初始化，无法处理鼠标事件");
            return;
          }
+		  console.log("鼠标抬起事件触发", this.onImageGenerated);
          if (this.onImageGenerated) {
            const imageData = await this.canvasManager.exportImage({
              restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度
--- a/src/component/Canvas/CanvasEditor/managers/ThumbnailManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/ThumbnailManager.js
@@ -37,7 +37,6 @@ export class ThumbnailManager {

    // 延迟执行，避免阻塞UI
    fabricObjects.length > 0 &&
-      requestIdleCallback(() => {
        setTimeout(async () => {
          const base64 = await this._generateLayerThumbnailNow(fabricObjects, layer);
          // this.layerThumbnails.set(layerId, base64);
@@ -55,7 +54,6 @@ export class ThumbnailManager {
            console.error("生成图层缩略图时出错:", error);
          }
        });
-      });
  }

  /**
@@ -65,7 +63,7 @@ export class ThumbnailManager {
  generateAllLayerThumbnails(layers) {
    if (!layers || !Array.isArray(layers)) return;

-    requestIdleCallback(() => {
+    setTimeout(() => {
      setTimeout(() => {
        layers.forEach((layer) => {
          if (layer && layer.id) {
--- a/src/component/Canvas/CanvasEditor/managers/command/CommandManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/command/CommandManager.js
@@ -180,7 +180,7 @@ export class CommandManager {
      this._recordPerformance("execute", command.constructor.name, duration);

      // 通知状态变化
-      this._notifyStateChange();
+      this._notifyStateChange("execute");

      console.log(`✅ 命令执行成功: ${command.constructor.name}`);
      return result;
@@ -219,7 +219,7 @@ export class CommandManager {
      this._recordPerformance("undo", command.constructor.name, duration);

      // 通知状态变化
-      this._notifyStateChange();
+      this._notifyStateChange("undo");

      console.log(`✅ 命令撤销成功: ${command.constructor.name}`);
      return result;
@@ -258,7 +258,7 @@ export class CommandManager {
      this._recordPerformance("redo", command.constructor.name, duration);

      // 通知状态变化
-      this._notifyStateChange();
+      this._notifyStateChange("redo");

      console.log(`✅ 命令重做成功: ${command.constructor.name}`);
      return result;
@@ -298,7 +298,7 @@ export class CommandManager {

    this.undoStack = [];
    this.redoStack = [];
-    this._notifyStateChange();
+    this._notifyStateChange("clear");
    // console.log("📝 命令历史已清空");
  }

@@ -417,10 +417,12 @@ export class CommandManager {
   * 通知状态变化
   * @private
   */
-  _notifyStateChange() {
+  _notifyStateChange(type) {
    if (this.onStateChange) {
      try {
-        this.onStateChange(this.getState());
+		const obj = this.getState();
+		obj.type = type;
+        this.onStateChange(obj);
      } catch (error) {
        console.error("状态变化回调执行失败:", error);
      }
--- a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyRealTimeUpdater.js
+++ b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyRealTimeUpdater.js
@@ -85,7 +85,7 @@ export class LiquifyRealTimeUpdater {

    if (isDrawing && this.config.useDirectUpdate) {
      // 拖拽过程中使用快速更新（降低质量以提高性能）
-      this._fastUpdate(imageData);
+      await this._fastUpdate(imageData);
    } else {
      // 拖拽结束后使用完整更新（最高质量）
      await this._fullUpdate(imageData);
@@ -124,7 +124,7 @@ export class LiquifyRealTimeUpdater {
   * @param {ImageData} imageData 图像数据
   * @private
   */
-  _fastUpdate(imageData) {
+  async _fastUpdate(imageData) {
    if (!this.targetObject || !this.targetObject._element) {
      return;
    }
@@ -138,12 +138,14 @@ export class LiquifyRealTimeUpdater {

      // 直接更新fabric对象的图像源（使用PNG格式保持质量）
      const targetElement = this.targetObject._element;
-
      // 方案1: 直接设置src属性（最高性能）
      const dataURL = this.tempCanvas.toDataURL("image/png", quality);
-
      if (targetElement.src !== dataURL) {
-        targetElement.src = dataURL;
+        // targetElement.src = dataURL;
+		const image = new Image();
+		image.src = dataURL;
+		await image.decode();
+		this.targetObject.setElement(image);

        // 关键优化：直接设置fabric对象为脏状态，但不立即渲染
        // this.targetObject.dirty = false; // 标记为不需要立即渲染
@@ -153,7 +155,7 @@ export class LiquifyRealTimeUpdater {
        // 使用requestAnimationFrame进行批量渲染优化
        // if (!this.renderingScheduled && !this.config.skipRenderDuringDrag) {
        //   this.renderingScheduled = true;
-        //   requestIdleCallback(() => {
+        //   setTimeout(() => {
        //     this.canvas.renderAll();
        //     this.renderingScheduled = false;
        //   });
--- a/src/component/Canvas/CanvasEditor/utils/canvasFactory.js
+++ b/src/component/Canvas/CanvasEditor/utils/canvasFactory.js
@@ -7,7 +7,6 @@ import { canvasConfig } from "../config/canvasConfig";
 export const createCanvas = (elementId, options = {}) => {
  // Create the canvas instance
  const canvas = new fabric.Canvas(elementId, {
-	controlsAboveOverlay: true,// 控制面板在图层之上
    enableRetinaScaling: canvasConfig.enableRetinaScaling,
    renderOnAddRemove: false,
    preserveObjectStacking: true, // 保持对象堆叠顺序
--- a/src/component/Canvas/canvasExample.vue
+++ b/src/component/Canvas/canvasExample.vue
@@ -447,6 +447,7 @@
 				</template>
 			</CanvasEditor>
 		</div>
+		<img src="" alt="" id="canvas-test-dom">
 	</div>
 </template>
 <style>
@@ -458,6 +459,13 @@
 		height: 600px !important;
 		z-index: 99999999;
 	}
+	#canvas-test-dom{
+		position: fixed;
+		z-index: 9999999999;
+		top: 0;
+		left: 0;
+		pointer-events: none;
+	}
 </style>
 <style scoped lang="less">
 	* {
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -331,7 +331,6 @@ export default defineComponent({
 			store.commit('DesignDetail/setCurrentDetailType',str)
 		}
 		const setClothes = async (list:any,str:string)=>{
-			console.log(JSON.parse(JSON.stringify(list)))
 			let clothesList:any = []
 			if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
 				detailData.selectDetail.sketchString = rv
@@ -369,7 +368,6 @@ export default defineComponent({
 				// }else if(isCurrent){
 					
 				// }
-				console.log(JSON.parse(JSON.stringify(detailData.selectDetail.color)),'=====')
 				color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:''
 					gradient = list[i].gradient
 				if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
@@ -565,11 +563,14 @@ export default defineComponent({
 				}
 			}else{
 				//走画布合成图片并且直接分割
+				if(detailData.isEditPattern.value !== 'canvasEditor' && detailData.isEditPattern.value !== 'redGreenExample'){
 					if(detailData.isEditPattern.value !== 'canvasEditor'){
 						if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+					}
 					let otherData = await updateOtherLayers('single')
 					await detailDom.canvasBox.updateOtherLayers(otherData)
 				}
+				
 				await detailDom.canvasBox.privewDetail()
 				await upDateFrontBackSketch()
 				await uploadSelectDetail()
@@ -625,7 +626,7 @@ export default defineComponent({
 				if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
 					// await detailDom.canvasBox.saveCanvas()
 					await (detailDom.canvasBox as any).privewDetail()
-					if(detailData.isEditPattern.value == 'canvasEditor')await uploadSelectDetail()
+					if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample')await uploadSelectDetail()
 					detailData.isEditPattern.value = ''
 				}else{
 					// if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){
@@ -780,8 +781,7 @@ export default defineComponent({
 					color.gradient = canvasColor.gradient
 				}
 			}
-
-			if(detailData.isEditPattern.value == 'canvasEditor'){
+			if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample'){
 				delete detailData.selectDetail.newDetail
 				detailData.selectDetail.trims.prints = allInfo.trims || []
 				detailData.selectDetail.printObject.prints = allInfo.prints || []
@@ -804,7 +804,6 @@ export default defineComponent({
 			if(detailData.currentDetailType == 'color'){
 				detailData.detailLeftColorKey++
 			}
-			
 		}
 		const canvasReload = async ()=>{
 			if(detailData.isEditPattern.value){
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -163,7 +163,6 @@ export default defineComponent({
 		const privewDetail = async (oldSelectDetail = detailData.selectDetail)=>{
 			// if(!detailDom.editCanvas)return
 			return new Promise(async (res,reject)=>{
-				console.log(detailDom.editCanvas)
 				await detailDom.editCanvas.exportImage({
 					isContainFixed:true,
 					width:props.sketchSize.width,
@@ -245,17 +244,27 @@ export default defineComponent({


 		const frontBackChange = async (value:any)=>{
+			let front = detailData.frontBack.front[detailData.imgDomIndex]
+			let back = detailData.frontBack.back[detailData.imgDomIndex]
+			store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
+			await nextTick()
 			if(!detailData.selectDetail.partialDesign.partialDesignPath && !detailData.selectDetail.partialDesign.partialDesignBase64){
 				await privewDetail()
+			}else{
+				await detailDom.editCanvas.exportImage({
+					isFrontBackUpdata: true,
+					isContainFixed:true,
+					width:props.sketchSize.width,
+					height:props.sketchSize.height,
+				}).then((rv)=>{
+					if(detailData.selectDetail?.partialDesign)detailData.selectDetail.partialDesign.partialDesignBase64 = rv
+				})
 			}
 			let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath || detailData.selectDetail.path
 			let size = {
 				...detailData.canvasConfig,
 			}
-			store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
 			segmentImage(value,full,size).then(async (rv)=>{
-				let front = detailData.frontBack.front[detailData.imgDomIndex]
-				let back = detailData.frontBack.back[detailData.imgDomIndex]
 				if(!front?.oldImageUrl)front.oldImageUrl = front.imageUrl
 				if(!front?.oldMaskUrl)front.oldMaskUrl = front.maskUrl
 				if(!back?.oldImageUrl)back.oldImageUrl = back.imageUrl
@@ -267,7 +276,6 @@ export default defineComponent({
 				back.imageUrl = rv.targetBackUrl
 				// store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
 			})
-
 		}
 		const editSketchCanvasInit = async (value:any)=>{
 			detailData.canvasInstance = value
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -393,8 +393,8 @@ export default defineComponent({
 					angle: 0,
 					flipX: false,
 					flipY: false,
-					// blendMode: "multiply",
-					blendMode: "source-over",
+					blendMode: "multiply",
+					// blendMode: "source-over",
 					gapX: 0,
 					gapY: 0,
 				}
--- a/src/component/Detail/model/index.vue
+++ b/src/component/Detail/model/index.vue
@@ -124,7 +124,11 @@ export default defineComponent({
 		const handleResize = ()=>{ 
 			clearTimeout(time)
 			time = setTimeout(()=>{
-				store.commit('DesignDetail/setDesignDetail',getDetailListData.designDetail)
+				let data = {
+					...getDetailListData.designDetail,
+					fromType:'resize',
+				}
+				store.commit('DesignDetail/setDesignDetail',data)
 				getDetailListDom.position?.updataPosition?.()
 				getDetailListDom.modelNav?.setItemPosition?.()
 				getDetailListDom.position?.updateRect?.()
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -189,11 +189,11 @@ export default defineComponent({
 			}
 			return { scaleX, scaleY, rotate };
 		}
-		const initMoveableForSelected = () => {
+		const initMoveableForSelected = async (isDestroy:boolean = false) => {
 			// 销毁旧的实例
 			if(selectItem.imgDomIndex == -1)return
-			if (moveableInstance.value) {
-				moveableInstance.value.destroy();
+			if (moveableInstance?.value?.destroy && !isDestroy) {
+				moveableInstance?.value?.destroy();
 			}
 			
 			const selectedEl = elementRefs.value[selectItem.imgDomIndex];
@@ -509,7 +509,7 @@ export default defineComponent({
 		watch(()=>detailData.frontBack.front.length,(newValue,oldValue)=>{
 			if(selectItem.selectDetail?.id)selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == selectItem.selectDetail?.id)
 			setTimeout(()=>{
-				initMoveableForSelected()
+				initMoveableForSelected(oldValue == 0)
 			},100)
 		})
 		const setRevocation = async ()=>{
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -21,7 +21,11 @@
 						{{ $t("event.detail") }}
 					</div>
 				</div>
-				<div class="modal_title_text content" v-for="item in eventsDetail.textList">
+				<div
+					class="modal_title_text content"
+					v-for="item in eventsDetail.textList"
+					:class="{ award: eventsDetail.id === 3 }"
+				>
 					<div class="eventsDetail_content_right_btn_box">
 						<div
 							class="eventsDetail_content_right_btn"
@@ -43,6 +47,7 @@
 						v-detailText="introItem.text"
 					></div>
 				</div>
+				<div class="tips" v-if="eventsDetail.tips">{{ eventsDetail.tips }}</div>
 			</div>
 		</div>
 	</div>
@@ -120,8 +125,13 @@ export default defineComponent({
 				})
 		}
 		const openDetail = () => {
-			let language = locale.value === "ENGLISH" ? "en" : "zh"
+			let language = locale.value === "ENGLISH" ? "en" : "cn"
 			let url = `https://aida-global-design-awards.com.hk/${language}`
+			// 如果是dev环境把域名换成http://192.168.31.198
+
+			if (import.meta.env.VITE_APP_BASE_URL === "https://develop.api.aida.com.hk") {
+				url += "?env=dev"
+			}
 			window.open(url, "_blank")

 			//	router.push("/award/index")
@@ -233,7 +243,7 @@ export default defineComponent({
 		}
 		.eventsDetail_content_right {
 			.modal_title_text {
-				letter-spacing: 0.4rem;
+				letter-spacing: 0.3rem;
 				font-weight: 600;
 				&-header {
 					display: flex;
@@ -265,18 +275,21 @@ export default defineComponent({
 				.eventsDetail_content_right_btn_box {
 					display: flex;
 					justify-content: space-evenly;
-					.eventsDetail_content_right_btn {
+					// .eventsDetail_content_right_btn {
+					// }
 				}
 			}
-			}
-			.modal_title_text:last-child {
-			}
+			// .modal_title_text:last-child {
+			// }
 			.modal_title_text:last-child::after {
 				content: "";
 				display: block;
 				border-top: 3px solid;
 				height: 6rem;
 			}
+			.modal_title_text.award:last-child:after {
+				display: none;
+			}
 		}
 	}
 }
@@ -293,4 +306,13 @@ export default defineComponent({
 	white-space: nowrap;
 	cursor: pointer;
 }
+.tips{
+	color: rgba(0, 0, 0, 0.45);
+	font-size: var(--aida-fsize1-4);
+	font-weight: 400;
+	letter-spacing: 0.3rem;
+}
+.modal_title_text.content.award{
+	line-height: 1.3;
+}
 </style>
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -531,7 +531,7 @@ export default defineComponent({
      }
    )
    const setSpeed = (item: any) => {
-      speed.speedData = item
+      speed.speedData = {...item}
    }
    onMounted(() => {
      if (props.msg == 'Sketchboard') {
@@ -734,6 +734,8 @@ export default defineComponent({
      let maxImg = 8
      if (this.type_.type2 == 'Sketchboard') {
        maxImg = 20
+      }else if(this.type_.type2 == 'Printboard'){
+		maxImg = 16
 	}
      let parent: any = this.$parent
      if (parent.isUseGenerate) {
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/src/component/HomePage/UpgradePlan.vue
@@ -7,7 +7,7 @@
 			:get-container="() => $refs.upgradePlan"
            width="35%"
 			height="auto"
-			:zIndex="9999999"
+			zIndex="9999999"
            :maskClosable="false"
            :centered="true"
 			:closable="false"
--- a/src/component/HomePage/renew.vue
+++ b/src/component/HomePage/renew.vue
@@ -205,7 +205,7 @@
        </div>
        <div class="payment">
          <div class="allocation">
-            <div class="selectType">
+            <!-- <div class="selectType">
              <div class="text">{{ $t('Renew.Payment') }}:</div>
              <label>
                <input
@@ -227,7 +227,7 @@
                />
                {{ $t('Renew.Alipay') }}
              </label>
-            </div>
+            </div> -->
          </div>
          <div class="gallery_btn gallery_btn_radius" @click="payment">
            {{ $t('upgradePlan.Continue') }}
--- a/src/component/HomePage/scaleVideo.vue
+++ b/src/component/HomePage/scaleVideo.vue
@@ -77,17 +77,10 @@ export default defineComponent({
 		left: 50%;
 		top: 50%;
 		transform: translate(-50%,-50%);
-		width: 80%;
-		height: auto;
-		max-height: 80vh;
 		position: absolute;
-		width: max-content;
 		video{
-			width: 100%;
 			max-height:80vh;
-			height: 100%;
-			object-fit: contain;
-			width: max-content;
+			max-width:80vw;
 		}
 		.general_video_btn{
 			color: #fff;
--- a/src/component/home/design/childModel.vue
+++ b/src/component/home/design/childModel.vue
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -745,6 +745,12 @@ export default defineComponent({
 					"userLikeId": likeItem.id
 				}
 				arrData.push(obj)
+				designData.selectLikeDesign.forEach((v:any)=>{
+					if(v.id === likeItem.id){
+						v.oldSort = v.sort
+						v.sort = likeItem.sort
+					}
+				})
 			})
 			let data = {
 				"userLikeGroupId": userGroupId.value,
@@ -1304,9 +1310,9 @@ export default defineComponent({
 					})
 					return
 				}
-				const parents = designData.selectLikeDesign.filter((item:any) => item.resultType === 'Design');
+				const parents = designData.selectLikeDesign.filter((item:any) => item.resultType === 'Design').filter((item:any) => likeDesignCollectionList.value.some((v:any) => (v.id === item.id)));
 				parents.map((parent:any) => {
-					parent.sort = parent.oldSort||parent.sort
+					parent.sort = likeDesignCollectionList.value.find((v:any) => v.id === parent.id)?.sort || parent.oldSort||parent.sort
 					delete parent.oldSort
 					return {
 					...parent,
@@ -1533,7 +1539,7 @@ export default defineComponent({
 					this.observerData.time = setTimeout(()=>{
 						
 						this.setSystemDesigner(0)
-						this.setDesignItemStyle()
+						// this.setDesignItemStyle()
 					},100)
 					// const { width } = entry.contentRect;
 				}
@@ -1931,6 +1937,7 @@ export default defineComponent({
 			this.disLikeLoading = true;
 			Https.axiosPost(Https.httpUrls.designDislike, data)
 				.then((rv: any) => {
+					console.log(rv)
 					if (rv) {
 						this.recycleDomHidden = true
 						this.store.commit("addDesignCollectionList", [design]);
--- a/src/component/home/newProject/workspace.vue
+++ b/src/component/home/newProject/workspace.vue
@@ -41,10 +41,10 @@
 				<div class="center">{{ selectObject?.styleName?selectObject?.styleName:$t('Header.All') }}</div>
 				<div class="gallery_btn" @click="setStyle">{{ $t('Habit.Select') }}</div>
 			</div>
-			<div class="style brand marginBottom">
+			<!-- <div class="style brand marginBottom">
 				<div class="text">{{$t('Habit.Brand')}}:</div>
 				<div class="gallery_btn" @click="setBrandDNA">{{ $t('Habit.Select') }}</div>
-			</div>
+			</div> -->
 			<div class="brandImg" v-if="selectObject.userBrandDna"><img :src="selectObject.userBrandDnaImg"></div>
 			<div class="brandDNAStrenght marginBottom" v-if="selectObject.userBrandDna">
 				<div class="text" style="font-size: 1.6rem;">
--- a/src/component/modules/habitSetStyle.vue
+++ b/src/component/modules/habitSetStyle.vue
@@ -258,6 +258,7 @@ methods: {
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					text-align: center;
 				}
 			}
 			.content_bottom_item:nth-child(4n){
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -24,8 +24,6 @@ export default {
    SubscribeNow: '立即订阅',
    TaskList: '任务列表',
    ViewOrders: '查询订单',
-    BecomeSeller: '成为卖家',
-    SellerDashboard: '卖家中心',
    toolsToProduct: '转产品图',
    toolsRelight: '产品图编辑',
    toolsToTransferPose: '产品图视频',
@@ -1721,19 +1719,5 @@ export default {
    IncorrectEmailFormat: '请输入正确的邮箱格式',
    CompleteVerificationCode: '请输入完整的验证码',
    PleaseEnterYourAccountNumberOrPassword: '请输入您的账号或密码'
-  },
-	SellerToolTip: {
-		title: '如何上架你的设计',
-		titleInfo: '按照以下4个步骤将你的设计发布到市场。',
-		step1Title: '选择系列',
-		step1Info: '选择你要上架的设计系列。',
-		step2Title: '选择草图',
-		step2Info: '挑选你要上架的草图，可同时选择多个。',
-		step3Title: '编辑草图详情',
-		step3Info: '详情信息已从AiDA自动填充，请检查并补充任何缺失的信息。',
-		step4Title: '上架发布',
-		step4Info: '发布后，你的设计将立即在市场上线。',
-		showAgain: '不再提示',
-		GetStarted: '开始体验',
  }
 }
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -24,8 +24,6 @@ export default {
 		SubscribeNow: 'Subscribe now',
 		TaskList: 'Task List',
 		ViewOrders: 'View Orders',
-		BecomeSeller: 'Become a Seller',
-		SellerDashboard: 'Seller Dashboard',
 		toolsToProduct: 'To product image',
 		toolsRelight: 'Edit product image',
 		toolsToTransferPose: 'To product video',
@@ -1772,19 +1770,5 @@ export default {
 		IncorrectEmailFormat: 'The email format is incorrect',
 		CompleteVerificationCode: 'Please enter the complete verification code.',
 		PleaseEnterYourAccountNumberOrPassword: 'Please enter your account number or password'
-	},
-	SellerToolTip: {
-		title: 'How to List your Design',
-		titleInfo: 'Follow these 4 steps to publish your design to the marketplace.',
-		step1Title: 'Select Collection',
-		step1Info: 'Choose the design collection you want to list from.',
-		step2Title: 'Select Sketch',
-		step2Info: 'Pick the sketch you want to list. You can select multiple at a time.',
-		step3Title: 'Edit Sketch Details',
-		step3Info: 'Details are pre-filled from AiDA. Review and complete any missing information.',
-		step4Title: 'Listing Live',
-		step4Info: 'Publish and your design goes live on the marketplace.',
-		showAgain: 'Don’t show me again',
-		GetStarted: 'Get Started',
 	}
 }
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -169,69 +169,6 @@ const routes: Array<RouteRecordRaw> = [
        name: "otherUsers",
        meta: { enter: "all" },
        component: () => import("@/component/Account/otherUsers.vue"),
-      },
-	  {
-        path: "becomeSeller",
-        name: "becomeSeller",
-        meta: { enter: "all" },
-        component: () => import("@/views/SellerDashboard/BecomeSeller/index.vue"),
-	  },
-	  {
-        path: "seller",
-        name: "seller",
-        meta: { enter: "all" },
-        component: () => import("@/views/SellerDashboard/index.vue"),
-		children:[
-		  {
-            path: "brandProfile",
-            name: "brandProfile",
-            meta: { enter: "all" },
-            component: () => import("@/views/SellerDashboard/BrandProfile/index.vue"),
-          },
-		  {
-            path: "myListings",
-            name: "myListings",
-            meta: { enter: "all" },
-			children:[
-				{
-					path: "",
-					name: "myListingsChild",
-					meta: { enter: "all" },
-					redirect: "/home/seller/myListings/index",
-				},
-				{
-					path: "index",
-					name: "myListingsIndex",
-					meta: { enter: "all" },
-					component: () => import("@/views/SellerDashboard/MyListings/index.vue"),
-				},
-				{
-					path: "select",
-					name: "myListingsSelect",
-					meta: { enter: "all" },
-					component: () => import("@/views/SellerDashboard/MyListingCreateSelect/index.vue"),
-				},
-				{
-					path: "select/:id",
-					name: "myListingsSelectItem",
-					meta: { enter: "all" },
-					component: () => import("@/views/SellerDashboard/MyListingCreateSelectItem/index.vue"),
-				},
-			]
-          },
-		  {
-            path: "myOrders",
-            name: "myOrders",
-            meta: { enter: "all" },
-            component: () => import("@/views/SellerDashboard/BrandProfile/index.vue"),
-          },
-		  {
-            path: "settings",
-            name: "settings",
-            meta: { enter: "all" },
-            component: () => import("@/views/SellerDashboard/BrandProfile/index.vue"),
-          },
-		],
      },
    ],
  },
@@ -241,6 +178,12 @@ const routes: Array<RouteRecordRaw> = [
    meta: { enter: "all" },
    component: () => import("@/views/HomeRecommend.vue"),
  },
+  {
+    path: "/Square/:lang",
+    name: "HomeRecommendLang",
+    meta: { enter: "all" },
+    component: () => import("@/views/HomeRecommend.vue"),
+  },
  {
    path: "/administrator",
    name: "administrator",
@@ -394,6 +337,13 @@ const routes: Array<RouteRecordRaw> = [
        meta: { enter: 3 },
        component: () =>
          import("@/component/Administrator/SE/getGenerateFrequency/index.vue"),
+      },
+	  {
+        path: "globalAwardPopularity",
+        name: "globalAwardPopularity",
+        meta: { enter: 3 },
+        component: () =>
+          import("@/component/Administrator/globalAwardPopularity.vue"),
      },
    ],
  },
--- a/src/store/Detail/designDetail.ts
+++ b/src/store/Detail/designDetail.ts
@@ -87,8 +87,10 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 						left:0,
 						top:0,
 					}
+					if(data?.fromType !== 'resize'){
 						v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl
 						v.maskUrl = v.layersObject?.[0]?.maskUrl
+					}
 					v.layersObject[i].designOpenrtionBtn = false
 					if(v.layersObject[i].imageCategory.indexOf("back") == -1){
 						front[index] = v.layersObject[i]
--- a/src/tool/adminRouter.js
+++ b/src/tool/adminRouter.js
@@ -198,6 +198,13 @@ const all = (t)=>{
      route: '/administrator/subscriptionPlan',
      key: 'sub14',
      isShow: true
+    },
+    {
+      name: 'Global Award Popularity',
+      icon: 'usetime',
+      route: '/administrator/globalAwardPopularity',
+      key: 'sub15',
+      isShow: true
    }
  ]
 }
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -346,6 +346,7 @@ export const Https = {
 		switchSubscribePlan: '/api/subscription_plan/switchSubscriptionPlan', // 切换管理员订阅计划
 		switchSubAccountSubscribePlan:
 			'/api/subscription_plan/switchSubAccSubscriptionPlan', // 切换子账号订阅计划
+		getGlobalAwardPopularity: '/api/global-award/page/visit/count', // 获取global award流量

 		//云生成
 		designCloud: `/api/design/designCloud`, //创建云生成
--- a/src/tool/listData.js
+++ b/src/tool/listData.js
@@ -340,12 +340,12 @@ const navTypeList = (t)=>{
 					value:'Models',
 					router:'library=Models'
 				},
-				{
-					icon:'fi-ss-gem',
-					label:t('LibraryPage.brandDNA'),
-					value:'MyBrand',
-					router:'library=MyBrand'
-				},
+				// {
+				// 	icon:'fi-ss-gem',
+				// 	label:t('LibraryPage.brandDNA'),
+				// 	value:'MyBrand',
+				// 	router:'library=MyBrand'
+				// },
 			]
 		},
 		// history:{
--- a/src/tool/util.js
+++ b/src/tool/util.js
@@ -672,6 +672,17 @@ function sketchToMask(sketchImage) {
 		img.src = sketchImage;
 	});
 }
+
+function isValidUrl(string) {
+	try {
+		const url = new URL(string)
+		// 通常我们只需要 http 或 https 协议
+		return url.protocol === "http:" || url.protocol === "https:"
+	} catch (err) {
+		return false
+	}
+}
+
 export {
 	isEmail,
 	getUploadUrl,
@@ -695,5 +706,6 @@ export {
 	calculateGradientCoordinate,
 	segmentImage,
 	UrlToFile,
-  sketchToMask
+	sketchToMask,
+	isValidUrl
 }
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -373,15 +373,6 @@
                  <i class="fi fi-rs-notebook"></i>
                  <span class="select_item_des">{{ $t('Header.ViewOrders') }}</span>
                </div>
-                <div class="select_item" @click="onBecomeSeller">
-                  <span class="icon"><svg-icon name="seller-sellerIndex" /></span>
-                  <span class="select_item_des">{{ $t('Header.BecomeSeller') }}</span>
-                </div>
-                <div class="select_item" @click="onSellerDashboard">
-                  <span class="icon"><svg-icon name="seller-sellerIndex" /></span>
-                  <span class="select_item_des">{{ $t('Header.SellerDashboard') }}</span>
-				  <a-badge :dot="true"></a-badge>
-                </div>
                <router-link
                  class="select_item"
                  v-if="userDetail.systemList.indexOf(3) >= 0"
@@ -409,7 +400,7 @@
 					<a href="https://www.facebook.com/CodeCreateAI" target="_blank" >
 						<img src="@/assets/images/socialMediaLogo/faceBookIcon.svg" alt="">
 					</a>
-					<a href="https://www.youtube.com/@AiDA-3.1" target="_blank" >
+					<a href="https://www.youtube.com/@Code-Create_AiDA" target="_blank" >
 						<img src="@/assets/images/socialMediaLogo/socialIcons.svg" alt="">
 					</a>
 					<a href="https://www.linkedin.com/company/code-create-limited" target="_blank" >
@@ -1254,12 +1245,6 @@ export default defineComponent({
      let payOrder = this.$refs.payOrder
      payOrder.init()
    },
-	onBecomeSeller(){
-		this.$router.push({ name: 'becomeSeller' })
-	},
-	onSellerDashboard(){
-		this.$router.push({ name: 'brandProfile' })
-	},
    //教程
    getTutorial() {
      let url = 'https://aida-user-manual-chinese.super.site/'
--- a/src/views/HomeRecommend.vue
+++ b/src/views/HomeRecommend.vue
@@ -62,7 +62,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
 import { useStore } from 'vuex'
 import { setLang } from '@/tool/guide'
 import { useI18n } from 'vue-i18n'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import { gsap, TweenMax } from 'gsap'
 import { ScrollTrigger } from 'gsap/ScrollTrigger'
 export default defineComponent({
@@ -71,6 +71,7 @@ export default defineComponent({
 		const {t, locale} = useI18n()
    const store = useStore()
    const router = useRouter()
+	const route = useRoute()
    let registerModel = ref()
    let data = reactive({})

@@ -117,7 +118,14 @@ export default defineComponent({
    onMounted(() => {
      window.addEventListener('resize', updataIsMoblie)
      // 初始化语言设置
-      const savedLang = localStorage.getItem('loginLanguage')
+      let savedLang = localStorage.getItem('loginLanguage')
+	  if(route?.params?.lang == 'cn'){
+		savedLang = 'CHINESE_SIMPLIFIED'
+        localStorage.setItem('loginLanguage', savedLang)
+	  }{
+		savedLang = 'ENGLISH'
+        localStorage.setItem('loginLanguage', savedLang)
+	  }
      if (savedLang) {
        isChinese.value = savedLang === 'CHINESE_SIMPLIFIED'
        locale.value = savedLang
--- a/src/views/SellerDashboard/BecomeSeller/index.vue
+++ b/src/views/SellerDashboard/BecomeSeller/index.vue
@@ -1,35 +0,0 @@
-<template>
-	<div class="become-seller">
-		<seller-header
-			title="Apply to Become a Seller"
-			tip="Join the Stylish Parade and start selling your design work"
-		/>
-		<div class="content">
-			<seller-review v-if="isSubmit" />
-			<seller-apply v-else @submit="isSubmit = true" />
-		</div>
-	</div>
-</template>
-
-<script setup>
-	import { ref, computed } from "vue"
-	import sellerHeader from "../seller-header.vue"
-	import sellerReview from "./sellerReview.vue"
-	import sellerApply from "./sellerApply.vue"
-	const isSubmit = ref(false)
-</script>
-<style scoped lang="less">
-	.become-seller {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		> .content {
-			margin-top: 4rem;
-			flex: 1;
-			overflow: hidden;
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/BecomeSeller/sellerApply.vue
+++ b/src/views/SellerDashboard/BecomeSeller/sellerApply.vue
@@ -1,353 +0,0 @@
-<template>
-	<div class="seller-apply">
-		<div class="session">
-			<div class="content mini-scrollbar">
-				<div class="title">Brand Information</div>
-				<div class="tip">Share a few details to set up your seller profile</div>
-				<div class="form">
-					<a-form
-						:model="formData"
-						:rules="formRules"
-						layout="vertical"
-						class="my-form"
-						ref="formRef"
-					>
-						<a-form-item label="Store Name" name="storeName">
-							<a-input
-								v-model:value="formData.storeName"
-								placeholder="Enter the store name"
-								:maxlength="80"
-							/>
-							<span class="tip-length">{{ formData.storeName.length }}/80</span>
-						</a-form-item>
-						<a-form-item label="Owner’s Full Name" name="fullName">
-							<a-input
-								v-model:value="formData.fullName"
-								placeholder="Enter store owner's full name"
-							/>
-						</a-form-item>
-						<div class="form-group">
-							<a-form-item label="Email" name="email">
-								<a-input
-									type="email"
-									v-model:value="formData.email"
-									placeholder="Enter email"
-								/>
-							</a-form-item>
-							<a-form-item label="Phone Number" name="phoneNumber">
-								<a-input
-									type="tel"
-									v-model:value="formData.phoneNumber"
-									placeholder="Enter phone number"
-								/>
-							</a-form-item>
-						</div>
-						<a-form-item label="Store Description" name="description">
-							<a-textarea
-								v-model:value="formData.description"
-								placeholder="Briefly describe your design style and store features..."
-								:maxlength="500"
-							/>
-							<span class="tip-length">{{ formData.description.length }}/500</span>
-						</a-form-item>
-						<a-form-item label="Portfoilo/Social Media Links">
-							<a-input
-								placeholder="https://"
-								v-for="(v, i) in formData.links"
-								:key="i"
-								v-model:value="formData.links[i]"
-							>
-								<template #prefix>Link {{ i + 1 }}</template>
-							</a-input>
-							<a-input
-								placeholder="https://"
-								v-model:value="newLink"
-								@keyup.enter.prevent="addLink"
-							>
-								<template #prefix>
-									<span @click="addLink" style="cursor: pointer">
-										<svg-icon name="seller-add" size="20" />
-									</span>
-								</template>
-							</a-input>
-						</a-form-item>
-					</a-form>
-				</div>
-			</div>
-		</div>
-		<div class="session">
-			<div class="content">
-				<div class="title">Brand Information</div>
-				<div class="tip">Share a few details to set up your seller profile</div>
-				<div class="agreement">
-					<div class="title">AiDA Seller Agreement</div>
-					<div class="tip">
-						By checking the box below, you agree to comply with the following terms:
-					</div>
-					<ul>
-						<li>Provide accurate and truthful personal and store information</li>
-						<li>Only sell original designs or content with proper licensing</li>
-						<li>Maintain high quality standards for all products</li>
-						<li>Respond to customer inquiries within 48 hours</li>
-						<li>Ship orders within promised timeframes</li>
-						<li>Comply with AiDA's terms of service and community guidelines</li>
-						<li>Pay applicable platform fees and transaction charges</li>
-						<li>Handle customer disputes professionally and fairly</li>
-					</ul>
-				</div>
-				<a-checkbox class="agree-agreement" v-model:checked="isAgreement">
-					I have read and agree to the Seller Agreement, understanding my responsibilities
-					and obligations as a seller on the AiDA platform.
-				</a-checkbox>
-			</div>
-			<div class="btns">
-				<button class="cancel" @click="onCancel">Cancel</button>
-				<button class="submit" :disabled="!isAgreement" @click="onSubmit">
-					Submit Application
-				</button>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup>
-	import { ref, reactive } from "vue"
-	import { useRoute, useRouter } from "vue-router"
-	const route = useRoute()
-	const router = useRouter()
-	const emit = defineEmits(["submit"])
-	const formRules = {
-		storeName: [{ required: true, message: "Enter the store name" }],
-		fullName: [{ required: true, message: "Enter store owner's full name" }],
-		email: [{ required: true, message: "Enter email" }],
-		phoneNumber: [{ required: true, message: "Enter phone number" }],
-		description: [{ required: true, message: "Enter store description" }]
-	}
-	const formRef = ref(null)
-	const formData = reactive({
-		storeName: "",
-		fullName: "",
-		email: "",
-		phoneNumber: "",
-		description: "",
-		links: ["", ""]
-	})
-	const isAgreement = ref(false)
-	const newLink = ref("")
-	const addLink = () => {
-		formData.links.push(newLink.value)
-		newLink.value = ""
-	}
-	const onCancel = () => {
-		router.back()
-	}
-	const onSubmit = () => {
-		formRef.value
-			.validate()
-			.then(() => {
-				console.log(formData)
-				emit("submit")
-			})
-			.catch(() => {
-				console.log("validate failed")
-			})
-	}
-</script>
-<style scoped lang="less">
-	.seller-apply {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		padding: 0 10rem;
-		display: flex;
-		gap: 6rem;
-		> .session {
-			flex: 1;
-			overflow: hidden;
-			> .content {
-				max-height: 100%;
-				padding: 2.4rem;
-				border: 1px solid #b0b0b0;
-				border-radius: 2.4rem;
-				overflow-y: auto;
-
-				> .title {
-					font-size: 2.2rem;
-					line-height: 130%;
-					color: #000;
-					margin-bottom: 0.8rem;
-				}
-				> .tip {
-					font-family: pingfang_regular;
-					font-size: 1.4rem;
-					line-height: 150%;
-					color: #b0b0b0;
-				}
-				> .form {
-					margin-top: 1.6rem;
-				}
-				> .agreement {
-					padding: 1.6rem;
-					border-radius: 1.2rem;
-					background-color: #f9f9f9;
-					margin-bottom: 2.4rem;
-					> .title {
-						font-size: 1.4rem;
-						color: #000;
-						margin-bottom: 1rem;
-					}
-					> ul > li,
-					> .tip {
-						font-family: pingfang_medium;
-						font-size: 1.4rem;
-						color: #737373;
-					}
-					> ul {
-						margin-top: 3rem;
-						padding-left: 2.5rem;
-						> li {
-							margin-bottom: 1rem;
-							list-style-type: disc;
-						}
-					}
-					&:deep(.agree-agreement) {
-						align-items: flex-start;
-						span {
-							font-family: pingfang_medium;
-							font-size: 1.2rem;
-						}
-						.ant-checkbox-inner,
-						.ant-checkbox-input {
-							width: 2rem;
-							height: 2rem;
-						}
-						.ant-checkbox-inner {
-							border-color: #000 !important;
-						}
-					}
-				}
-			}
-			> .btns {
-				margin-top: 3.9rem;
-				display: flex;
-				justify-content: flex-end;
-				gap: 1.6rem;
-				> button {
-					height: 6rem;
-					border-radius: 6rem;
-					padding: 0 4rem;
-					background-color: #000;
-					color: #fff;
-					font-size: 1.6rem;
-					border: none;
-					cursor: pointer;
-					&:active:not(:disabled) {
-						opacity: 0.8;
-					}
-					&:disabled {
-						opacity: 0.5;
-						cursor: not-allowed;
-					}
-				}
-				> .cancel {
-					background-color: #fff;
-					color: #000;
-					border: 0.15rem solid #000;
-				}
-			}
-		}
-	}
-	:deep(.my-form) {
-		.form-group {
-			display: flex;
-			gap: 1.6rem;
-			.ant-form-item {
-				flex: 1;
-			}
-		}
-		.ant-form-item {
-			margin-bottom: 1.6rem;
-			position: relative;
-			.tip-length {
-				user-select: none;
-				pointer-events: none;
-				position: absolute;
-				bottom: 1rem;
-				right: 1.6rem;
-				font-family: pingfang_regular;
-				font-size: 1rem;
-				color: #df2c2c;
-			}
-			.ant-form-item-explain,
-			.ant-form-item-explain-connected {
-				min-height: 0;
-			}
-			.ant-form-item-explain-error {
-				font-size: 1.2rem;
-			}
-		}
-		.ant-form-item-label {
-			display: flex;
-			padding: 0 0 0.6rem 0;
-			> label {
-				font-family: pingfang_medium;
-				font-size: 1.4rem;
-				line-height: 150%;
-
-				&.ant-form-item-required:not(.ant-form-item-required-mark-optional) {
-					&::before {
-						content: "";
-					}
-					&:after {
-						display: inline-block;
-						color: #df2c2c;
-						font-size: 1.4rem;
-						content: "*";
-					}
-				}
-			}
-		}
-		.ant-form-item-control-input {
-			.ant-input-affix-wrapper,
-			textarea,
-			input {
-				border-radius: 1.2rem;
-				border: 0.16rem solid #d1d1d1;
-				font-family: pingfang_regular;
-				font-size: 1.4rem;
-				color: #000;
-				padding: 1.6rem;
-				&::placeholder {
-					color: #999;
-				}
-			}
-			.ant-input-affix-wrapper {
-				margin-bottom: 0.6rem;
-				&:last-child {
-					margin-bottom: 0;
-				}
-				.ant-input-prefix {
-					width: 5.2rem;
-					font-size: 1.4rem;
-					line-height: 150%;
-					color: #000;
-					justify-content: center;
-					text-align: center;
-				}
-				input {
-					border: none;
-					height: 100%;
-					padding: 0 1.6rem;
-					border-radius: 0;
-				}
-			}
-			input {
-				height: 5rem;
-			}
-			textarea {
-				height: 11rem;
-				resize: none;
-			}
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/BecomeSeller/sellerReview.vue
+++ b/src/views/SellerDashboard/BecomeSeller/sellerReview.vue
@@ -1,126 +0,0 @@
-<template>
-	<div class="seller-review">
-		<img class="success" src="@/assets/images/seller/success-1.png" />
-		<div class="title">Application Submitted</div>
-		<div class="tip">
-			Our team will review your application and get back to you within 1–3 business days.
-			You'll receive a notification in your email once a decision has been made.
-		</div>
-		<div class="step-list">
-			<div v-for="v in list" :key="v.title" class="step-item">
-				<img v-show="!v.active" src="@/assets/images/seller/success-0.png" />
-				<img v-show="v.active" src="@/assets/images/seller/success-1.png" />
-				<div class="content">
-					<div class="title">{{ v.title }}</div>
-					<div class="tip">{{ v.tip }}</div>
-				</div>
-			</div>
-		</div>
-		<button class="home-btn" @click="onBackToHome">Back to Homepage</button>
-	</div>
-</template>
-
-<script setup>
-	import { ref, computed } from "vue"
-	import { useRoute, useRouter } from "vue-router"
-	const route = useRoute()
-	const router = useRouter()
-	const list = ref([
-		{
-			title: "Step 1: Submit Application",
-			tip: "Fill out the seller information form and agree to our terms",
-			active: true
-		},
-		{
-			title: "Step 2: Review & Verification",
-			tip: "Our team will review your application (typically 1-3 business days)",
-			active: false
-		},
-		{
-			title: "Step 3: Start Selling",
-			tip: "Once approved, access your seller dashboard and start listing products ",
-			active: false
-		}
-	])
-	const onBackToHome = () => {
-		router.push({ name: "home" })
-	}
-</script>
-<style scoped lang="less">
-	.seller-review {
-		margin: 0 auto;
-		width: 60rem;
-		height: 90%;
-		overflow-y: auto;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		gap: 2.4rem;
-		> .success {
-			width: 10rem;
-			height: 10rem;
-			padding: 1.2rem;
-		}
-		> .title {
-			font-size: 2.2rem;
-			line-height: 130%;
-			text-align: center;
-			color: #000;
-		}
-		> .tip {
-			font-family: pingfang_medium;
-			font-size: 1.8rem;
-			line-height: 170%;
-			text-align: center;
-			color: #585858;
-		}
-		> .step-list {
-			margin: 2.6rem 0;
-			width: 100%;
-			padding: 1.6rem;
-			background-color: #f9f9f9;
-			display: flex;
-			flex-direction: column;
-			gap: 1.4rem;
-			border-radius: 1.2rem;
-			> .step-item {
-				display: flex;
-				> img {
-					width: 2rem;
-					height: 2rem;
-					margin: 0.2rem;
-					margin-right: 1.2rem;
-				}
-				> .content {
-					flex: 1;
-					font-size: 1.4rem;
-					> .title {
-						font-style: Bold;
-						color: #000;
-						line-height: 150%;
-					}
-					> .tip {
-						font-family: "pingfang_medium";
-						line-height: 170%;
-						color: #737373;
-					}
-				}
-			}
-		}
-		> .home-btn {
-			width: 31rem;
-			height: 6rem;
-			border-radius: 4rem;
-			font-size: 1.6rem;
-			color: #fff;
-			background-color: #000;
-			border: none;
-			cursor: pointer;
-			outline: none;
-			&:active {
-				opacity: 0.8;
-			}
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/BrandProfile/index.vue
+++ b/src/views/SellerDashboard/BrandProfile/index.vue
@@ -1,13 +0,0 @@
-<template>
-	<div class="brand-profile-index">brand-profile-index</div>
-</template>
-
-<script lang="ts" setup>
-</script>
-<style scoped lang="less">
-	.seller-dashboard-index {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-	}
-</style>
--- a/src/views/SellerDashboard/MyListingCreateSelect/index.vue
+++ b/src/views/SellerDashboard/MyListingCreateSelect/index.vue
@@ -1,47 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-import sellerHeader from "../seller-header.vue"
-
-//const props = defineProps({
-//})
-//const emit = defineEmits([
-//])
-let data = reactive({
-})
-onMounted(()=>{
-})
-onUnmounted(()=>{
-})
-defineExpose({})
-const {} = toRefs(data);
-</script>
-<template>
-	<div class="myListings-seller">
-		<seller-header
-			title="Select Collection"
-			:breadcrumbs="[
-				{title:'My Listings', name:'myListingsIndex'},
-				{title:'Select Collection', name: 'myListingsSelect' }
-			]"
-		>
-		</seller-header>
-		<div class="content">
-			1231222aaa
-		</div>
-	</div>
-</template>
-<style scoped lang="less">
-	.myListings-seller {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		> .content {
-			margin-top: 2rem;
-			flex: 1;
-			overflow: hidden;
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/MyListingCreateSelectItem/index.vue
+++ b/src/views/SellerDashboard/MyListingCreateSelectItem/index.vue
@@ -1,48 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-import sellerHeader from "../seller-header.vue"
-
-//const props = defineProps({
-//})
-//const emit = defineEmits([
-//])
-let data = reactive({
-})
-onMounted(()=>{
-})
-onUnmounted(()=>{
-})
-defineExpose({})
-const {} = toRefs(data);
-</script>
-<template>
-	<div class="myListings-seller">
-		<seller-header
-			title="Select Collection"
-			:breadcrumbs="[
-				{title:'My Listings', name:'myListingsIndex'},
-				{title:'Select Collection', name: 'myListingsSelect' },
-				{title:'Select Sketch', name: 'myListingsSelectItem' }
-			]"
-		>
-		</seller-header>
-		<div class="content">
-			1231222aaa
-		</div>
-	</div>
-</template>
-<style scoped lang="less">
-	.myListings-seller {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		> .content {
-			margin-top: 2rem;
-			flex: 1;
-			overflow: hidden;
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/MyListings/index.vue
+++ b/src/views/SellerDashboard/MyListings/index.vue
@@ -1,79 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-import sellerHeader from "../seller-header.vue"
-
-//const props = defineProps({
-//})
-//const emit = defineEmits([
-//])
-let data = reactive({
-})
-onMounted(()=>{
-})
-onUnmounted(()=>{
-})
-defineExpose({})
-const {} = toRefs(data);
-</script>
-<template>
-	<div class="myListings-seller">
-		<seller-header
-			title="My Listings"
-			tip="Active listings and unpublished inventory."
-		>
-			<template #right>
-				<div class="button">
-					<span>New Listing</span>
-					<div class="icon">
-						<i class="fi fi-br-plus"></i>
-					</div>
-				</div>
-			</template>
-		</seller-header>
-		<div class="content">
-			123122222s
-		</div>
-	</div>
-</template>
-<style scoped lang="less">
-	.myListings-seller {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		.button {
-			width: 16rem;
-			line-height: 6rem;
-			border-radius: 4rem;
-			display: flex;
-			border: 1.5px solid #000000;
-			background-color: #000;
-			color: #fff;
-			transition: all .3s;
-			gap: .8rem;
-			align-items: center;
-			justify-content: center;
-			font-size: 1.6rem;
-			cursor: pointer;
-			i{
-				color: #fff;
-				display: flex;
-				font-size: 1.6rem;
-			}
-			&:hover{
-				background-color: #fff;
-				color: #000;
-				i{
-					color: #000;
-				}
-			}
-		}
-		> .content {
-			margin-top: 2rem;
-			flex: 1;
-			overflow: hidden;
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/index.vue
+++ b/src/views/SellerDashboard/index.vue
@@ -1,108 +0,0 @@
-<template>
-	<div class="seller-dashboard-index">
-		<div class="nav">
-			<div
-				v-for="v in list"
-				:key="v.path"
-				:class="{ active: v.path === activePath }"
-				@click="handleClick(v.path)"
-			>
-				<div class="icon"><svg-icon :name="v.icon" size="20" /></div>
-				<span class="layer">{{ v.layer }}</span>
-			</div>
-		</div>
-
-		<div class="view">
-			<router-view></router-view>
-		</div>
-		<toolTipBox v-model:visible="visible" @close="()=>{}"></toolTipBox>
-	</div>
-</template>
-
-<script setup>
-	import { ref, computed } from "vue"
-	import { useRoute, useRouter } from "vue-router"
-	import toolTipBox from './toolTipBox.vue'
-	const route = useRoute()
-	const router = useRouter()
-	const visible = ref(false)
-	const list = ref([
-		{
-			icon: "seller-brandProfile",
-			layer: "Brand Profile",
-			path: "/home/seller/brandProfile"
-		},
-		{
-			icon: "seller-myListings",
-			layer: "My Listings",
-			path: "/home/seller/myListings"
-		},
-		{
-			icon: "seller-myOrders",
-			layer: "My Orders",
-			path: "/home/seller/myOrders"
-		},
-		{
-			icon: "seller-settings",
-			layer: "Settings",
-			path: "/home/seller/settings"
-		}
-	])
-	const activePath = computed(() => route.path)
-	const handleClick = (path) => {
-		if (path === activePath.value) return
-		router.push(path)
-	}
-</script>
-<style scoped lang="less">
-	.seller-dashboard-index {
-		width: 100%;
-		height: 100%;
-		overflow: hidden;
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		> .nav {
-			width: 100%;
-			display: flex;
-			align-items: center;
-			gap: 3.6rem;
-			> div {
-				width: 18rem;
-				height: 6rem;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				position: relative;
-				cursor: pointer;
-				> .icon {
-					margin-right: 1rem;
-					color: #b0b0b0;
-				}
-				> .layer {
-					font-size: 2rem;
-					color: #999999;
-				}
-				&.active {
-					> .icon,
-					> .layer {
-						color: #000;
-					}
-					&::after {
-						content: "";
-						position: absolute;
-						bottom: 0;
-						left: 0;
-						width: 100%;
-						height: 0.4rem;
-						background-color: #000;
-					}
-				}
-			}
-		}
-		> .view {
-			margin-top: 4rem;
-			flex: 1;
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/seller-header.vue
+++ b/src/views/SellerDashboard/seller-header.vue
@@ -1,96 +0,0 @@
-<template>
-	<div class="seller-header">
-		<div class="back" @click="() => router.back()">
-			<svg-icon name="seller-back" size="24" />
-		</div>
-		<div class="content">
-			<span class="title" v-show="title">{{ title }}</span>
-			<span class="tip" v-show="tip">{{ tip }}</span>
-			<div class="breadcrumbs" v-show="breadcrumbs.length > 0">
-				<template v-for="(v, i) in breadcrumbs" :key="i">
-					<span
-						class="title"
-						:class="{
-							last: i === breadcrumbs.length - 1
-						}"
-						@click="() => router.push({ name: v.name })"
-						>{{ v.title }}</span
-					>
-					<span class="icon" v-show="i < breadcrumbs.length - 1">
-						<svg-icon name="seller-arrow_right_solid" size="10" />
-					</span>
-				</template>
-			</div>
-		</div>
-		<div class="right">
-			<slot name="right"></slot>
-		</div>
-	</div>
-</template>
-
-<script setup>
-	import { ref, computed } from "vue"
-	import { useRoute, useRouter } from "vue-router"
-	const props = defineProps({
-		title: {
-			type: String,
-			default: ""
-		},
-		tip: {
-			type: String,
-			default: ""
-		},
-		breadcrumbs: {
-			type: Array, // { title: string, name: string }
-			default: () => []
-		}
-	})
-	const route = useRoute()
-	const router = useRouter()
-</script>
-<style scoped lang="less">
-	.seller-header {
-		width: 100%;
-		height: 6rem;
-		display: flex;
-		align-items: center;
-		gap: 2.4rem;
-		> .back {
-			width: 5rem;
-			height: 5rem;
-			border-radius: 1.2rem;
-			border: 1px solid #d7d7d7;
-			cursor: pointer;
-		}
-		> .content {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			> .title {
-				line-height: 130%;
-				font-size: 2.4rem;
-				color: #000;
-			}
-			> .tip {
-				font-family: "pingfang_medium";
-				font-size: 1.4rem;
-				line-height: 150%;
-				color: #888;
-			}
-			> .breadcrumbs {
-				display: flex;
-				align-items: center;
-				gap: 1rem;
-				> .title {
-					font-family: "pingfang_regular";
-					color: #999;
-					font-size: 1.4rem;
-					cursor: pointer;
-					&:not(.last) {
-						text-decoration: underline;
-					}
-				}
-			}
-		}
-	}
-</style>
--- a/src/views/SellerDashboard/toolTipBox.vue
+++ b/src/views/SellerDashboard/toolTipBox.vue
@@ -1,265 +0,0 @@
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted, reactive, toRefs } from "vue";
-import sellerToolTipImg1 from '@/assets/images/seller/sellerToolTip-1.png'
-import sellerToolTipImg2 from '@/assets/images/seller/sellerToolTip-2.png'
-import sellerToolTipImg3 from '@/assets/images/seller/sellerToolTip-3.png'
-import { useI18n } from 'vue-i18n'
-
-const props = defineProps({
-	visible: {
-		type: Boolean,
-		default: false,
-	}
-})
-const emit = defineEmits([
-	'update:visible','close'
-])
-const {t} = useI18n()
-let data = reactive({
-	visible: props.visible,
-	stepList: [
-		{
-			img: sellerToolTipImg1,
-			title: t('SellerToolTip.step1Title'),
-			info: t('SellerToolTip.step1Info'),
-		},{
-			img: sellerToolTipImg2,
-			title: t('SellerToolTip.step2Title'),
-			info: t('SellerToolTip.step2Info'),
-		},{
-			img: sellerToolTipImg3,
-			title: t('SellerToolTip.step3Title'),
-			info: t('SellerToolTip.step3Info'),
-		},{
-			title: t('SellerToolTip.step4Title'),
-			info: t('SellerToolTip.step4Info'),
-		}
-	],
-	showAgain: false,
-})
-let toolTipBoxRef = ref(null)
-
-const cleardata = ()=>{
-	emit('update:visible', false)
-	emit('close', data.showAgain)
-}
-
-onMounted(()=>{
-})
-onUnmounted(()=>{
-})
-defineExpose({})
-const { showAgain } = toRefs(data);
-</script>
-<template>
-    <div ref="toolTipBoxRef" class="toolTipBox" v-if="visible">
-		<a-modal
-			class="collection generalModel"
-			v-model:visible="data.visible"
-			:footer="null"
-			:get-container="() => toolTipBoxRef"
-			width="126.2rem"
-			:maskClosable="false"
-			:centered="true"
-			:closable="false"
-			:mask="true"
-			:keyboard="false"
-			:destroyOnClose="false"
-			:zIndex="1000"
-		>
-			<div class="generalModel_btn">
-				<div class="generalModel_closeIcon" @click.stop="cleardata()">
-					<SvgIcon name="seller-sellerToolTipClose" size="30"></SvgIcon>
-				</div>
-			</div>
-			<div class="titleBox">
-				<div class="title">
-					{{t('SellerToolTip.title')}}
-				</div>
-				<div class="info">
-					{{t('SellerToolTip.titleInfo')}}
-				</div>
-			</div>
-			<div class="stepBox">
-				<div class="step" v-for="(item, index) in data.stepList" :key="index" :class="{'active': index === 2}">
-					<div class="stepNum">
-						<div class="num">
-							{{index}}
-						</div>
-					</div>
-					<div class="title">
-						{{item.title}}
-					</div>
-					<div class="info">
-						{{item.info}}
-					</div>
-					<div class="imgBox" v-if="item.img">
-						<img :src="item.img" alt="">
-					</div>
-				</div>
-			</div>
-			<div class="bottom">
-				<div class="showAgain">
-					<label>
-						<input type="checkbox" v-model="showAgain">
-						{{t('SellerToolTip.showAgain')}}
-					</label>
-				</div>
-				<div class="gallery_btn" @click="cleardata()">
-					{{t('SellerToolTip.GetStarted')}}
-					<i class="fi fi-rr-arrow-small-right"></i>
-				</div>
-			</div>
-		</a-modal>
-	</div>
-	
-</template>
-<style lang="less" scoped>
-	.toolTipBox{
-		width: 100%;
-		height: 100%;
-		position: relative;
-		:deep(.generalModel){
-			height: auto;
-			.ant-modal-body{
-				padding: 6.2rem 8rem;
-				.generalModel_btn{
-					.generalModel_closeIcon{
-						transform: translate(0%, 0%);
-						top: 4rem;
-						right: 4rem;
-					}
-				}
-			}
-		}
-		.titleBox{
-			margin-bottom: 5.2rem;
-			.title{
-				font-size: 3.2rem;
-				font-weight: 400;
-				color:#000000;
-				line-height: 130%;
-				font-family: 'pingfang_semibold';
-				margin-bottom: 1.2rem;
-			}
-			.info{
-				font-weight: 400;
-				font-size: 2.4rem;
-				line-height: 130%;
-				color: #979797;
-			}
-		}
-		.stepBox{
-			margin: 0 1.3rem;
-			display: flex;
-			gap: 7rem;
-			margin-bottom: 9.7rem;
-			.step{
-				--itemWidth: 21.2rem;
-				--textColor: #585858;
-				--indexBgColor: #f6f6f6;
-				--indexTextColor: #000000;
-				--indexBorderColor: #C7C7C7;
-				&:hover{
-					--textColor: #000;
-					--indexBgColor: #000;
-					--indexTextColor: #fff;
-					--indexBorderColor: #000;
-				}
-				width: var(--itemWidth);
-				> div{
-					transition: all .3s;
-				}
-				&.active{
-					--itemWidth: 23.2rem;
-				}
-				.stepNum{
-					width: 6.4rem;
-					height: 6.4rem;
-					margin-bottom: 2.6rem;
-					position: relative;
-					font-weight: 500;
-					font-size: 2.8rem;
-					> .num{
-						position: relative;
-						z-index: 2;
-						color: var(--indexTextColor);
-						background-color: var(--indexBgColor);
-						width: 100%;
-						height: 100%;
-						border-radius: 50%;
-						border: 2px solid var(--indexBorderColor);
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						transition: all .3s;
-					}
-					&::after{
-						content: '';
-						display: block;
-						width: calc(var(--itemWidth) + 8px);
-						height: 1.5px;
-						background-color: #C7C7C7;
-						position: absolute;
-						top: 50%;
-						left: 100%;
-						transform: translate(0%,-50%);
-					}
-				}
-				&:last-child .stepNum::after{
-					display: none;
-				}
-				.title{
-					font-weight: 500;
-					font-size: 2.4rem;
-					line-height: 130%;
-					color: var(--textColor);
-					margin-bottom: 2.6rem;
-				}
-				.info{
-					font-weight: 400;
-					font-size: 1.8rem;
-					line-height: 120%;
-					letter-spacing: -1%;
-					color: var(--textColor);
-					margin-bottom: 2.6rem;
-				}
-				.imgBox{
-					width: 21.2rem;
-					img{
-						width: 100%;
-						object-fit: contain;
-					}
-				}
-			}
-		}
-		.bottom{
-			display: flex;
-			margin: 0 1.3rem;
-			align-items: center;
-			justify-content: space-between;
-			.showAgain{
-				> label{
-					cursor: pointer;
-					font-family: pingfang_regular;
-					font-weight: 400;
-					font-size: 1.4rem;
-					line-height: 150%;
-					letter-spacing: -1%;
-					display: flex;
-					gap: 1.1rem;
-				}
-			}
-			> .gallery_btn{
-				padding: 0 3rem;
-				display: flex;
-				> i{
-					margin-left: 1.2rem;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-				}
-			}
-		}
-	}
-</style>
Author	SHA1	Message	Date
李志鹏	3ed5a37e5b	1	2026-05-15 16:25:08 +08:00
李志鹏	5546c71ec0	线稿图手动排序后更新bug	2026-05-15 15:01:17 +08:00
李志鹏	8a7776a4b6	去掉管理员界面的allUser编辑userName	2026-05-15 10:15:18 +08:00
X1627315083@163.com	a1281c8e3f	fix	2026-05-14 18:06:01 +08:00
X1627315083@163.com	9a40e69081	fix	2026-05-14 09:27:06 +08:00
X1627315083@163.com	e27b43dc67	管理员页面增加globalAward流量页面	2026-05-13 17:29:05 +08:00
X1627315083@163.com	b6a55a8124	调整选择风格布局	2026-05-12 17:18:16 +08:00
zhangyahui	6cace08a51	style: 去除底边距	2026-04-28 17:11:19 +08:00
zhangyahui	6207095221	feat: 管理员页面	2026-04-28 17:11:10 +08:00
李志鹏	7bb38bf2e5	处理Safari 不支持requestIdleCallback方法	2026-04-24 17:11:48 +08:00
X1627315083@163.com	743fc762d6	fix	2026-04-23 16:57:03 +08:00
zhangyahui	7297e4e7a4	bugfix	2026-04-23 14:08:59 +08:00
zhangyahui	3bff1ebb66	feat: 工具函数	2026-04-23 14:05:00 +08:00
zhangyahui	0d1656ee0a	style: 字体间距	2026-04-23 13:56:54 +08:00
zhangyahui	7d0873d874	style: 调整活动页样式	2026-04-23 13:56:47 +08:00
zhangyahui	82941bca7c	feat: 活动页	2026-04-23 11:22:21 +08:00
zhangyahui	949ff9292d	feat: 活动页面文案	2026-04-23 11:10:02 +08:00
X1627315083@163.com	11c9de8ced	fix	2026-04-22 16:12:23 +08:00
X1627315083@163.com	fd518ad9b3	更新youtube地址	2026-04-22 13:24:23 +08:00
X1627315083@163.com	a2b45e2041	Merge branch 'StableVersion' of ssh://18.167.251.121:10002/aidlab/aida_front into StableVersion	2026-04-17 16:35:14 +08:00
X1627315083@163.com	da64b57c1c	登录页路由加语言设置	2026-04-17 16:35:12 +08:00
李志鹏	7c14b1d831	Merge branch 'StableVersion' of http://18.167.251.121:10003/aidlab/aida_front into StableVersion	2026-04-15 11:37:13 +08:00
李志鹏	8966b52430	红绿图b	2026-04-15 11:37:11 +08:00
X1627315083@163.com	5fa049f73d	隐藏brandDNA功能	2026-04-14 15:30:19 +08:00
X1627315083@163.com	575445f767	fix	2026-04-14 15:27:57 +08:00
李志鹏	f43c56236b	液化苹果浏览器闪屏问题	2026-04-14 10:02:06 +08:00
李志鹏	4352f7c2f4	111	2026-04-13 11:52:24 +08:00
李志鹏	c6b1bdbdf1	红绿图导出问题	2026-04-13 11:20:26 +08:00
X1627315083@163.com	f16aa6ea14	fix	2026-04-10 18:14:20 +08:00
X1627315083@163.com	a25abeb527	fix	2026-04-10 16:54:22 +08:00
X1627315083@163.com	d359cd7763	注释选择信用卡支付和支付宝支付的选项，改为默认信用卡自动续费支付	2026-03-30 10:43:27 +08:00
zhangyahui	23085d9a9b	Merge branch 'dev_vite' into StableVersion	2026-03-25 10:18:13 +08:00
X1627315083@163.com	35c6dfe29c	印花默认为正片叠底	2026-03-24 14:43:12 +08:00