diff --git a/src/api/user.ts b/src/api/user.ts index b7bd1898..2ee079cd 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -2,7 +2,7 @@ * @Author: 秦少卫 * @Date: 2024-04-24 14:07:06 * @LastEditors: 秦少卫 - * @LastEditTime: 2024-05-30 17:54:26 + * @LastEditTime: 2024-05-31 15:52:01 * @Description: 用户接口登录 */ @@ -70,6 +70,9 @@ export const getTmplList = (data: any) => instance.get(`/api/user-templs?${data} // 查询素材列表 export const getTmplInfo = (data: any) => instance.get(`/api/user-templs/${data}`); +// 获取用户树菜单 +export const getUserFileTypeTree = () => instance.get(`/api/user-templ/getUerFileTypeTree`); + // 获取菜单树 export const getFileTypeTree = (data: any) => instance.get(`/api/custom/getUerFileTypeTree`, { diff --git a/src/components/importJSON.vue b/src/components/importJSON.vue index 24578d3e..fd956a1c 100644 --- a/src/components/importJSON.vue +++ b/src/components/importJSON.vue @@ -2,7 +2,7 @@ * @Author: 秦少卫 * @Date: 2022-09-03 19:16:55 * @LastEditors: 秦少卫 - * @LastEditTime: 2024-05-30 14:14:02 + * @LastEditTime: 2024-05-31 16:58:12 * @Description: 导入JSON文件 --> @@ -54,9 +54,9 @@ const clickHandler = (type) => { createDesign, // psd psd: () => { - Spin.show({ - render: (h) => h('div', t('alert.loading_data')), - }); + // Spin.show({ + // render: (h) => h('div', t('alert.loading_data')), + // }); canvasEditor.insertPSD().finally(Spin.hide); }, }; diff --git a/src/components/myMaterial/components/file.vue b/src/components/myMaterial/components/file.vue index 8bf36797..47152ce0 100644 --- a/src/components/myMaterial/components/file.vue +++ b/src/components/myMaterial/components/file.vue @@ -2,7 +2,7 @@ * @Author: 秦少卫 * @Date: 2024-05-30 10:48:00 * @LastEditors: 秦少卫 - * @LastEditTime: 2024-05-30 14:47:39 + * @LastEditTime: 2024-05-31 16:38:14 * @Description: 模板文件 --> + + + + +