Commit Graph

799 Commits

Author SHA1 Message Date
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
王卓煜
7839f3cfe3 内网环境判断 2025-07-21 15:51:30 +08:00
joshen
946f4a2e6b Merge remote-tracking branch 'yx/master-0715-lyc' into 104-master-0626
# Conflicts:
#	unpackage/dist/build/h5/index.html
#	unpackage/dist/build/h5/static/js/pages-login-loading.02553b67.js
2025-07-16 16:25:24 +08:00
670788339
6066633f42 移动端考试未随机修改 2025-07-16 14:22:19 +08:00
670788339
2abda0e9a9 移动端考试未随机 2025-07-15 15:23:52 +08:00
670788339
e2ea0ed1ae 移动端考试未随机 2025-07-15 15:06:14 +08:00
670788339
15dbd3f82f 6.26打包 2025-06-26 16:40:38 +08:00
670788339
911588585f 6.26打包 2025-06-26 16:17:49 +08:00
670788339
421eef213b 6.26打包 2025-06-26 16:07:11 +08:00
sunhonglai
28e1894179 打包 2025-04-21 16:09:33 +08:00
sunhonglai
cbbba4e311 打包 2025-04-21 15:53:06 +08:00
sunhonglai
a7d7af756d 打包 2025-04-21 11:13:38 +08:00
sunhonglai
580cedfadb 修改时长 2025-04-21 10:59:40 +08:00
sunhonglai
8503aba75c 打包 2025-04-21 08:35:04 +08:00
sunhonglai
466ab12696 修改取值时间进度 2025-04-21 08:23:32 +08:00
sunhonglai
79b7c6568c 打包 2025-04-18 16:57:04 +08:00
sunhonglai
d995ea36aa 打包 2025-04-18 16:56:49 +08:00
sunhonglai
a8a154d59d 打包 2025-04-18 16:19:42 +08:00
joshen
ac3d24eb42 打包 2025-04-18 15:44:05 +08:00
joshen
0252b3ed4f Merge remote-tracking branch 'yx/250417-bugfix-shl' into 250417-bugfix-shl
# Conflicts:
#	unpackage/dist/build/h5/index.html
#	unpackage/dist/build/h5/static/js/index.74de40e3.js
2025-04-18 15:40:29 +08:00
sunhonglai
d76b7e1dd4 打包 2025-04-18 15:35:38 +08:00
joshen
35f37fe70f Merge branch '250417-bugfix-shl' into test0214 2025-04-18 15:16:29 +08:00
sunhonglai
95ad39443f 打包 2025-04-18 15:14:54 +08:00
joshen
402a28ab66 Merge branch '250417-bugfix-shl' into test0214 2025-04-18 14:47:53 +08:00
sunhonglai
e0bb42692c 打包 2025-04-18 14:40:24 +08:00
joshen
ab7e427ba2 Merge branch '250417-bugfix-shl' into test0214 2025-04-18 09:54:20 +08:00
sunhonglai
2e066cc011 学习时长上报接口合并 2025-04-18 09:52:28 +08:00
sunhonglai
2b77602f03 学习时长上报接口合并 2025-04-18 09:44:28 +08:00