mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

This commit is contained in:
TinyAnts 2022-11-17 14:59:48 +08:00
parent 25a85adf9e 54c58d6ee1
commit b1fe1d9d47
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/upload/index.vue
View File

@ -79,7 +79,7 @@ export default defineComponent({
setup(props, { emit }) { setup(props, { emit }) {
const userStore = useUserStore() const userStore = useUserStore()
const uploadRefs = shallowRef<InstanceType<typeof ElUpload>>() const uploadRefs = shallowRef<InstanceType<typeof ElUpload>>()
const action = ref(`${config.baseUrl}${config.urlPrefix}/common/upload/${props.type}`) const action = ref(`${config.baseUrl}${config.urlPrefix}/upload/${props.type}`)
const headers = computed(() => ({ const headers = computed(() => ({
token: userStore.token, token: userStore.token,
version: config.version version: config.version

2
admin/src/views/decoration/tabbar.vue
View File

@ -188,7 +188,7 @@ const onMove = (e: any) => {
const getData = async () => { const getData = async () => {
const data = await getDecorateTabbar() const data = await getDecorateTabbar()
tabbar.list = data.list.map((item: any) => ({ ...item, link: JSON.parse(item.link) })) tabbar.list = data.list
tabbar.style = data.style tabbar.style = data.style
} }
const setData = async () => { const setData = async () => {