Merge branch 'main' into lyc-dev

This commit is contained in:
lyc 2024-07-24 15:24:03 +08:00
commit ea5a069f85
5 changed files with 8 additions and 14 deletions

View File

@ -26,12 +26,7 @@ export default defineConfig({
target: 'http://192.168.2.52:7863', target: 'http://192.168.2.52:7863',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')
}, }
'/profile': {
target: 'http://192.168.2.52:7863',
ws: true,
changeOrigin: true
},
}, },
}, },
plugins: [vue(), WindiCSS()], plugins: [vue(), WindiCSS()],

View File

@ -113,9 +113,6 @@ const emits = defineEmits(['setLayout'])
function setLayout() { function setLayout() {
emits('setLayout'); emits('setLayout');
} }
watch(()=> userStore.avatar,() => {
userImg.value = userStore.avatar;
},{deep:true})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -36,6 +36,7 @@ const useUserStore = defineStore(
getInfo() { getInfo() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo().then(res => {
res.user.avatar = import.meta.env.VITE_APP_BASE_API + res.user.avatar
const user = res.user const user = res.user
this.user = user this.user = user
const avatar = (user.avatar == "" || user.avatar == null) ? defAva : user.avatar; const avatar = (user.avatar == "" || user.avatar == null) ? defAva : user.avatar;
@ -46,8 +47,8 @@ const useUserStore = defineStore(
} else { } else {
this.roles = ['ROLE_DEFAULT'] this.roles = ['ROLE_DEFAULT']
} }
this.id = user.userId this.id = user.userId
this.userName = user.userName this.userName = user.userName
this.nickName = user.nickName; this.nickName = user.nickName;
@ -70,7 +71,7 @@ const useUserStore = defineStore(
this.plainpwd = user.plainpwd; this.plainpwd = user.plainpwd;
this.roles = res.roles; this.roles = res.roles;
resolve(res) resolve(res)
}).catch(error => { }).catch(error => {
reject(error) reject(error)

View File

@ -99,6 +99,7 @@ const state = reactive({
function getUser() { function getUser() {
getUserProfile().then((response) => { getUserProfile().then((response) => {
response.data.avatar = import.meta.env.VITE_APP_BASE_API + response.data.avatar
state.user = response.data state.user = response.data
state.roleGroup = response.roleGroup state.roleGroup = response.roleGroup
state.postGroup = response.postGroup state.postGroup = response.postGroup

View File

@ -84,7 +84,7 @@ const title = ref('修改头像')
// //
const options = reactive({ const options = reactive({
img: userStore.avatar, // img: userStore.user.avatar, //
autoCrop: true, // autoCrop: true, //
autoCropWidth: 200, // autoCropWidth: 200, //
autoCropHeight: 200, // autoCropHeight: 200, //
@ -155,7 +155,7 @@ function uploadImg() {
uploadAvatar(formData).then((response) => { uploadAvatar(formData).then((response) => {
open.value = false open.value = false
options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl
userStore.avatar = options.img userStore.user.avatar = options.img
ElMessage({ ElMessage({
message: '上传成功', message: '上传成功',
type: 'success', type: 'success',