diff --git a/app/Caches/FeaturedArticleList.php b/app/Caches/FeaturedArticleList.php index 7f1d7640..bdf4d92d 100644 --- a/app/Caches/FeaturedArticleList.php +++ b/app/Caches/FeaturedArticleList.php @@ -39,20 +39,10 @@ class FeaturedArticleList extends Cache $result = []; foreach ($articles as $article) { - - $userCount = $article->user_count; - - if ($article->fake_user_count > $article->user_count) { - $userCount = $article->fake_user_count; - } - $result[] = [ 'id' => $article->id, 'title' => $article->title, 'cover' => $article->cover, - 'market_price' => (float)$article->market_price, - 'vip_price' => (float)$article->vip_price, - 'user_count' => $userCount, 'favorite_count' => $article->favorite_count, 'comment_count' => $article->comment_count, 'view_count' => $article->view_count, @@ -71,7 +61,7 @@ class FeaturedArticleList extends Cache { return ArticleModel::query() ->where('featured = 1') - ->andWhere('published = 1') + ->andWhere('published = :published:', ['published' => ArticleModel::PUBLISH_APPROVED]) ->andWhere('deleted = 0') ->orderBy('RAND()') ->limit($limit) diff --git a/app/Caches/FeaturedQuestionList.php b/app/Caches/FeaturedQuestionList.php index 07ee392c..4508b6ec 100644 --- a/app/Caches/FeaturedQuestionList.php +++ b/app/Caches/FeaturedQuestionList.php @@ -62,7 +62,7 @@ class FeaturedQuestionList extends Cache { return QuestionModel::query() ->where('featured = 1') - ->andWhere('published = 1') + ->andWhere('published = :published:', ['published' => QuestionModel::PUBLISH_APPROVED]) ->andWhere('deleted = 0') ->orderBy('RAND()') ->limit($limit) diff --git a/app/Http/Home/Controllers/CourseController.php b/app/Http/Home/Controllers/CourseController.php index 48a84342..b80acb00 100644 --- a/app/Http/Home/Controllers/CourseController.php +++ b/app/Http/Home/Controllers/CourseController.php @@ -167,10 +167,10 @@ class CourseController extends Controller { $service = new CourseResourceListService(); - $items = $service->handle($id); + $resources = $service->handle($id); $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); - $this->view->setVar('items', $items); + $this->view->setVar('resources', $resources); } /** diff --git a/app/Http/Home/Views/course/recommended.volt b/app/Http/Home/Views/course/recommended.volt deleted file mode 100644 index 7ecdda61..00000000 --- a/app/Http/Home/Views/course/recommended.volt +++ /dev/null @@ -1,12 +0,0 @@ -{{ partial('macros/course') }} - -{% if courses %} -
-
推荐课程
-
- {% for course in courses %} - {{ sidebar_course_card(course) }} - {% endfor %} -
-
-{% endif %} \ No newline at end of file diff --git a/app/Http/Home/Views/course/resources.volt b/app/Http/Home/Views/course/resources.volt index a500b8bb..efd2fd64 100644 --- a/app/Http/Home/Views/course/resources.volt +++ b/app/Http/Home/Views/course/resources.volt @@ -1,20 +1,22 @@ -{% if items|length > 0 %} - - - - - - - {% for item in items %} +{% if resources|length > 0 %} +
名称大小操作
- - - {% if item.me.owned == 1 and auth_user.id > 0 %} - - {% else %} - - {% endif %} + + + - {% endfor %} -
{{ item.name }}{{ item.size|human_size }}下载下载名称大小操作
+ {% for resource in resources %} + + {{ resource.name }} + {{ resource.size|human_size }} + {% if resource.me.owned == 1 %} + 下载 + {% else %} + 下载 + {% endif %} + + {% endfor %} + +{% else %} +
没有相关记录
{% endif %} \ No newline at end of file diff --git a/app/Http/Home/Views/macros/course.volt b/app/Http/Home/Views/macros/course.volt index 94dd056b..8d03c943 100644 --- a/app/Http/Home/Views/macros/course.volt +++ b/app/Http/Home/Views/macros/course.volt @@ -45,16 +45,16 @@
{% if course.market_price == 0 %} 全员免费 - {{ course.lesson_count }}节课 - {{ course.user_count }}人报名 + {{ course.lesson_count }} 节课 + {{ course.user_count }} 人报名 {% elseif course.vip_price == 0 %} 会员免费 - {{ course.lesson_count }}节课 - {{ course.user_count }}人购买 + {{ course.lesson_count }} 节课 + {{ course.user_count }} 人购买 {% elseif course.market_price > 0 %} {{ '￥%0.2f'|format(course.market_price) }} - {{ course.lesson_count }}节课 - {{ course.user_count }}人购买 + {{ course.lesson_count }} 节课 + {{ course.user_count }} 人购买 {% endif %}
@@ -72,38 +72,20 @@ {{ course.title }}
- {% if course.market_price > 0 %} + {% if course.market_price == 0 %} + 全员免费 + {{ course.lesson_count }} 节课 + {{ course.user_count }} 人报名 + {% elseif course.vip_price == 0 %} + 会员免费 + {{ course.lesson_count }} 节课 + {{ course.user_count }} 人购买 + {% elseif course.market_price > 0 %} {{ '￥%0.2f'|format(course.market_price) }} - {{ level_type(course.level) }} - {{ course.user_count }}人购买 - {% else %} - 免费 - {{ level_type(course.level) }} - {{ course.user_count }}人报名 + {{ course.lesson_count }} 节课 + {{ course.user_count }} 人购买 {% endif %}
-{%- endmacro %} - -{%- macro learning_course_card(item) %} - {% set course_title = item.course.title %} - {% set course_url = url({'for':'home.course.show','id':item.course.id}) %} -
- {{ model_type(item.course.model) }} -
- - {{ course_title }} - -
-
-
- {{ course_title }} -
-
- 已学习 {{ item.duration|duration }} - 已完成 {{ item.progress }}% -
-
-
{%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/search/sidebar.volt b/app/Http/Home/Views/search/sidebar.volt index 9d23d64f..fd8ae486 100644 --- a/app/Http/Home/Views/search/sidebar.volt +++ b/app/Http/Home/Views/search/sidebar.volt @@ -1,8 +1,8 @@ -{% if hot_queries %} +{% if related_queries %}
-
热门搜索
+
相关搜索
- {% for query in hot_queries %} + {% for query in related_queries %} {% set url = url({'for':'home.search.index'},{'type':type,'query':query}) %} {{ query }} {% endfor %} @@ -21,11 +21,11 @@ {% endif %} -{% if related_queries %} +{% if hot_queries %}
-
相关搜索
+
热门搜索
- {% for query in related_queries %} + {% for query in hot_queries %} {% set url = url({'for':'home.search.index'},{'type':type,'query':query}) %} {{ query }} {% endfor %} diff --git a/app/Http/Home/Views/user/courses.volt b/app/Http/Home/Views/user/courses.volt index 2bcbe426..fca7d0f6 100644 --- a/app/Http/Home/Views/user/courses.volt +++ b/app/Http/Home/Views/user/courses.volt @@ -5,7 +5,25 @@
{% for item in pager.items %}
- {{ learning_course_card(item) }} + {% set course_title = item.course.title %} + {% set course_url = url({'for':'home.course.show','id':item.course.id}) %} +
+ {{ model_type(item.course.model) }} +
+ + {{ course_title }} + +
+
+
+ {{ course_title }} +
+
+ 已学习 {{ item.duration|duration }} + 已完成 {{ item.progress }}% +
+
+
{% endfor %}
diff --git a/app/Http/Home/Views/user/show.volt b/app/Http/Home/Views/user/show.volt index 29b4684d..0167e678 100644 --- a/app/Http/Home/Views/user/show.volt +++ b/app/Http/Home/Views/user/show.volt @@ -15,9 +15,10 @@ {{ user.name }}
@@ -55,15 +56,15 @@
    -
  • 课程
    • +
  • 在学课程
    • {% if show_tab_articles %} -
  • 文章
    • +
  • 我的文章
    • {% endif %} {% if show_tab_questions %} -
  • 提问
    • +
  • 我的提问
    • {% endif %} {% if show_tab_answers %} -
  • 回答
    • +
  • 我的回答
    • {% endif %}
@@ -92,7 +93,9 @@ {% block include_js %} + {{ js_include('lib/clipboard.min.js') }} {{ js_include('home/js/user.show.js') }} {{ js_include('home/js/user.share.js') }} + {{ js_include('home/js/copy.js') }} {% endblock %} \ No newline at end of file