zxl #15

Merged
zhangxuelin merged 9 commits from zxl into main 2024-11-06 17:31:43 +08:00

9 Commits

Author SHA1 Message Date
zhangxuelin 45b93b8980 首页展示学校 2024-11-06 17:30:31 +08:00
zhangxuelin 79f38ad18f no message 2024-11-06 17:06:17 +08:00
zhangxuelin 652c46c33b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	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.ttf
#	src/renderer/src/assets/iconfont/iconfont.woff
#	src/renderer/src/assets/iconfont/iconfont.woff2
#	src/renderer/src/router/index.js
2024-11-06 17:04:39 +08:00
zhangxuelin dd8c48f3ae 学校加入 注册 登录注册 加入学校审批 2024-11-06 16:55:40 +08:00
zhangxuelin bbf85c4337 注册 2024-10-30 17:25:04 +08:00
zhangxuelin 9167751c6c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/layout/components/Aside.vue
2024-10-30 15:08:25 +08:00
zhangxuelin 7319c396c4 新增加入学校 学校认证 2024-10-30 15:06:37 +08:00
zhangxuelin b7dc080840 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-10-30 10:24:16 +08:00
zhangxuelin 41d6b35340 登录 2024-10-30 10:23:38 +08:00