Merge pull request #971 from nickcdon/main

🐛 修复团队成员邀请
Tencent · Dec 12, 2023 · 164bb54 · 164bb54
2 parents 4d1927a + edbca5b
commit 164bb54
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/web/packages/tca-layout/src/modules/team/components/invite/index.tsx b/web/packages/tca-layout/src/modules/team/components/invite/index.tsx
@@ -15,7 +15,7 @@ const OrgInvite = () => {
     addMemberByInvite(decodeURIComponent(code))
       .then((res: any) => {
         message.success('已加入团队');
-        history.replace(`/t/${res.orgSid}/profile`);
+        history.replace(`/t/${res.org_sid}/profile`);
       })
       .catch(() => {
         message.error('加入团队失败');

diff --git a/web/packages/tca-layout/src/modules/team/components/members/index.tsx b/web/packages/tca-layout/src/modules/team/components/members/index.tsx
@@ -84,7 +84,7 @@ const Members = () => {
   /** 邀请成员，生成邀请链接 */
   const onAddMemberHandle = (role: number) => {
     getInviteCode(orgSid, { role }).then(({ invite_code: inviteCode }) => {
-      const inviUrl = `${window.location.origin}/t/invite/${encodeURIComponent(inviteCode)}`;
+      const inviUrl = `${window.location.origin}/invite/${encodeURIComponent(inviteCode)}`;
       setInviteUrl(inviUrl);
       setInviteVisb(true);
     });

diff --git a/web/packages/tca-layout/src/plat/common/routes/index.ts b/web/packages/tca-layout/src/plat/common/routes/index.ts
@@ -15,12 +15,13 @@ export const ROOT_ROUTERS: RouteProps[] = [{
 }, {
   path: '/user',
   component: User,
+}, {
+  path: '/invite/:code',
+  component: Invite,
+  exact: true,
 }, {
   path: '/t/:orgSid',
   component: Team,
-}, {
-  path: '/t/invite/:code',
-  component: Invite,
 }, {
   path: '/cb_git_auth/:scmPlatformName',
   component: GitOAuth,

diff --git a/web/tca-deploy-source/build_zip/tca-layout.zip b/web/tca-deploy-source/build_zip/tca-layout.zip
diff --git a/web/tca-deploy-source/conf/configs.json b/web/tca-deploy-source/conf/configs.json
@@ -5,12 +5,12 @@
     "prefix": [
       "/static/tca-layout/"
     ],
-    "commitId": "6154d99d26c5c11c06ff08a1136d0ffa8e9b992e",
+    "commitId": "e9a3c8d9a49303fa81d96c1e405aaa0a91c2fa8b",
     "match": "/",
     "js": [
       "/static/tca-layout/runtime~tca-layout-56fcb080.js",
-      "/static/tca-layout/vendors~tca-layout-c1ef9841.js",
-      "/static/tca-layout/tca-layout-6d571890.js"
+      "/static/tca-layout/vendors~tca-layout-f59c44ab.js",
+      "/static/tca-layout/tca-layout-c8367fdd.js"
     ],
     "css": [
       "/static/tca-layout/vendors~tca-layout-87dbf54c.css",