XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2025-01-21 15:59:04 +08:00
parent ff0ddeea9a 42083afb8d
commit 5cf6ab24bd
9 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/store/modules/user.js
View File

@ -299,7 +299,9 @@ const actions = {
// }) // })
resetRouter() resetRouter()
removeName() removeName()
let lang = zzSessionStorage.getItem('lang')
zzSessionStorage.clear() zzSessionStorage.clear()
zzSessionStorage.setItem('lang', lang)
commit('RESET_STATE') commit('RESET_STATE')
} catch (e) { } catch (e) {
console.log(e) console.log(e)

2
src/utils/request.js
View File

@ -180,6 +180,8 @@ const setTimer = (obj, type) => {
Message(obj) Message(obj)
} }
if (type === 'confirm') { if (type === 'confirm') {
obj[2].closeOnClickModal = false
obj[2].closeOnPressEscape = false
MessageBox.confirm(...obj) MessageBox.confirm(...obj)
} }
clearTimeout(timer); clearTimeout(timer);

4
src/views/blindResumeInfo/info.vue
View File

@ -86,8 +86,8 @@ export default {
this.setLanguage('en') this.setLanguage('en')
this.$updateDictionary() this.$updateDictionary()
} else { } else {
//this.$i18n.locale = 'zh' this.$i18n.locale = 'zh'
//this.setLanguage('zh') this.setLanguage('zh')
this.$updateDictionary() this.$updateDictionary()
} }
this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:'' this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:''

5
src/views/email-recompose/index.vue
View File

@ -38,6 +38,7 @@
</el-form-item> </el-form-item>
<!-- 新密码 --> <!-- 新密码 -->
<el-form-item <el-form-item
class="my_new_pwd"
:label="$t('recompose:form:newPassword')" :label="$t('recompose:form:newPassword')"
prop="NewPassWord" prop="NewPassWord"
> >
@ -272,7 +273,7 @@ input {
background-color: transparent; background-color: transparent;
caret-color: #fff; caret-color: #fff;
} }
.el-form-item { ::v-deep .is-error.my_new_pwd {
margin-bottom: 30px; margin-bottom: 45px;
} }
</style> </style>

2
src/views/forgetpassword/index.vue
View File

@ -423,7 +423,7 @@ export default {
/* margin-bottom: 40px;*/ /* margin-bottom: 40px;*/
/*}*/ /*}*/
.is-error.my_new_pwd { .is-error.my_new_pwd {
margin-bottom: 40px; margin-bottom: 45px;
} }
.flexBox { .flexBox {
display: flex; display: flex;

4
src/views/recompose/index.vue
View File

@ -42,6 +42,7 @@
</el-form-item> </el-form-item>
<!-- 新密码 --> <!-- 新密码 -->
<el-form-item <el-form-item
class="my_new_pwd"
:label="$t('recompose:form:newPassword')" :label="$t('recompose:form:newPassword')"
prop="NewPassWord" prop="NewPassWord"
> >
@ -221,4 +222,7 @@ input {
background-color: transparent; background-color: transparent;
caret-color: #fff; caret-color: #fff;
} }
::v-deep .is-error.my_new_pwd {
margin-bottom: 45px;
}
</style> </style>

4
src/views/resumeInfo/index.vue
View File

@ -98,8 +98,8 @@ export default {
this.setLanguage('en') this.setLanguage('en')
this.$updateDictionary() this.$updateDictionary()
} else { } else {
//this.$i18n.locale = 'zh' this.$i18n.locale = 'zh'
//this.setLanguage('zh') this.setLanguage('zh')
this.$updateDictionary() this.$updateDictionary()
} }
this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:'' this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''

5
src/views/trials/trials-myinfo/password.vue
View File

@ -27,6 +27,7 @@
<!-- 新密码 --> <!-- 新密码 -->
<el-form-item <el-form-item
:label="$t('recompose:form:newPassword')" :label="$t('recompose:form:newPassword')"
class="my_new_pwd"
prop="NewPassWord" prop="NewPassWord"
> >
<el-input <el-input
@ -159,7 +160,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-form-item { ::v-deep .is-error.my_new_pwd {
margin-bottom: 30px; margin-bottom: 45px;
} }
</style> </style>

2
src/views/user/myInfo.vue
View File

@ -659,6 +659,6 @@ export default {
</style> </style>
<style scoped> <style scoped>
::v-deep .is-error.my_new_pwd { ::v-deep .is-error.my_new_pwd {
margin-bottom: 40px; margin-bottom: 45px;
} }
</style> </style>