From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/left/lefttop.vue | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/components/left/lefttop.vue b/src/components/left/lefttop.vue
index 8c47871..0321664 100644
--- a/src/components/left/lefttop.vue
+++ b/src/components/left/lefttop.vue
@@ -57,7 +57,7 @@
export default {
name: "lefttop",
data() {
- ``;
+
let checkpass = (rule, value, callback) => {
if (value == this.form.newPassword) {
callback();
@@ -88,6 +88,11 @@
getUserInfo().then((res) => {
if (res.code == 200) {
this.nickName = res.data.nickName;
+ let userInfo = {
+ userId: res.data.userId,
+ userName: res.data.userName,
+ };
+ this.$store.commit("saveUserInfo", userInfo);
}
});
},
--
Gitblit v1.9.3