joshen
|
1b200ed5e9
|
Merge branch '20250821-hz' of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile into master-0626-prod
|
2025-08-28 17:30:29 +08:00 |
|
|
|
a56ef61e94
|
build
|
2025-08-28 17:28:32 +08:00 |
|
joshen
|
0e7e168250
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-28 17:21:06 +08:00 |
|
|
|
da1ecce313
|
build
|
2025-08-28 17:18:33 +08:00 |
|
joshen
|
a23c213d12
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# unpackage/dist/build/h5/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/h5/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/h5/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/h5/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/h5/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/h5/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/h5/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/h5/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/h5/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/h5/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/h5/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/h5/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/h5/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/h5/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/h5/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/h5/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/h5/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/h5/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/h5/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/h5/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/h5/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/h5/static/js/pages-study-videoTest.c72774df.js
|
2025-08-28 16:37:20 +08:00 |
|
|
|
b99f2e66ea
|
rename
|
2025-08-28 16:33:49 +08:00 |
|
joshen
|
d757c5c98e
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# unpackage/dist/build/web/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/web/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/web/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/web/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/web/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/web/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/web/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/web/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/web/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/web/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/web/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/web/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/web/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/web/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/web/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/web/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/web/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/web/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/web/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/web/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/web/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/web/static/js/pages-study-videoTest.c72774df.js
|
2025-08-28 16:28:37 +08:00 |
|
|
|
4782cadcdf
|
build
|
2025-08-28 16:26:01 +08:00 |
|
joshen
|
146ab80e7f
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# unpackage/dist/build/h5/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/h5/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/h5/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/h5/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/h5/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/h5/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/h5/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/h5/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/h5/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/h5/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/h5/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/h5/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/h5/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/h5/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/h5/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/h5/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/h5/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/h5/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/h5/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/h5/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/h5/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/h5/static/js/pages-study-videoTest.c72774df.js
|
2025-08-28 14:59:21 +08:00 |
|
joshen
|
8f0ebe00ed
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-28 14:58:10 +08:00 |
|
|
|
a9fe0e3bbe
|
rename
|
2025-08-28 14:54:43 +08:00 |
|
|
|
777d9d2bdf
|
build
|
2025-08-28 14:36:04 +08:00 |
|
joshen
|
6fbed271c4
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# unpackage/dist/build/h5/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/h5/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/h5/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/h5/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/h5/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/h5/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/h5/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/h5/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/h5/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/h5/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/h5/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/h5/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/h5/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/h5/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/h5/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/h5/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/h5/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/h5/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/h5/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/h5/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/h5/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/h5/static/js/pages-study-videoTest.c72774df.js
|
2025-08-27 21:48:20 +08:00 |
|
|
|
e1ffeaab8a
|
rename
|
2025-08-27 21:44:51 +08:00 |
|
joshen
|
23f5ec570d
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# pages/study/courseStudy.vue
# unpackage/dist/build/web/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/web/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/web/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/web/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/web/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/web/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/web/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/web/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/web/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/web/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/web/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/web/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/web/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/web/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/web/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/web/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/web/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/web/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/web/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/web/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/web/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/web/static/js/pages-study-videoTest.c72774df.js
|
2025-08-27 21:43:19 +08:00 |
|
|
|
f4176fd19f
|
build
|
2025-08-27 21:41:08 +08:00 |
|
|
|
883abaa2ef
|
feat: 隐藏 366 367 368 项目管理的内容推荐，组织访问外部链接
|
2025-08-27 21:38:36 +08:00 |
|
|
|
f19bde259d
|
feat: 添加进入考试的方式更改
|
2025-08-27 21:25:28 +08:00 |
|
joshen
|
ad43eb3728
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# pages/study/courseStudy.vue
|
2025-08-27 20:19:02 +08:00 |
|
|
|
20b1977fcc
|
build
|
2025-08-27 20:15:05 +08:00 |
|
|
|
49cb661c7f
|
fix: 修复跳转异常的问题
|
2025-08-27 20:13:06 +08:00 |
|
joshen
|
1c5c491312
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# unpackage/dist/build/h5/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/h5/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/h5/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/h5/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/h5/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/h5/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/h5/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/h5/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/h5/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/h5/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/h5/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/h5/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/h5/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/h5/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/h5/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/h5/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/h5/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/h5/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/h5/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/h5/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/h5/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/h5/static/js/pages-study-videoTest.c72774df.js
|
2025-08-27 19:12:37 +08:00 |
|
|
|
3089a8394e
|
build
|
2025-08-27 19:05:01 +08:00 |
|
joshen
|
e72f90e041
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# unpackage/dist/build/web/static/js/chunk-vendors.7d4aca93.js
# unpackage/dist/build/web/static/js/pages-exam-qrcode.1a759ef3.js
# unpackage/dist/build/web/static/js/pages-forward.c5cbf150.js
# unpackage/dist/build/web/static/js/pages-index-index.608400b3.js
# unpackage/dist/build/web/static/js/pages-login-loading.02553b67.js
# unpackage/dist/build/web/static/js/pages-login-login.7490a771.js
# unpackage/dist/build/web/static/js/pages-login-next.6f865c5b.js
# unpackage/dist/build/web/static/js/pages-my-follow.8d387f6b.js
# unpackage/dist/build/web/static/js/pages-my-myArticles.1d3f8869.js
# unpackage/dist/build/web/static/js/pages-my-myQa.6036d3e6.js
# unpackage/dist/build/web/static/js/pages-my-toMeShares.da6f1e81.js
# unpackage/dist/build/web/static/js/pages-news-index.abae1739.js
# unpackage/dist/build/web/static/js/pages-resource-articeDetail.98c68738.js
# unpackage/dist/build/web/static/js/pages-resource-courseDetail.b3cb74ac.js
# unpackage/dist/build/web/static/js/pages-resource-index.059f24e6.js
# unpackage/dist/build/web/static/js/pages-resource-microDetail.552dc575.js
# unpackage/dist/build/web/static/js/pages-resource-qaDetail.c178d3de.js
# unpackage/dist/build/web/static/js/pages-resource-search.4ff0fbf2.js
# unpackage/dist/build/web/static/js/pages-study-audioTest.00ad8db3.js
# unpackage/dist/build/web/static/js/pages-study-courseStudy.363105db.js
# unpackage/dist/build/web/static/js/pages-study-onlineCourse.491168af.js
# unpackage/dist/build/web/static/js/pages-study-videoTest.c72774df.js
|
2025-08-27 18:32:50 +08:00 |
|
|
|
daea49df9d
|
build
|
2025-08-27 18:27:58 +08:00 |
|
joshen
|
192d35761e
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-27 18:16:27 +08:00 |
|
|
|
3927390919
|
build
|
2025-08-27 18:14:59 +08:00 |
|
|
|
a9e8adb8ba
|
fix: 订正修改链接的方式
|
2025-08-27 18:13:04 +08:00 |
|
joshen
|
686b21e347
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-27 18:06:15 +08:00 |
|
|
|
86fdca601e
|
build
|
2025-08-27 18:00:37 +08:00 |
|
|
|
c3ef4e0a24
|
fix: 修复在返回一个新的页面的时候，跳转连接异常的问题
|
2025-08-27 17:58:00 +08:00 |
|
joshen
|
62cf6899a6
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-27 15:17:38 +08:00 |
|
|
|
cc1e7f688f
|
build
|
2025-08-27 15:15:02 +08:00 |
|
|
|
a5ccc2b4fe
|
chore: 视频详情 该名称为 详情
|
2025-08-27 15:11:59 +08:00 |
|
joshen
|
40dd65406c
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-27 14:25:49 +08:00 |
|
|
|
f91774772a
|
build
|
2025-08-27 14:25:13 +08:00 |
|
|
|
b73e663471
|
fix: 修复层级错误无法点击的问题
|
2025-08-27 14:23:11 +08:00 |
|
joshen
|
b5c27be209
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
# Conflicts:
# pages/study/courseStudy.vue
|
2025-08-27 14:15:44 +08:00 |
|
|
|
3245072ab0
|
build
|
2025-08-27 14:00:20 +08:00 |
|
|
|
7d866e3dbe
|
build
|
2025-08-27 13:49:11 +08:00 |
|
|
|
9d5ffa908a
|
Merge remote-tracking branch 'origin/20250821-hz' into 20250821-hz
|
2025-08-27 13:41:54 +08:00 |
|
|
|
83c1cf81ee
|
feat: 课程考试添加返回按键
|
2025-08-27 13:41:23 +08:00 |
|
|
|
5c11b5951c
|
build
|
2025-08-27 13:41:23 +08:00 |
|
|
|
ecd1400699
|
build
|
2025-08-27 12:00:08 +08:00 |
|
|
|
ea906f9515
|
fix: titlebar 文字无法居中的问题
|
2025-08-27 11:56:13 +08:00 |
|
|
|
767e9a9bcc
|
fix: 修复视频播放状态栏异常的问题
|
2025-08-27 11:56:13 +08:00 |
|
|
|
1e21aaeda0
|
fix: titlebar 文字无法居中的问题
|
2025-08-27 11:43:38 +08:00 |
|
|
|
9b813b399f
|
fix: 修复视频播放状态栏异常的问题
|
2025-08-27 11:21:15 +08:00 |
|
joshen
|
530b10682f
|
Merge remote-tracking branch 'yx/20250821-hz' into master-0626-prod
|
2025-08-26 18:08:28 +08:00 |
|
|
|
f4e6ac7f2e
|
build
|
2025-08-26 16:21:02 +08:00 |
|
