部分问题修复

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'),

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'),

src/views/email-recompose/index.vue

@@ -206,9 +206,15 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 // 修改成功,请重新登录账号
-                this.$message.success(
+                if (!this.isUpdate) {
-                  this.$t('recompose:message:updatedSuccessfully')
+                  this.$message.success(
-                )
+                    this.$t('recompose:message:updatedSuccessfully')
+                  )
+                } else {
+                  this.$message.success(
+                    this.$t('recompose:message:updatedSuccess')
+                  )
+                }
                 setTimeout(() => {
                   this.logout()
                 }, 500)

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
                 },

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