Commit Graph

826 Commits

Author SHA1 Message Date
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
db7b2749a9 fix: 修复苹果返回导航异常 2025-08-26 16:02:07 +08:00
b29cb7c0d7 fix: 移除测试用的 page header 2025-08-26 15:04:55 +08:00
joshen
d06c018c93 Merge remote-tracking branch 'yx/20250821-hz' into 104-master-0626 2025-08-25 19:53:09 +08:00
3016f93f63 build 2025-08-25 19:52:18 +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
2a92b39fec build 2025-08-25 19:42:25 +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
92ec640774 build 2025-08-25 18:54:15 +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
00ecb1521a 0720打包-仅内网 2025-07-21 21:41:01 +08:00
670788339
22a2438684 0720打包-仅内网 2025-07-21 21:35:20 +08:00
670788339
334856641d 0720打包-仅内网 2025-07-21 18:46:34 +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
670788339
c69579e878 0720打包-仅内网 2025-07-21 18:15:58 +08:00
670788339
8e1a69c037 0720打包-仅内网 2025-07-21 18:03:37 +08:00
670788339
8a042f4050 0720打包-仅内网 2025-07-21 18:02:56 +08:00
joshen
4b7a07d610 修改测试配置 2025-07-21 17:58:09 +08:00
670788339
a746ffcb15 0720打包-仅内网 2025-07-21 17:36:28 +08:00
王卓煜
41af9d1d31 Merge remote-tracking branch 'origin/master-0720' into master-0720 2025-07-21 17:22:05 +08:00
王卓煜
25a4abb0f1 内网环境判断 2025-07-21 17:19:02 +08:00
670788339
300cd93315 0720打包-仅内网 2025-07-21 16:52:24 +08:00
670788339
6c19f905b5 0720打包-仅内网 2025-07-21 16:27:58 +08:00
王卓煜
c5db9ed88d 内网环境判断 2025-07-21 16:06:33 +08:00