diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 429d405d7..fa3701e37 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -1064,7 +1064,7 @@ class SystemController extends AbstractController * @apiGroup system * @apiName get__updatelog * - * @apiParam {Number} [take] 获取数量,10-100 + * @apiParam {Number} [take] 获取数量:10-100(留空默认:50) * * @apiSuccess {Number} ret 返回状态码(1正确、0错误) * @apiSuccess {String} msg 返回信息(错误描述) @@ -1072,7 +1072,7 @@ class SystemController extends AbstractController */ public function get__updatelog() { - $take = min(100, max(10, intval(Request::input('take')))); + $take = min(100, max(10, intval(Request::input('take', 50)))); $logPath = base_path('CHANGELOG.md'); $logVersion = ""; $logContent = ""; @@ -1090,7 +1090,7 @@ class SystemController extends AbstractController if ($logResults) { $logVersion = $logResults[0]['title']; $logContent = implode("\n", array_map(function($item) { - return "## " . $item['title'] . $item['content']; + return "## [{$item['title']}]" . $item['content']; }, $logResults)); } return Base::retSuccess('success', [ diff --git a/public/css/fonts/taskfont/iconfont.ttf b/public/css/fonts/taskfont/iconfont.ttf index 7fc8eb3d6..6a6909330 100644 Binary files a/public/css/fonts/taskfont/iconfont.ttf and b/public/css/fonts/taskfont/iconfont.ttf differ diff --git a/public/css/fonts/taskfont/iconfont.woff b/public/css/fonts/taskfont/iconfont.woff index c92d380bd..f96b993f8 100644 Binary files a/public/css/fonts/taskfont/iconfont.woff and b/public/css/fonts/taskfont/iconfont.woff differ diff --git a/public/css/fonts/taskfont/iconfont.woff2 b/public/css/fonts/taskfont/iconfont.woff2 index b336405a0..0909027ad 100644 Binary files a/public/css/fonts/taskfont/iconfont.woff2 and b/public/css/fonts/taskfont/iconfont.woff2 differ diff --git a/resources/assets/js/pages/manage/setting/version.vue b/resources/assets/js/pages/manage/setting/version.vue index 068eca40e..6b2704aa7 100644 --- a/resources/assets/js/pages/manage/setting/version.vue +++ b/resources/assets/js/pages/manage/setting/version.vue @@ -40,7 +40,7 @@ export default { this.$store.dispatch("call", { url: 'system/get/updatelog', data: { - take: 20 + take: 50 } }).then(({data}) => { this.updateLog = data.updateLog; diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 0edea08fe..c234be9c1 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -1405,7 +1405,7 @@ > span { flex: 1; height: 1px; - background-color: rgba(255, 255, 255, 0.2); + background-color: rgba(120, 120, 120, 0.2); transform: scaleY(0.5); min-width: 18px; } @@ -1767,6 +1767,12 @@ } } + .content-divider { + > span { + background-color: rgba(255, 255, 255, 0.2); + } + } + .mention { color: $primary-title-color; diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf b/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf index 7fc8eb3d6..be71c18f7 100644 Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf differ diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff index c92d380bd..f8f3d51b7 100644 Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff differ diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 index b336405a0..fdbd51bf4 100644 Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 differ diff --git a/resources/mobile b/resources/mobile index f88e40036..65aaf080f 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit f88e40036e465a609b91c6221d77d556e08f48df +Subproject commit 65aaf080fc2b6294b2ba043500ed0beed4a1c5eb