Commit Graph

187 Commits (f6e597931dee88a14542ccb6ac892ad7fea09a1a)

Author SHA1 Message Date
Connor 05a4301595 完成我的话题模块、删除操作、修复若干小问题 2024-06-16 22:23:43 +08:00
Connor b443bb0250 完成我的话题模块、删除操作、修复若干小问题 2024-06-16 22:21:29 +08:00
Connor a4b3868e59 Merge remote-tracking branch 'origin/main' 2024-06-16 13:51:59 +08:00
Connor d4c8ed324e 完善首页(推荐、关注)查询、分页 2024-06-16 13:51:53 +08:00
26947 d1e986f8f2 Merge remote-tracking branch 'origin/main' into main 2024-06-15 19:06:04 +08:00
26947 a54c1f9254 增加一个版本管理 2024-06-15 19:05:52 +08:00
Connor 61ad891e13 Merge remote-tracking branch 'origin/main' 2024-06-15 18:05:30 +08:00
Connor dda6417a3d 修复评论区子评论后全部展开导致显示的子评论重复 2024-06-15 18:05:24 +08:00
26947 580bbeba51 完善基本页面 2024-06-15 15:19:23 +08:00
26947 2080ee2bbe 完善上传组件 2024-06-15 13:16:45 +08:00
26947 a799f7bbe9 Merge remote-tracking branch 'origin/main' into main 2024-06-15 11:27:00 +08:00
26947 31dbdc023d 完成我的页面1 2024-06-15 11:26:54 +08:00
尕宋 1e579c62e1 整合 2024-06-15 11:26:21 +08:00
尕宋 641c6ea1ce 整合 2024-06-15 11:25:51 +08:00
Connor 730aea4af3 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	pages/index.vue
2024-06-15 00:31:57 +08:00
Connor 49ccec4685 完成评论区 2024-06-15 00:26:10 +08:00
26947 341d43d8b0 完成我的页面客服引导 2024-06-14 22:50:24 +08:00
26947 a68ce2234e 增加一些个人详情页面 2024-06-14 21:55:07 +08:00
26947 c403035326 Merge remote-tracking branch 'origin/main' into main 2024-06-13 23:15:59 +08:00
26947 9582c2e53c 增加一些页面和交互 2024-06-13 23:15:52 +08:00
Connor f83aa9a024 完善话题(点赞、收藏、关注)操作逻辑 2024-06-13 21:49:50 +08:00
26947 7e9597f884 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	config.js
2024-06-13 00:46:17 +08:00
26947 d80a061b9e 修改登录界面 2024-06-13 00:46:01 +08:00
Connor 324d709725 修复话题样式小问题 2024-06-12 23:14:49 +08:00
Connor 96a1eb11e3 首页新增消息图标 2024-06-12 22:31:37 +08:00
Connor c355fffc92 Merge remote-tracking branch 'origin/main' 2024-06-12 22:20:43 +08:00
Connor d5497cb940 完成话题(关注、点赞、收藏) 2024-06-12 22:20:36 +08:00
26947 8bce2621f3 Merge remote-tracking branch 'origin/main' into main 2024-06-12 16:37:53 +08:00
26947 e94b31d717 增加一些简单判断 2024-06-12 16:37:46 +08:00
尕宋 5e5a19bd59 页面完善 2024-06-12 12:30:05 +08:00
尕宋 16579e5d8a 页面完善 2024-06-12 12:29:17 +08:00
26947 628ee19269 增加一下倒叙查询 2024-06-11 19:15:45 +08:00
26947 dba4402115 修复一些查询接口 2024-06-11 13:25:35 +08:00
26947 8c26b4787e 增加一些活动参与人头像查询接口 2024-06-10 16:12:11 +08:00
26947 ad6dfb3904 我的页面,增加活动详情 2024-06-09 23:10:23 +08:00
26947 39d20fd057 Merge remote-tracking branch 'origin/main' into main 2024-06-09 20:22:50 +08:00
26947 9a9d1019ec 我的页面,增加活动管理 2024-06-09 20:22:43 +08:00
Connor 763976a6b2 Merge remote-tracking branch 'origin/main' 2024-06-09 17:08:08 +08:00
Connor 95ab7480bd 完成评论区样式、子评论展开逻辑 2024-06-09 17:08:02 +08:00
26947 9669565dc7 Merge remote-tracking branch 'origin/main' into main 2024-06-09 15:38:25 +08:00
26947 9702f6f4a3 我的页面 2024-06-09 15:38:05 +08:00
26947 313399f5fb 我的页面 2024-06-09 15:37:59 +08:00
Connor f76e47e845 页面上滑一定高度u-navbar底色变白,以及样式问题 2024-06-08 23:44:59 +08:00
Connor ecddf78b71 修复小问题 2024-06-08 22:24:37 +08:00
Connor a0b3830b17 Merge remote-tracking branch 'origin/main' 2024-06-08 22:18:51 +08:00
Connor fe564d159f 重写话题图片样式 2024-06-08 22:18:45 +08:00
26947 c8a69bee32 Merge remote-tracking branch 'origin/main' into main 2024-06-08 21:22:35 +08:00
26947 5609f6d946 修复活动页面背景展示出错问题 2024-06-08 21:22:20 +08:00
Connor 4348db7898 修复热门弹窗选项列表 2024-06-08 20:06:30 +08:00
Connor 5943b78269 Merge remote-tracking branch 'origin/main' 2024-06-08 20:01:40 +08:00
Connor f19de60058 修复热门弹窗选项列表、搜索页面 icon 路径等问题 2024-06-08 20:01:35 +08:00
尕宋 547649e4a4 跳转问题 2024-06-08 19:37:58 +08:00
26947 3df343dab2 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	pages.json
2024-06-08 19:18:55 +08:00
26947 a283c978bf 修改 2024-06-08 19:18:39 +08:00
尕宋 de2b2d9162 修改重复的json 2024-06-08 19:17:50 +08:00
26947 8bc02eecfe Merge remote-tracking branch 'origin/main' into main 2024-06-08 19:02:54 +08:00
26947 0a479f638b 修改 2024-06-08 19:02:43 +08:00
Connor f910acfa17 Merge remote-tracking branch 'origin/main' 2024-06-08 18:57:26 +08:00
Connor 23a8b6d719 修复键盘遮挡输入框问题 2024-06-08 18:57:20 +08:00
尕宋 42a0f771cb app 2024-06-08 18:50:21 +08:00
尕宋 0482f186f4 app 2024-06-08 18:49:58 +08:00
26947 7e91066419 Merge remote-tracking branch 'origin/main' into main 2024-06-08 18:42:57 +08:00
26947 3d6f80ba79 修改登录 2024-06-08 18:42:51 +08:00
Connor a14a78fe89 修复键盘遮挡输入框问题 2024-06-08 18:41:53 +08:00
26947 473d8524e5 修改登录 2024-06-08 18:10:03 +08:00
26947 afc161733b Merge remote-tracking branch 'origin/main' into main 2024-06-08 18:05:46 +08:00
26947 7a02804fc9 修改登录 2024-06-08 18:05:38 +08:00
Connor f4a46a5c67 Merge remote-tracking branch 'origin/main' 2024-06-08 18:03:50 +08:00
Connor 7abf5166ee 修复图片路径、键盘监听事件导致详情无法正常渲染等问题 2024-06-08 18:03:43 +08:00
26947 a66b4fc5c4 增加下方tab栏 2024-06-08 17:17:35 +08:00
26947 40a1a34d1c 增加我的页面 2024-06-08 17:06:47 +08:00
26947 c43c960568 增加我的页面 2024-06-08 14:36:51 +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
尕宋 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 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