From f7d01f6ad739bdddcd75c99792fefcfb39c39ba4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 10 Feb 2026 10:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                                  |  6 ++++++
 src/store/modules/user.js                            |  8 ++++++++
 src/views/email-recompose/index.vue                  | 12 +++++++++---
 src/views/login/index.vue                            |  4 ++--
 .../reading-unit/components/QuestionsList.vue        |  2 +-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index a660e860..88ceabaa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -79,6 +79,12 @@ export const constantRoutes = [
     name: 'emailRecompose',
     hidden: true
   },
+  {
+    path: '/user-recompose',
+    component: () => import('@/views/email-recompose/index'),
+    name: 'userRecompose',
+    hidden: true
+  },
   {
     path: '/joinVerify',
     component: () => import('@/views/joinVerify/index'),
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d5894a69..3ecc4eab 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -276,6 +276,14 @@ const actions = {
   async logout({ commit, state }) {
     try {
       removeToken() // must remove  token  first
+      let data = {
+        IdentityUserId: zzSessionStorage.getItem('identityUserId')
+      }
+      if (zzSessionStorage.getItem('userId') && zzSessionStorage.getItem('userId') !== 'undefined') {
+        data.UserRoleId = zzSessionStorage.getItem('userId')
+      } else {
+        data.UserRoleId = null
+      }
       await loginOut({
         UserRoleId: zzSessionStorage.getItem('userId'),
         IdentityUserId: zzSessionStorage.getItem('identityUserId'),
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index f95d1213..61a56157 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -206,9 +206,15 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 // 修改成功,请重新登录账号
-                this.$message.success(
-                  this.$t('recompose:message:updatedSuccessfully')
-                )
+                if (!this.isUpdate) {
+                  this.$message.success(
+                    this.$t('recompose:message:updatedSuccessfully')
+                  )
+                } else {
+                  this.$message.success(
+                    this.$t('recompose:message:updatedSuccess')
+                  )
+                }
                 setTimeout(() => {
                   this.logout()
                 }, 500)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 48a48ed3..4b23cc5f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -365,7 +365,7 @@ export default {
             this.$message.success(this.$t('login:message:login1'))
             setTimeout(() => {
               this.$router.push({
-                path: `/email-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.HiddenEmail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
               })
             }, 500)
             return
@@ -377,7 +377,7 @@ export default {
               {
                 callback: (action) => {
                   this.$router.push({
-                    path: `/email-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+                    path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.HiddenEmail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
                   })
                   return
                 },
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index a5d6a063..761a293b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -43,7 +43,7 @@
       />
       <!-- 分组(EN) -->
       <el-table-column
-        prop="QuestionGroupName"
+        prop="QuestionGroupEnName"
         v-if="$i18n.locale === 'en'"
         :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
         show-overflow-tooltip