committed by
GitHub
co-authored by
bypanghu
parent
eca5967b4d
commit
727caf3f4f
@@ -8,10 +8,10 @@
|
||||
class="user-headpic-update"
|
||||
:style="{
|
||||
'background-image': `url(${
|
||||
userInfo.headerImg &&
|
||||
userInfo.headerImg.slice(0, 4) !== 'http'
|
||||
? path + userInfo.headerImg
|
||||
: userInfo.headerImg
|
||||
userStore.userInfo.headerImg &&
|
||||
userStore.userInfo.headerImg.slice(0, 4) !== 'http'
|
||||
? path + userStore.userInfo.headerImg
|
||||
: userStore.userInfo.headerImg
|
||||
})`,
|
||||
'background-repeat': 'no-repeat',
|
||||
'background-size': 'cover',
|
||||
@@ -25,7 +25,7 @@
|
||||
</div>
|
||||
<div class="user-personality">
|
||||
<p v-if="!editFlag" class="nickName">
|
||||
{{ userInfo.nickName }}
|
||||
{{ userStore.userInfo.nickName }}
|
||||
<el-icon class="pointer" color="#66b1ff" @click="openEidt">
|
||||
<edit />
|
||||
</el-icon>
|
||||
@@ -47,7 +47,7 @@
|
||||
<el-icon>
|
||||
<user />
|
||||
</el-icon>
|
||||
{{ userInfo.nickName }}
|
||||
{{ userStore.userInfo.nickName }}
|
||||
</li>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
@@ -179,11 +179,9 @@ export default {
|
||||
<script setup>
|
||||
import ChooseImg from '@/components/chooseImg/index.vue'
|
||||
import { setUserInfo, changePassword } from '@/api/user.js'
|
||||
import { useStore } from 'vuex'
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { reactive, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
|
||||
const store = useStore()
|
||||
import { useUserStore } from '@/pinia/modules/user'
|
||||
|
||||
const path = ref(import.meta.env.VITE_BASE_API)
|
||||
const activeName = ref('second')
|
||||
@@ -212,7 +210,7 @@ const rules = reactive({
|
||||
],
|
||||
})
|
||||
|
||||
const userInfo = computed(() => store.getters['user/userInfo'])
|
||||
const userStore = useUserStore()
|
||||
const modifyPwdForm = ref(null)
|
||||
const showPassword = ref(false)
|
||||
const pwdModify = ref({})
|
||||
@@ -222,7 +220,7 @@ const savePassword = async() => {
|
||||
modifyPwdForm.value.validate((valid) => {
|
||||
if (valid) {
|
||||
changePassword({
|
||||
username: userInfo.value.userName,
|
||||
username: userStore.userInfo.userName,
|
||||
password: pwdModify.value.password,
|
||||
newPassword: pwdModify.value.newPassword,
|
||||
}).then((res) => {
|
||||
@@ -252,10 +250,10 @@ const openChooseImg = () => {
|
||||
}
|
||||
|
||||
const ResetUserInfo = (data) => {
|
||||
store.commit('user/ResetUserInfo', data)
|
||||
userStore.ResetUserInfo(data)
|
||||
}
|
||||
const enterImg = async(url) => {
|
||||
const res = await setUserInfo({ headerImg: url, ID: userInfo.value.ID })
|
||||
const res = await setUserInfo({ headerImg: url, ID: userStore.userInfo.ID })
|
||||
if (res.code === 0) {
|
||||
ResetUserInfo({ headerImg: url })
|
||||
ElMessage({
|
||||
@@ -266,7 +264,7 @@ const enterImg = async(url) => {
|
||||
}
|
||||
|
||||
const openEidt = () => {
|
||||
nickName.value = userInfo.value.nickName
|
||||
nickName.value = userStore.userInfo.nickName
|
||||
editFlag.value = true
|
||||
}
|
||||
|
||||
@@ -278,7 +276,7 @@ const closeEdit = () => {
|
||||
const enterEdit = async() => {
|
||||
const res = await setUserInfo({
|
||||
nickName: nickName.value,
|
||||
ID: userInfo.value.ID,
|
||||
ID: userStore.userInfo.ID,
|
||||
})
|
||||
if (res.code === 0) {
|
||||
ResetUserInfo({ nickName: nickName.value })
|
||||
|
||||
Reference in New Issue
Block a user