zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 3 Wiki Activity

Merge pull request 'yws_dev' (#70) from yws_dev into main 

Reviewed-on: #70
This commit is contained in:
yangws 2024-11-27 10:52:14 +08:00
parent 448c4d979f 5b49eef8e8
commit c338f34127
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/renderer/src/views/profile/components/selectClass.vue
View File

@ -59,24 +59,27 @@ const getSubject = () => {
// 选择学段
const handleUserEduStage = (item) => {
userStore.edustage = item
sessionStore.set('edustage',item)
sessionStore.set('edustageSelf',item)
if(item === '幼儿园'){
// 默认语文
userStore.edusubject = '语文'
sessionStore.set('edusubjectSelf','语文')
}
else if(item === '高中' && userStore.edusubject === "道德与法治"){
// 默认语文
userStore.edusubject = '政治'
sessionStore.set('edusubjectSelf','政治')
}
else if(item != '高中' && userStore.edusubject === "政治"){
// 默认语文
userStore.edusubject = '道德与法治'
sessionStore.set('edusubjectSelf','道德与法治')
}
}
// 选择学科
const handleUserEduSubject = (item) => {
userStore.edusubject = item;
sessionStore.set('edusubject',item)
sessionStore.set('edusubjectSelf',item)
}
onMounted(() => {
getSubject()

4
src/renderer/src/views/profile/userInfo.vue
View File

@ -165,8 +165,8 @@ setTimeout(() => {
function submit() {
proxy.$refs.userRef.validate((valid) => {
if (valid) {
userStore.user.edusubject = sessionStore.get('edusubject') ? sessionStore.get('edusubject') : userStore.user.edusubject
userStore.user.edustage = sessionStore.get('edustage') ? sessionStore.get('edustage') : userStore.user.edustage
userStore.user.edusubject = sessionStore.get('edusubjectSelf') ? sessionStore.get('edusubjectSelf') : userStore.user.edusubject
userStore.user.edustage = sessionStore.get('edustageSelf') ? sessionStore.get('edustageSelf') : userStore.user.edustage
updateUserInfo(userStore.user).then((response) => {
if(response.code == 200){
userStore.login({username:userStore.user.userName,password:userStore.user.plainpwd}).then(() => {