Commit 8dd8a5ed011834e851703df8beac4003d357471a
Committed by
GitHub
GitHub
1 parent
f1717973
个人设置图标修改时弹出窗显示原图片，由于跨域获取图片存在问题暂时将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中的跨域图片链接去掉，直接采用本地图片
Showing
3 changed files
with
5 additions
and
3 deletions
mock/sys/user.ts
| @@ -7,7 +7,7 @@ export function createFakeUserList() { | @@ -7,7 +7,7 @@ export function createFakeUserList() { | ||
| 7 | userId: '1', | 7 | userId: '1', |
| 8 | username: 'vben', | 8 | username: 'vben', |
| 9 | realName: 'Vben Admin', | 9 | realName: 'Vben Admin', |
| 10 | - avatar: 'https://q1.qlogo.cn/g?b=qq&nk=190848757&s=640', | 10 | + avatar: '', |
| 11 | desc: 'manager', | 11 | desc: 'manager', |
| 12 | password: '123456', | 12 | password: '123456', |
| 13 | token: 'fakeToken1', | 13 | token: 'fakeToken1', |
| @@ -24,7 +24,7 @@ export function createFakeUserList() { | @@ -24,7 +24,7 @@ export function createFakeUserList() { | ||
| 24 | username: 'test', | 24 | username: 'test', |
| 25 | password: '123456', | 25 | password: '123456', |
| 26 | realName: 'test user', | 26 | realName: 'test user', |
| 27 | - avatar: 'https://q1.qlogo.cn/g?b=qq&nk=339449197&s=640', | 27 | + avatar: '', |
| 28 | desc: 'tester', | 28 | desc: 'tester', |
| 29 | token: 'fakeToken2', | 29 | token: 'fakeToken2', |
| 30 | homePath: '/dashboard/workbench', | 30 | homePath: '/dashboard/workbench', |
src/components/Cropper/src/CopperModal.vue
| @@ -129,6 +129,7 @@ | @@ -129,6 +129,7 @@ | ||
| 129 | uploadApi: { | 129 | uploadApi: { |
| 130 | type: Function as PropType<(params: apiFunParams) => Promise<any>>, | 130 | type: Function as PropType<(params: apiFunParams) => Promise<any>>, |
| 131 | }, | 131 | }, |
| 132 | + src: { type: String }, | ||
| 132 | }; | 133 | }; |
| 133 | 134 | ||
| 134 | export default defineComponent({ | 135 | export default defineComponent({ |
| @@ -138,7 +139,7 @@ | @@ -138,7 +139,7 @@ | ||
| 138 | emits: ['uploadSuccess', 'register'], | 139 | emits: ['uploadSuccess', 'register'], |
| 139 | setup(props, { emit }) { | 140 | setup(props, { emit }) { |
| 140 | let filename = ''; | 141 | let filename = ''; |
| 141 | - const src = ref(''); | 142 | + const src = ref(props.src || ''); |
| 142 | const previewSource = ref(''); | 143 | const previewSource = ref(''); |
| 143 | const cropper = ref<Cropper>(); | 144 | const cropper = ref<Cropper>(); |
| 144 | let scaleX = 1; | 145 | let scaleX = 1; |
src/views/demo/page/account/setting/BaseSetting.vue
| @@ -62,6 +62,7 @@ | @@ -62,6 +62,7 @@ | ||
| 62 | 62 | ||
| 63 | const avatar = computed(() => { | 63 | const avatar = computed(() => { |
| 64 | const { avatar } = userStore.getUserInfo; | 64 | const { avatar } = userStore.getUserInfo; |
| 65 | + console.log(avatar); | ||
| 65 | return avatar || headerImg; | 66 | return avatar || headerImg; |
| 66 | }); | 67 | }); |
| 67 | 68 |