Commit Graph

11 Commits

Author SHA1 Message Date
zhangxuelin baa41d00eb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	package.json
#	src/main/index.js
#	src/renderer/src/assets/iconfont/iconfont.css
#	src/renderer/src/assets/iconfont/iconfont.js
#	src/renderer/src/assets/iconfont/iconfont.json
#	src/renderer/src/assets/iconfont/iconfont.svg
#	src/renderer/src/assets/iconfont/iconfont.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
#	src/renderer/src/views/resource/index.vue
2024-07-26 10:51:46 +08:00
朱浩 4e9c93da15 二期:头像相关问题修复 2024-07-24 14:48:18 +08:00
zdg df87aafca4 悬浮球 2024-07-22 16:30:35 +08:00
朱浩 21ff546429 基础文件上传核心开发 2024-07-18 16:37:46 +08:00
cys 2ed3bfb36a 个人中心 2024-07-17 14:25:01 +08:00
lyc 8fe2602598 修改资源 2024-07-17 11:34:09 +08:00
朱浩 ed6fd5e89b 基础框架微调 2024-07-11 14:30:08 +08:00
lyc 08eda419e0 edit 2024-07-10 20:21:22 +08:00
朱浩 300e9130aa 解决框架标黄,头部退出添加,头像添加 2024-07-09 17:47:58 +08:00
朱浩 07f982c0b3 基础上传功能实现 2024-07-09 16:19:33 +08:00
lyc 355cc0532a init 2024-07-08 16:24:56 +08:00