mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
synced 2026-08-06 02:47:29 +08:00
fix(buyer): 解决 Profile.vue 合并冲突标记导致的编译错误
保留 getMemberMsg 安全加载用户信息逻辑，并统一使用 buyerUrl 上传接口。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
田香琪
@@ -1,194 +1,191 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="wrapper">
|
|
||||||
<UserCenterLayout title="用户信息" :tabs="['用户信息']">
|
<div class="wrapper">
|
||||||
<el-form :model="formItem" :rules="rules" ref="form" label-width="80px">
|
|
||||||
<el-form-item label="头像" class="avatar-form-item">
|
<UserCenterLayout title="用户信息" :tabs="['用户信息']">
|
||||||
<div class="avatar-upload">
|
|
||||||
<el-avatar v-if="formItem.face" :src="formItem.face" :size="80" />
|
<el-form :model="formItem" :rules="rules" ref="form" label-width="80px">
|
||||||
<el-avatar v-else :size="80"><el-icon><User /></el-icon></el-avatar>
|
|
||||||
<el-upload
|
<el-form-item label="头像" class="avatar-form-item">
|
||||||
:show-file-list="false"
|
|
||||||
:on-success="handleSuccess"
|
<div class="avatar-upload">
|
||||||
:format="['jpg','jpeg','png']"
|
|
||||||
:action="action"
|
<el-avatar v-if="formItem.face" :src="formItem.face" :size="80" />
|
||||||
:headers="accessToken"
|
|
||||||
>
|
<el-avatar v-else :size="80"><el-icon><User /></el-icon></el-avatar>
|
||||||
<el-button>上传头像</el-button>
|
|
||||||
</el-upload>
|
<el-upload
|
||||||
</div>
|
|
||||||
</el-form-item>
|
:show-file-list="false"
|
||||||
<el-form-item label="昵称" prop="nickName">
|
|
||||||
<el-input class="profile-field" v-model="formItem.nickName" placeholder="" />
|
:on-success="handleSuccess"
|
||||||
</el-form-item>
|
|
||||||
|
:format="['jpg','jpeg','png']"
|
||||||
<el-form-item label="生日">
|
|
||||||
<el-date-picker
|
:action="action"
|
||||||
class="profile-field"
|
|
||||||
type="date"
|
:headers="accessToken"
|
||||||
placeholder="选择您的生日"
|
|
||||||
v-model="formItem.birthday"
|
>
|
||||||
/>
|
|
||||||
</el-form-item>
|
<el-button>上传头像</el-button>
|
||||||
<el-form-item label="性别">
|
|
||||||
<el-radio-group v-model="formItem.sex" type="button" button-style="solid">
|
</el-upload>
|
||||||
<el-radio :label="1">男</el-radio>
|
|
||||||
<el-radio :label="0">女</el-radio>
|
</div>
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" @click="save">确认修改</el-button>
|
<el-form-item label="昵称" prop="nickName">
|
||||||
|
|
||||||
</el-form-item>
|
<el-input class="profile-field" v-model="formItem.nickName" placeholder="" />
|
||||||
</el-form>
|
|
||||||
</UserCenterLayout>
|
</el-form-item>
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
<el-form-item label="生日">
|
||||||
import { Message } from "@/utils/message";
|
|
||||||
import { editMemberInfo } from '@/api/account.js';
|
<el-date-picker
|
||||||
<<<<<<< HEAD
|
|
||||||
import { getMemberMsg } from '@/api/login.js';
|
class="profile-field"
|
||||||
import { commonUrl } from '@/plugins/request.js';
|
|
||||||
=======
|
type="date"
|
||||||
import { buyerUrl } from '@/plugins/request.js';
|
|
||||||
>>>>>>> 29d5ba98ff40ecd028bcd8d89bf410f952052931
|
placeholder="选择您的生日"
|
||||||
import storage from '@/plugins/storage.js';
|
|
||||||
import { User } from '@element-plus/icons-vue';
|
v-model="formItem.birthday"
|
||||||
export default {
|
|
||||||
components: { User },
|
/>
|
||||||
name: 'Profile',
|
|
||||||
data () {
|
</el-form-item>
|
||||||
return {
|
|
||||||
rules: { // 验证规则
|
<el-form-item label="性别">
|
||||||
nickName: [{required: true, message: '用户昵称不能为空'}, { max: 16, message: '用户昵称不能超过15个字符' }]
|
|
||||||
},
|
<el-radio-group v-model="formItem.sex" type="button" button-style="solid">
|
||||||
formItem: {}, // 表单数据
|
|
||||||
action: buyerUrl + '/buyer/common/upload/file', // 上传接口
|
<el-radio :label="1">男</el-radio>
|
||||||
accessToken: {} // 验证token
|
|
||||||
}
|
<el-radio :label="0">女</el-radio>
|
||||||
},
|
|
||||||
mounted () {
|
</el-radio-group>
|
||||||
this.accessToken.accessToken = storage.getItem('accessToken');
|
|
||||||
this.loadUserInfo();
|
</el-form-item>
|
||||||
},
|
|
||||||
methods: {
|
<el-form-item>
|
||||||
loadUserInfo () {
|
|
||||||
const rawUserInfo = storage.getItem('userInfo');
|
<el-button type="primary" @click="save">确认修改</el-button>
|
||||||
if (rawUserInfo) {
|
|
||||||
this.applyUserInfo(JSON.parse(rawUserInfo));
|
|
||||||
return;
|
|
||||||
}
|
</el-form-item>
|
||||||
if (!storage.getItem('accessToken')) {
|
|
||||||
this.redirectToLogin();
|
</el-form>
|
||||||
return;
|
|
||||||
}
|
</UserCenterLayout>
|
||||||
getMemberMsg().then(res => {
|
|
||||||
if (res.success && res.result) {
|
</div>
|
||||||
storage.setItem('userInfo', res.result);
|
|
||||||
this.applyUserInfo(res.result);
|
</template>
|
||||||
} else {
|
|
||||||
this.redirectToLogin();
|
|
||||||
}
|
|
||||||
}).catch(() => {
|
<script>
|
||||||
this.redirectToLogin();
|
|
||||||
});
|
import { Message } from "@/utils/message";
|
||||||
},
|
|
||||||
applyUserInfo (userInfo) {
|
import { editMemberInfo } from '@/api/account.js';
|
||||||
this.formItem = { ...userInfo };
|
|
||||||
this.formItem.birthday = this.normalizeBirthday(this.formItem.birthday);
|
import { getMemberMsg } from '@/api/login.js';
|
||||||
},
|
|
||||||
redirectToLogin () {
|
import { buyerUrl } from '@/plugins/request.js';
|
||||||
this.$router.push({
|
|
||||||
path: '/login',
|
import storage from '@/plugins/storage.js';
|
||||||
query: {
|
|
||||||
rePath: this.$route.path,
|
import { User } from '@element-plus/icons-vue';
|
||||||
query: JSON.stringify(this.$route.query || {}),
|
|
||||||
},
|
export default {
|
||||||
});
|
|
||||||
},
|
components: { User },
|
||||||
normalizeBirthday (value) {
|
|
||||||
if (!value) return ''
|
name: 'Profile',
|
||||||
if (value instanceof Date) return value
|
|
||||||
if (typeof value === 'number') return new Date(value)
|
data () {
|
||||||
if (typeof value === 'string') {
|
|
||||||
const m = value.match(/^(\d{4})-(\d{2})-(\d{2})/)
|
return {
|
||||||
if (m) return new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]))
|
|
||||||
const d = new Date(value)
|
rules: { // 验证规则
|
||||||
return isNaN(d.getTime()) ? '' : d
|
|
||||||
}
|
nickName: [{required: true, message: '用户昵称不能为空'}, { max: 16, message: '用户昵称不能超过15个字符' }]
|
||||||
return ''
|
|
||||||
},
|
},
|
||||||
formatBirthday (value) {
|
|
||||||
if (!value) return null
|
formItem: {}, // 表单数据
|
||||||
if (typeof value === 'string') {
|
|
||||||
const m = value.match(/^(\d{4})-(\d{2})-(\d{2})/)
|
action: buyerUrl + '/buyer/common/upload/file', // 上传接口
|
||||||
return m ? `${m[1]}-${m[2]}-${m[3]}` : null
|
|
||||||
}
|
accessToken: {} // 验证token
|
||||||
const d = value instanceof Date ? value : new Date(value)
|
|
||||||
if (isNaN(d.getTime())) return null
|
}
|
||||||
const yyyy = d.getFullYear()
|
|
||||||
const mm = String(d.getMonth() + 1).padStart(2, '0')
|
},
|
||||||
const dd = String(d.getDate()).padStart(2, '0')
|
|
||||||
return `${yyyy}-${mm}-${dd}`
|
mounted () {
|
||||||
},
|
|
||||||
save () { // 保存
|
this.accessToken.accessToken = storage.getItem('accessToken');
|
||||||
this.$refs.form.validate(valid => {
|
|
||||||
if (valid) {
|
this.loadUserInfo();
|
||||||
let params = {
|
|
||||||
birthday: this.formatBirthday(this.formItem.birthday),
|
},
|
||||||
face: this.formItem.face,
|
|
||||||
nickName: this.formItem.nickName,
|
methods: {
|
||||||
sex: this.formItem.sex
|
|
||||||
}
|
loadUserInfo () {
|
||||||
editMemberInfo(params).then(res => {
|
|
||||||
if (res.success) {
|
const rawUserInfo = storage.getItem('userInfo');
|
||||||
Message.success('修改个人资料成功')
|
|
||||||
storage.setItem('userInfo', res.result)
|
if (rawUserInfo) {
|
||||||
this.$router.go(0)
|
|
||||||
}
|
this.applyUserInfo(JSON.parse(rawUserInfo));
|
||||||
})
|
|
||||||
}
|
return;
|
||||||
})
|
|
||||||
},
|
}
|
||||||
handleSuccess (res, file) { // 上传成功
|
|
||||||
this.formItem['face'] = res.result
|
if (!storage.getItem('accessToken')) {
|
||||||
},
|
|
||||||
}
|
this.redirectToLogin();
|
||||||
|
|
||||||
}
|
return;
|
||||||
</script>
|
|
||||||
|
}
|
||||||
<style scoped lang="scss">
|
|
||||||
.avatar-form-item {
|
getMemberMsg().then(res => {
|
||||||
:deep(.el-form-item__label) {
|
|
||||||
height: 90px;
|
if (res.success && res.result) {
|
||||||
line-height: 90px;
|
|
||||||
display: flex;
|
storage.setItem('userInfo', res.result);
|
||||||
align-items: center;
|
|
||||||
}
|
this.applyUserInfo(res.result);
|
||||||
}
|
|
||||||
|
} else {
|
||||||
.avatar-upload {
|
|
||||||
display: flex;
|
this.redirectToLogin();
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
}
|
||||||
gap: 10px;
|
|
||||||
|
}).catch(() => {
|
||||||
:deep(.el-avatar) {
|
|
||||||
margin-top: 10px;
|
this.redirectToLogin();
|
||||||
}
|
|
||||||
|
});
|
||||||
:deep(.el-upload) {
|
|
||||||
display: block;
|
},
|
||||||
}
|
|
||||||
}
|
applyUserInfo (userInfo) {
|
||||||
|
|
||||||
.profile-field {
|
this.formItem = { ...userInfo };
|
||||||
width: 187px;
|
|
||||||
}
|
this.formItem.birthday = this.normalizeBirthday(this.formItem.birthday);
|
||||||
|
|
||||||
:deep(.profile-field.el-date-editor) {
|
},
|
||||||
width: 187px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
Reference in New Issue
Block a user