mirror of
https://github.com/vbenjs/vue-vben-admin.git
synced 2025-01-24 18:40:22 +08:00
个人设置图标修改时弹出窗显示原图片,由于跨域获取图片存在问题暂时将user.ts中的跨域图片链接去掉,直接采用本地图片 (#2487)
* feat(axiosSuccess): 操作成功后根据传入提示模式进行相应 * fix(axiosRetry): 解决get重试请求返回的headers造成无法成功请求的问题 * fix(axiosRetry): 参数首字母小写 * fix(useDataSource): 解决deleteTableRecord删除树形表格的行记录时,无法删除,无法找到子节点的问题 * feat(useDataSource): 删除之前提交代码遗留的console * fix(permissionGuard): 当获取用户信息失败时,不允许正常登陆返回登陆界面 * fix(permissionGuard): 代码还原 * fix(menu): 解决隐藏菜单目录只能隐藏第一层目录的问题,递归隐藏所有子菜单 * feat(baseSetting): 个人设置图标修改时弹出窗显示原图片,由于跨域获取图片存在问题暂时将user.ts中的跨域图片链接去掉,直接采用本地图片
This commit is contained in:
parent
f1717973c4
commit
8dd8a5ed01
@ -7,7 +7,7 @@ export function createFakeUserList() {
|
|||||||
userId: '1',
|
userId: '1',
|
||||||
username: 'vben',
|
username: 'vben',
|
||||||
realName: 'Vben Admin',
|
realName: 'Vben Admin',
|
||||||
avatar: 'https://q1.qlogo.cn/g?b=qq&nk=190848757&s=640',
|
avatar: '',
|
||||||
desc: 'manager',
|
desc: 'manager',
|
||||||
password: '123456',
|
password: '123456',
|
||||||
token: 'fakeToken1',
|
token: 'fakeToken1',
|
||||||
@ -24,7 +24,7 @@ export function createFakeUserList() {
|
|||||||
username: 'test',
|
username: 'test',
|
||||||
password: '123456',
|
password: '123456',
|
||||||
realName: 'test user',
|
realName: 'test user',
|
||||||
avatar: 'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640',
|
avatar: '',
|
||||||
desc: 'tester',
|
desc: 'tester',
|
||||||
token: 'fakeToken2',
|
token: 'fakeToken2',
|
||||||
homePath: '/dashboard/workbench',
|
homePath: '/dashboard/workbench',
|
||||||
|
@ -129,6 +129,7 @@
|
|||||||
uploadApi: {
|
uploadApi: {
|
||||||
type: Function as PropType<(params: apiFunParams) => Promise<any>>,
|
type: Function as PropType<(params: apiFunParams) => Promise<any>>,
|
||||||
},
|
},
|
||||||
|
src: { type: String },
|
||||||
};
|
};
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
@ -138,7 +139,7 @@
|
|||||||
emits: ['uploadSuccess', 'register'],
|
emits: ['uploadSuccess', 'register'],
|
||||||
setup(props, { emit }) {
|
setup(props, { emit }) {
|
||||||
let filename = '';
|
let filename = '';
|
||||||
const src = ref('');
|
const src = ref(props.src || '');
|
||||||
const previewSource = ref('');
|
const previewSource = ref('');
|
||||||
const cropper = ref<Cropper>();
|
const cropper = ref<Cropper>();
|
||||||
let scaleX = 1;
|
let scaleX = 1;
|
||||||
|
@ -62,6 +62,7 @@
|
|||||||
|
|
||||||
const avatar = computed(() => {
|
const avatar = computed(() => {
|
||||||
const { avatar } = userStore.getUserInfo;
|
const { avatar } = userStore.getUserInfo;
|
||||||
|
console.log(avatar);
|
||||||
return avatar || headerImg;
|
return avatar || headerImg;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user