From cf295b38650730cc2fbe3bee19c77fdea411095b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 十月 2024 08:54:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/CommonHeader.vue | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index bae0e5b..ca89668 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -31,7 +31,6 @@
</div>
</div>
<!-- 淇敼瀵嗙爜 -->
- <template v-if="editPsd">
<GlobalAlertWindow title="淇敼瀵嗙爜" :visible.sync="visible.changePwd"
:showClose="!userInfo.needChangePwd || userInfo.needChangePwd == '0'"
:showCancel="!userInfo.needChangePwd || userInfo.needChangePwd == '0'" @confirm="confirmChangePwd"
@@ -52,8 +51,6 @@
</el-form-item>
</el-form>
</GlobalAlertWindow>
- </template>
-
</div>
</template>
@@ -75,7 +72,6 @@
return {
title: process.env.VUE_APP_TITLE,
headerNavData: {},
- editPsd: false,
visible: {
// 淇敼瀵嗙爜
changePwd: false
@@ -117,7 +113,7 @@
},
mounted() {
- // console.log('userInfo',this.userInfo);
+ // needChangePwd 0 : 榛樿瀵嗙爜闇�瑕佷慨鏀癸紝1 涓嶉渶瑕�
if (!this.userInfo.needChangePwd || this.userInfo.needChangePwd == '0') {
this.visible.changePwd = true
}
@@ -138,8 +134,6 @@
...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
// 淇敼瀵嗙爜
changePwd() {
- this.$set(this.userInfo, 'needChangePwd', this.$store.state.userInfo.needChangePwd)
- this.editPsd = true
this.visible.changePwd = true
this.$nextTick(() => {
this.$refs.changePwdDataForm.resetFields()
@@ -192,6 +186,7 @@
})
.then(() => {
this.$tip.apiSuccess('淇敼鎴愬姛')
+ this.$store.commit('setUserInfo', {needChangePwd: 1})
this.visible.changePwd = false
})
.catch(e => {
--
Gitblit v1.9.3