Commit Graph
874 Commits
Author SHA1 Message Date
tianshujie a1fe18b99d * code for bug #81093 2022-12-29 15:17:18 +08:00
tianshujie 2ed3974bc6 * code for bug #81093 2022-12-29 15:14:34 +08:00
caoyanyi 15ea4e0e22 * Optimize page style. 2022-12-22 16:24:43 +08:00
wangzemei f2cb91a66b * fix css 2022-12-22 15:15:36 +08:00
wangzemei 4af98c110d * fix bug 2022-12-22 14:37:21 +08:00
wangzemei 81edf30213 * fix bug 31123 2022-12-22 14:23:39 +08:00
caoyanyi b5092a22dd * Fix bug #31133. 2022-12-22 12:25:56 +08:00
曹延义 7074488133 * Fix bug #31126. 2022-12-22 04:13:32 +00:00
caoyanyi 2934b892af * Modify system mode check. 2022-12-21 21:45:08 +08:00
tianshujie a3bccd0eff * code for task 79627 2022-12-21 19:44:02 +08:00
wangzemei d98f999afa * Modify picture display 2022-12-21 16:16:57 +08:00
田淑杰 68bc0ba488 * Finish task #79635. 2022-12-21 16:12:30 +08:00
孙广明 dac9acb115 Merge branch 'sprint/272' into 'sprint/272_tsj_theme'
# Conflicts:
#   module/block/view/visionswitch.html.php
2022-12-21 07:59:41 +00:00
田淑杰 a2fa75e05b * Finish task #79626. 2022-12-21 15:54:42 +08:00
wangzemei d837b16812 * Optimized page display 2022-12-21 15:20:30 +08:00
wangzemei 68434d5018 * Optimized page display 2022-12-21 15:19:28 +08:00
田淑杰 a3e5882fb3 * Finish task #79626. 2022-12-21 14:39:56 +08:00
田淑杰 bd5d882e35 * Finish task #79626. 2022-12-21 14:11:10 +08:00
wangzemei 0560303306 * fix 31070 2022-12-21 14:08:50 +08:00
caoyanyi 3a6ed5c082 * Optimize page style. 2022-12-21 11:52:31 +08:00
caoyanyi 449d18b712 Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-21 11:44:46 +08:00
caoyanyi a95a9e8d00 * Modify page style and language. 2022-12-21 11:44:28 +08:00
孙广明 5d99b865ad Merge branch 'sprint/272_tsj' into 'sprint/272'
* Finish task #79625.

See merge request easycorp/zentaopms!6607
2022-12-21 03:28:11 +00:00
田淑杰 dbd5714465 * Finish task #79625. 2022-12-21 11:26:52 +08:00
caoyanyi 42f6c6f5f5 * Modify page style. 2022-12-21 11:26:34 +08:00
caoyanyi 2efe9e2960 * Modify page style. 2022-12-21 11:00:22 +08:00
caoyanyi 3d47677d3a * Modify page style. 2022-12-21 10:52:09 +08:00
田淑杰 7aff4d599e * Fixed positioning issues of guide block. 2022-12-21 10:17:32 +08:00
caoyanyi 00a774e19e * Modify page reload. 2022-12-21 09:11:06 +08:00
caoyanyi 1192ea3680 * Modify page position. 2022-12-20 21:01:56 +08:00
田淑杰 00a8e6317a * Refactor. 2022-12-20 14:53:46 +08:00
田淑杰 cbd8fa5706 * Refactor. 2022-12-20 14:06:30 +08:00
田淑杰 eaa184f3bc * Finish task #79626. 2022-12-20 13:51:33 +08:00
田淑杰 ef53759baf Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_tsj 2022-12-20 13:41:56 +08:00
田淑杰 86a21acfb0 * Finish task #79627. 2022-12-20 11:29:13 +08:00
wangzemei ba69b3285d * fix href 2022-12-20 11:08:57 +08:00
caoyanyi 7e3b50d9f0 * Add priv check. 2022-12-20 11:02:40 +08:00
王怡栋 72cc0cc0aa Merge branch 'sprint/272_wzm_79625' into 'sprint/272'
* finish task 79625

See merge request easycorp/zentaopms!6600
2022-12-20 02:52:50 +00:00
wangzemei 3495f621bf * Delete space 2022-12-20 10:49:06 +08:00
wangzemei 7719edcc82 Merge br* code format 2022-12-20 10:42:26 +08:00
wangzemei d8f1380aa4 Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_wzm_79625 2022-12-20 10:22:03 +08:00
caoyanyi 17a61a108f * Modify font size. 2022-12-20 10:21:23 +08:00
wangzemei 1868b3155d * finish task 79625 2022-12-20 09:59:43 +08:00
caoyanyi 3a396e0a9c * Code for task #79631. 2022-12-20 09:38:31 +08:00
wangzemei 6b8c4daf06 * add modal 2022-12-20 09:33:25 +08:00
caoyanyi 7859132611 * Modify font color. 2022-12-20 09:26:42 +08:00
caoyanyi 29a884e9d7 * Modify font size. 2022-12-20 09:17:46 +08:00
caoyanyi ae05ef1601 * Modify page error. 2022-12-20 09:01:28 +08:00
wangzemei 93ece5bb70 * ztask 79625 2022-12-20 08:04:27 +08:00
caoyanyi 1014829f3b * Code for task #79631. 2022-12-19 17:01:54 +08:00