From 46176071b8c20e860586fc8370df388bbf374c86 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sun, 6 Nov 2022 12:55:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=83=AD=E9=97=A8?= =?UTF-8?q?=E4=BD=9C=E8=80=85=EF=BC=8C=E7=AD=94=E4=B8=BB=E5=92=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Home/Views/article/list.volt | 2 +- app/Http/Home/Views/question/list.volt | 4 ++-- app/Services/Logic/Article/TopAuthorList.php | 10 ++++++++-- app/Services/Logic/Question/HotQuestionList.php | 10 ++++++++-- app/Services/Logic/Question/TopAnswererList.php | 10 ++++++++-- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/Http/Home/Views/article/list.volt b/app/Http/Home/Views/article/list.volt index aced081e..11fe75e8 100644 --- a/app/Http/Home/Views/article/list.volt +++ b/app/Http/Home/Views/article/list.volt @@ -4,7 +4,7 @@ {% set sort_val = request.get('sort','trim','latest') %} {% set pager_url = url({'for':'home.article.pager'}, params) %} - {% set top_authors_url = url({'for':'home.widget.top_authors'}) %} + {% set top_authors_url = url({'for':'home.widget.top_authors'},{'limit':5}) %} {% set my_tags_url = url({'for':'home.widget.my_tags'},{'type':'article'}) %}
diff --git a/app/Http/Home/Views/question/list.volt b/app/Http/Home/Views/question/list.volt index a6d0d3ab..d5455c69 100644 --- a/app/Http/Home/Views/question/list.volt +++ b/app/Http/Home/Views/question/list.volt @@ -4,8 +4,8 @@ {% set sort_val = request.get('sort','trim','latest') %} {% set pager_url = url({'for':'home.question.pager'}, params) %} - {% set hot_questions_url = url({'for':'home.widget.hot_questions'}) %} - {% set top_answerers_url = url({'for':'home.widget.top_answerers'}) %} + {% set hot_questions_url = url({'for':'home.widget.hot_questions'},{'limit':10}) %} + {% set top_answerers_url = url({'for':'home.widget.top_answerers'},{'limit':5}) %} {% set my_tags_url = url({'for':'home.widget.my_tags'},{'type':'question'}) %}
diff --git a/app/Services/Logic/Article/TopAuthorList.php b/app/Services/Logic/Article/TopAuthorList.php index 1f4733da..100fa864 100644 --- a/app/Services/Logic/Article/TopAuthorList.php +++ b/app/Services/Logic/Article/TopAuthorList.php @@ -15,11 +15,17 @@ class TopAuthorList extends LogicService public function handle() { + $limit = $this->request->getQuery('limit', 'int', 10); + $cache = new TopAuthorListCache(); - $result = $cache->get(); + $list = $cache->get(); - return $result ?: []; + if($limit < count($list)) { + $list = array_slice($list, $limit); + } + + return $list; } } diff --git a/app/Services/Logic/Question/HotQuestionList.php b/app/Services/Logic/Question/HotQuestionList.php index b284d966..8dc4c67b 100644 --- a/app/Services/Logic/Question/HotQuestionList.php +++ b/app/Services/Logic/Question/HotQuestionList.php @@ -15,11 +15,17 @@ class HotQuestionList extends LogicService public function handle() { + $limit = $this->request->getQuery('limit', 'int', 10); + $cache = new HotQuestionListCache(); - $result = $cache->get(); + $list = $cache->get(); - return $result ?: []; + if($limit < count($list)) { + $list = array_slice($list, $limit); + } + + return $list; } } diff --git a/app/Services/Logic/Question/TopAnswererList.php b/app/Services/Logic/Question/TopAnswererList.php index 46949f00..e00fe03a 100644 --- a/app/Services/Logic/Question/TopAnswererList.php +++ b/app/Services/Logic/Question/TopAnswererList.php @@ -15,11 +15,17 @@ class TopAnswererList extends LogicService public function handle() { + $limit = $this->request->getQuery('limit', 'int', 10); + $cache = new TopAnswererListCache(); - $result = $cache->get(); + $list = $cache->get(); - return $result ?: []; + if($limit < count($list)) { + $list = array_slice($list, $limit); + } + + return $list; } } From 05837d6c5ff2e88c8b7915c9f52543061ec4c4c4 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sun, 6 Nov 2022 23:19:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=8D=95=E7=AB=A0?= =?UTF-8?q?=E8=8A=82=E5=B1=82=E7=BA=A7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Home/Views/chapter/catalog.volt | 48 ++++++++++------- app/Http/Home/Views/course/show_catalog.volt | 54 +++++++++++-------- .../Logic/Notice/External/AccountLogin.php | 4 +- 3 files changed, 62 insertions(+), 44 deletions(-) diff --git a/app/Http/Home/Views/chapter/catalog.volt b/app/Http/Home/Views/chapter/catalog.volt index 9625d784..2adfac37 100644 --- a/app/Http/Home/Views/chapter/catalog.volt +++ b/app/Http/Home/Views/chapter/catalog.volt @@ -1,23 +1,35 @@ +{%- macro show_lesson_list(chapter) %} +
    + {% for lesson in chapter.children %} + {% set url = url({'for':'home.chapter.show','id':lesson.id}) %} + {% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %} +
  • + {% if lesson.me.owned == 1 %} + {{ lesson.title }} + {% else %} + {{ lesson.title }} + {% endif %} +
    • + {% endfor %} +
