62 Commits

Author SHA1 Message Date
huxuejian
4079f52ed6 Merge remote-tracking branch 'origin/dev-hjf' 2026-02-06 17:20:49 +08:00
huxuejian
cecfff6124 Merge remote-tracking branch 'origin/dev-wdb' 2026-02-06 17:20:43 +08:00
huxuejian
f4e2f87b6e fix: 问题修复 2026-02-06 17:20:12 +08:00
3341b24c3b Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf 2026-02-06 11:04:13 +08:00
3963587535 fix:优化首页布局 2026-02-06 10:54:34 +08:00
ebd8c0b2d2 Merge commit 'a3857c2d84f469bc8e2a96ba689aa84c72275d4b' into dev-wdb
# Conflicts:
#	pages/home/customer-archive.vue
2026-02-06 09:51:24 +08:00
110639725f Merge commit '4cc1e6853f1d2cf48548e53bbe237b70d7ee2c3f' into dev-wdb 2026-02-06 09:50:53 +08:00
huxuejian
4cc1e6853f fix: 问题修复 2026-02-05 17:11:17 +08:00
a3857c2d84 feat:添加新增档案样式 2026-02-05 17:06:00 +08:00
9dda930d1f 页面样式调整 2026-02-05 14:01:01 +08:00
huxuejian
744b1ee76b Merge remote-tracking branch 'origin/dev-wdb' 2026-02-05 11:28:48 +08:00
5bcdbf80cd no message 2026-02-05 11:26:53 +08:00
huxuejian
5ddc8fa9f2 Update login.vue 2026-02-05 11:22:52 +08:00
7e8151f0ac fix:修改首页布局 2026-02-05 10:27:20 +08:00
99152578df Merge commit 'c1a0090279f17158728df0f16d3860436867b47c' into dev-wdb
# Conflicts:
#	pages/home/customer-archive.vue
2026-02-05 09:55:20 +08:00
47303b3a36 更改小程序 appId 2026-02-05 09:53:49 +08:00
c1a0090279 refactor: 移除客户档案页面中的性别和年龄信息展示 2026-02-05 09:35:21 +08:00
e6f508ca00 Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf 2026-02-05 09:24:05 +08:00
e6ee42c3d1 feat: 添加更多文章列表页面及相关路由配置 2026-02-04 19:07:58 +08:00
bf9471cfa9 Merge commit '72e132ba8dded12692201f57bd898786af7195f4' into dev-wdb
# Conflicts:
#	pages.json
#	pages/home/customer-archive.vue
2026-02-04 18:52:23 +08:00
19a70f1134 Merge commit 'c452ea29e926b75d6a9d05f6f885216659b3efba' into dev-wdb 2026-02-04 18:50:39 +08:00
c452ea29e9 feat: 添加文章阅读记录和问卷调查相关API接口,优化文章和问卷列表加载状态 2026-02-04 18:39:57 +08:00
bb7d294ef6 更换头像 2026-02-04 17:12:59 +08:00
12d7d093e9 style: 调整文章和客户卡片的样式,优化布局和高度 2026-02-04 16:21:31 +08:00
huxuejian
72e132ba8d fix:问题修复 2026-02-04 15:23:57 +08:00
3ff53e7ba7 Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf 2026-02-04 13:39:43 +08:00
huxuejian
3af5c6750f Merge remote-tracking branch 'origin/dev-wdb' 2026-02-04 13:33:40 +08:00
huxuejian
7c43e5bec4 Merge remote-tracking branch 'origin/dev-hjf' 2026-02-04 13:29:16 +08:00
huxuejian
42a187459e fix: bug修复 2026-02-04 13:28:47 +08:00
c1ee2db1d6 no message 2026-02-04 12:51:45 +08:00
d41bb6cf51 Merge remote-tracking branch 'origin/main' into dev-hjf 2026-02-04 11:29:47 +08:00
f0722190c0 Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf 2026-02-04 11:29:40 +08:00
huxuejian
87e9cde197 fix: 问题修复 2026-02-04 09:16:36 +08:00
cda2954924 no message 2026-02-03 17:02:39 +08:00
cd95054b4c no message 2026-02-03 16:38:45 +08:00
7bc3e9e4c8 Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf 2026-02-03 16:11:50 +08:00
9465fd21bf fix:显示错误 2026-02-03 16:11:28 +08:00
fb1aa13234 Merge commit '63a31a1382fb5330dd618e8f8a57520be6b6f839' into dev-wdb 2026-02-03 16:01:37 +08:00
3c405f2f55 no message 2026-02-03 16:01:31 +08:00
63a31a1382 feat:首页UI修改 2026-02-03 15:42:32 +08:00
f69e374b39 no message 2026-02-03 11:20:32 +08:00
0d2875ed01 feat:首页UI优化 2026-02-03 10:45:54 +08:00
f50f4f9533 feat:优化首页布局 2026-02-03 09:59:49 +08:00
ebaaa7b72f Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf 2026-02-02 11:20:57 +08:00
c73e9c0f9e feat:新增我的页面 2026-02-02 11:20:15 +08:00
e115d694a9 no message 2026-01-30 18:21:20 +08:00
6e6e62c1c8 新增宣教文章预览 2026-01-30 18:21:14 +08:00
665b1be100 Merge commit 'cde557022f4df21df0eff3db0645626c7b869f76' into dev-wdb
# Conflicts:
#	.env.development
#	.env.localhost
2026-01-30 17:20:33 +08:00
a2d2427eb7 no message 2026-01-30 17:19:49 +08:00
84fed5eaf0 Merge branch 'dev-wdb' of http://175.27.226.205:3000/huxuejian/ykt-team-wxapp into dev-hjf 2026-01-30 15:16:35 +08:00