Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl

Merge pull request 'fix：个人中心修改学科问题；' (#68 ) from yws_dev into main
Reviewed-on: #68
2024-11-27 10:41:03 +08:00 · 2024-11-27 10:30:07 +08:00 · 2024-11-27 10:29:39 +08:00
1 changed files with 2 additions and 3 deletions
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@ -165,9 +165,8 @@ setTimeout(() => {
 function submit() {
  proxy.$refs.userRef.validate((valid) => {
    if (valid) {
-      userStore.user.edusubject = sessionStore.get('edusubject')
-      userStore.user.edustage = sessionStore.get('edustage')
-      console.log('userStore更新前', userStore.user);
+      userStore.user.edusubject = sessionStore.get('edusubject') ? sessionStore.get('edusubject') : userStore.user.edusubject
+      userStore.user.edustage = sessionStore.get('edustage') ? sessionStore.get('edustage') : userStore.user.edustage
      updateUserInfo(userStore.user).then((response) => {
        if(response.code == 200){
          userStore.login({username:userStore.user.userName,password:userStore.user.plainpwd}).then(() => {
Author	SHA1	Message	Date
白了个白	222f558807	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl	2024-11-27 10:41:03 +08:00
yangws	733855b95e	Merge pull request 'fix：个人中心修改学科问题；' (#68 ) from yws_dev into main Reviewed-on: #68	2024-11-27 10:30:07 +08:00
小杨	7a6f57a9b7	fix：个人中心修改学科问题；	2024-11-27 10:29:39 +08:00