+{%- endmacro %} +
课程目录
-
- {% for item in catalog %} -
{{ item.title }}
-
    - {% for lesson in item.children %} - {% set url = url({'for':'home.chapter.show','id':lesson.id}) %} - {% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %} -
  • - {% if lesson.me.owned == 1 %} - {{ lesson.title }} - {% else %} - {{ lesson.title }} - {% endif %} -
    • - {% endfor %} -
- {% endfor %} -
+ {% if catalog|length > 1 %} +
+ {% for item in catalog %} +
{{ item.title }}
+
+ {{ show_lesson_list(item) }} +
+ {% endfor %} +
+ {% else %} +
+ {{ show_lesson_list(catalog[0]) }} +
+ {% endif %}
\ No newline at end of file diff --git a/app/Http/Home/Views/course/show_catalog.volt b/app/Http/Home/Views/course/show_catalog.volt index 81bce59a..815ee561 100644 --- a/app/Http/Home/Views/course/show_catalog.volt +++ b/app/Http/Home/Views/course/show_catalog.volt @@ -1,3 +1,19 @@ +{%- macro show_lesson_list(chapter) %} +
    + {% for lesson in chapter.children %} + {% if lesson.model == 1 %} +
  • {{ vod_lesson_info(lesson) }}
    • + {% elseif lesson.model == 2 %} +
  • {{ live_lesson_info(lesson) }}
    • + {% elseif lesson.model == 3 %} +
  • {{ read_lesson_info(lesson) }}
    • + {% elseif lesson.model == 4 %} +
  • {{ offline_lesson_info(lesson) }}
    • + {% endif %} + {% endfor %} +
+{%- endmacro %} + {%- macro vod_lesson_info(lesson) %} {% set url = lesson.me.owned ? url({'for':'home.chapter.show','id':lesson.id}) : '' %} {% set priv = lesson.me.owned ? 'allow' : 'deny' %} @@ -87,28 +103,20 @@ {% set show_all = course.lesson_count < 30 %} -{% if chapters %} -
- {% for chapter in chapters %} - {% set show_class = (show_all or loop.first) ? 'layui-show' : '' %} -
-

{{ chapter.title }}

-
-
    - {% for lesson in chapter.children %} - {% if lesson.model == 1 %} -
  • {{ vod_lesson_info(lesson) }}
    • - {% elseif lesson.model == 2 %} -
  • {{ live_lesson_info(lesson) }}
    • - {% elseif lesson.model == 3 %} -
  • {{ read_lesson_info(lesson) }}
    • - {% elseif lesson.model == 4 %} -
  • {{ offline_lesson_info(lesson) }}
    • - {% endif %} - {% endfor %} -
+{% if chapters|length > 0 %} + {% if chapters|length > 1 %} +
+ {% for chapter in chapters %} + {% set show_class = (show_all or loop.first) ? 'layui-show' : '' %} +
+

{{ chapter.title }}

+
+ {{ show_lesson_list(chapter) }} +
-
- {% endfor %} -
+ {% endfor %} +
+ {% else %} + {{ show_lesson_list(chapters[0]) }} + {% endif %} {% endif %} \ No newline at end of file diff --git a/app/Services/Logic/Notice/External/AccountLogin.php b/app/Services/Logic/Notice/External/AccountLogin.php index a98aa06d..3b146df7 100644 --- a/app/Services/Logic/Notice/External/AccountLogin.php +++ b/app/Services/Logic/Notice/External/AccountLogin.php @@ -34,10 +34,8 @@ class AccountLogin extends LogicService $subscribe = $subscribeRepo->findByUserId($userId); if ($subscribe) { - $notice = new WeChatAccountLoginNotice(); - - return $notice->handle($subscribe, $params); + $notice->handle($subscribe, $params); } }