Commit Graph

124 Commits (641c6ea1ce2014be632a0320548a14aac9403771)

Author SHA1 Message Date
26947 c43c960568 增加我的页面 2024-06-08 14:36:51 +08:00
26947 ea7bb59e32 修改pages json 2024-06-08 07:52:49 +08:00
26947 bd6469eb28 Merge remote-tracking branch 'origin/main' into main 2024-06-08 07:41:38 +08:00
26947 a3e4c7aa7f 活动管理完成列表页面简单联调 2024-06-08 07:41:30 +08:00
尕宋 746b801587 整合提交 2024-06-07 17:39:49 +08:00
尕宋 edf3e394ed 整合提交 2024-06-07 17:39:13 +08:00
26947 fc6726a74b Merge remote-tracking branch 'origin/main' into main 2024-06-06 21:14:11 +08:00
26947 a4ccdc6ad7 活动管理完成列表页面简单联调 2024-06-06 21:14:03 +08:00
Connor 7fa69e92ff 修正 pages.json 问题 - 首页配置重复、合并误删话题 path 2024-06-06 19:48:43 +08:00
Connor d6c74865b3 Merge remote-tracking branch 'origin/main' 2024-06-06 19:37:00 +08:00
Connor 7b3ce853e9 完成评论区 2024-06-06 19:36:53 +08:00
26947 285165da02 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	pages.json
2024-06-05 22:34:30 +08:00
26947 2215204170 活动管理完成列表页面简单联调 2024-06-05 22:34:08 +08:00
Connor 5907aebbce Merge remote-tracking branch 'origin/main' 2024-06-05 20:03:58 +08:00
Connor a312c6981d 修改pages.json-首页 2024-06-05 20:03:51 +08:00
26947 cd4c17d3ee Merge remote-tracking branch 'origin/main' into main 2024-06-05 19:52:54 +08:00
26947 cb56e36bf3 活动列表页面简单联调 2024-06-05 19:52:43 +08:00
Connor 827f48bbd8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	pages.json
2024-06-05 19:51:45 +08:00
Connor 1e2aa1cae3 话题详情/发布话题 2024-06-05 19:48:15 +08:00
尕宋 7429ba4555 修改pages.json 2024-06-05 19:32:42 +08:00
尕宋 9b89745eaa 整合代码 2024-06-05 18:41:06 +08:00
尕宋 d2ff24348b 整合代码 2024-06-05 18:40:02 +08:00
26947 3bbf2694b9 Merge remote-tracking branch 'origin/main' into main 2024-06-05 16:58:17 +08:00
26947 06ff1dc23f 活动列表页面联调 2024-06-05 16:57:58 +08:00
Connor a2f702cace 整合代码 2024-06-05 13:08:14 +08:00
Connor f7500713af 整合代码 2024-06-05 12:56:09 +08:00
Connor ea4db68fbe Merge remote-tracking branch 'origin/main'
# Conflicts:
#	pages.json
#	pages/index.vue
2024-06-05 12:48:21 +08:00
Connor 29ea97eedf 话题组件 2024-06-05 12:43:54 +08:00
26947 c5483524a9 修改pages 2024-06-04 22:03:27 +08:00
26947 70f21ec904 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	pages.json
2024-06-04 22:01:49 +08:00
26947 3ce2661da7 增加todo 2024-06-04 22:00:48 +08:00
尕宋 c06d507be8 Merge branch 'main' of http://47.93.242.168:3000/talk/talk_app 2024-06-04 21:41:56 +08:00
尕宋 a8e3222a06 回家做的 2024-06-04 21:40:25 +08:00
26947 08761592e9 增加todo 2024-06-04 19:06:52 +08:00
26947 dd1c85f36b 增加活动发布页面 2024-06-04 18:57:45 +08:00
26947 531881359a 增加组件样式 2024-06-03 10:22:10 +08:00
26947 92aeaf5d9c 修复已知问题 2024-06-02 19:09:14 +08:00
26947 ce937a5f3f 拆分部分页面 2024-06-02 11:10:25 +08:00
26947 7f1933681a 修复文件上传组建无法使用v-model绑定的问题 2024-06-01 23:03:12 +08:00
26947 ba7f983e5b 修复部分页面展示bug 2024-06-01 20:10:34 +08:00
26947 28c31bf458 增加详情页 2024-06-01 15:04:14 +08:00
26947 f021759a3e 像上层提取icon 2024-06-01 12:23:29 +08:00
26947 794d4e6bf6 增加活动列表页面,增加全局灰色背景色 2024-05-31 21:47:10 +08:00
26947 5c28ddf647 增加tabbar图片和活动界面(10%) 2024-05-31 18:19:32 +08:00
26947 8a8eebc7aa Merge remote-tracking branch 'origin/main' into main 2024-05-30 20:15:12 +08:00
26947 d205ffb943 增加文件上传组件 2024-05-30 20:14:59 +08:00
song 15ebec31f3 签到明细页面 2024-05-30 16:08:11 +08:00
Connor acc5f92116 Merge remote-tracking branch 'origin/main' 2024-05-28 10:35:00 +08:00
Connor 572d90c867 合并话题/搜索页面 2024-05-28 10:34:28 +08:00
尕宋 e58cb7b439 新建添加好友页面 2024-05-28 09:34:27 +08:00