Commit Graph

111 Commits

Author SHA1 Message Date
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
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
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
a5ccc2b4fe chore: 视频详情 该名称为 详情 2025-08-27 15:11:59 +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
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
db7b2749a9 fix: 修复苹果返回导航异常 2025-08-26 16:02:07 +08:00
joshen
d06c018c93 Merge remote-tracking branch 'yx/20250821-hz' into 104-master-0626 2025-08-25 19:53:09 +08:00
c5c43d7123 feat: 修复边距 2025-08-25 19:46:38 +08:00
joshen
020d72db2e Merge remote-tracking branch 'yx/20250821-hz' into 104-master-0626 2025-08-25 19:43:20 +08:00
850da0503d fix: 修复系统携带的 icon 问题
现在临时用 < 进行代替
2025-08-25 19:37:46 +08:00
joshen
b73ec7f1f7 Merge remote-tracking branch '104/master-0626' into 104-master-0626
# Conflicts:
#	unpackage/dist/build/h5/index.html
#	unpackage/dist/build/h5/static/js/index.d5f4f3da.js
#	unpackage/dist/build/h5/static/js/pages-exam-answer.129c642f.js
#	unpackage/dist/build/h5/static/js/pages-exam-exam.7101a1c5.js
#	unpackage/dist/build/h5/static/js/pages-lecturer-certification-info.4d0409d9.js
#	unpackage/dist/build/h5/static/js/pages-my-myFavorites.73e87f04.js
#	unpackage/dist/build/h5/static/js/pages-my-myShares.5a4b3182.js
#	unpackage/dist/build/h5/static/js/pages-my-setting.f3fd1a2c.js
#	unpackage/dist/build/h5/static/js/pages-my-toMeComments.fc4c37d2.js
#	unpackage/dist/build/h5/static/js/pages-plus-addArticle.f238a6a3.js
#	unpackage/dist/build/h5/static/js/pages-plus-addQuestion.11f24f27.js
#	unpackage/dist/build/h5/static/js/pages-plus-editArticle.0a2d966e.js
#	unpackage/dist/build/h5/static/js/pages-study-exam.200a0f1f.js
#	unpackage/dist/build/h5/static/js/pages-study-index.cfbcee0a.js
#	unpackage/dist/build/h5/static/js/pages-study-studydetail.34590491.js
2025-08-25 19:00:50 +08:00
5adbe3f18d feat: 添加navbar导航栏
修复屏幕宽度过宽导致的苹果手机无法返回的问题
2025-08-25 14:36:41 +08:00
670788339
c6a08cf190 0720打包-仅内网 2025-07-21 21:53:21 +08:00
670788339
22a2438684 0720打包-仅内网 2025-07-21 21:35:20 +08:00
joshen
56bd656da5 Merge remote-tracking branch '121/master-0720-test' into master-0720-test 2025-07-21 18:38:10 +08:00
joshen
976daeb5e3 修改测试配置 2025-07-21 18:36:52 +08:00
670788339
f902a9d909 0720打包-仅内网 2025-07-21 18:16:22 +08:00
joshen
4b7a07d610 修改测试配置 2025-07-21 17:58:09 +08:00
王卓煜
25a4abb0f1 内网环境判断 2025-07-21 17:19:02 +08:00
王卓煜
c5db9ed88d 内网环境判断 2025-07-21 16:06:33 +08:00
王卓煜
7839f3cfe3 内网环境判断 2025-07-21 15:51:30 +08:00
sunhonglai
580cedfadb 修改时长 2025-04-21 10:59:40 +08:00
sunhonglai
466ab12696 修改取值时间进度 2025-04-21 08:23:32 +08:00
sunhonglai
2e066cc011 学习时长上报接口合并 2025-04-18 09:52:28 +08:00
sunhonglai
a3f227bd40 学习时长上报接口合并 2025-04-18 08:52:35 +08:00
zhangsir
cde559963c 空字符串增加判断 2024-09-24 16:17:16 +08:00
zhangsir
a03ec48c8d 打包 2024-08-15 19:40:07 +08:00
zhangsir
5e0c284a44 打包 2024-08-15 19:34:49 +08:00
zhangsir
5c69abe6db 修改调用方式 2024-08-15 18:40:41 +08:00
zhangsir
c3fcf4524d 临时方案避免重复调用 2024-08-15 17:31:31 +08:00
nisen
a604fa07f5 Merge branch 'zcwy_0723_hotforum' into master-0726
# Conflicts:
#	pages/study/courseStudy.vue
2024-08-01 14:52:08 +08:00
nisen
f8d88d2b7b Merge branch 'pingcode-20240615' into master-0726
# Conflicts:
#	pages/study/courseStudy.vue
2024-08-01 14:50:11 +08:00
joshen
9bc179c583 video progress edit 2024-08-01 14:39:21 +08:00
zhangsir
317453ac0d 发现一个小bug,顺手修复 2024-08-01 11:42:23 +08:00
zhangsir
2ccb81e707 修改视频删除多余打印 2024-08-01 11:14:14 +08:00
zhangsir
be3c023d6c 修改视频记录时间问题 2024-08-01 10:59:09 +08:00
joshen
e14ca569f6 mobile video page edit 2024-07-29 21:30:55 +08:00
zhangsir
345bda9e15 热点论坛修改文本掉落问题 2024-07-29 14:47:03 +08:00
zhangsir
0e750645bc 热点论坛修改 2024-07-29 14:01:49 +08:00
zhangsir
03109a862d 修改热点论坛 2024-07-26 18:29:51 +08:00
zhangsir
ab2ee0d9a9 修改热点论坛方案 2024-07-26 17:55:38 +08:00
joshen
fe310b2a71 播放器禁止拖动设置修改 2024-06-24 08:40:05 +08:00
joshen
a7c041b010 视频器拖动调整 2024-06-20 14:25:28 +08:00
zhangsir
0c315b48d3 视频进度 2024-06-05 09:54:46 +08:00