gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-28 05:11:39 +08:00
Code Issues Releases Wiki Activity

优化变量名和排版

Browse Source
This commit is contained in:
xiaochong0302 2023-12-13 12:53:35 +08:00
parent 7a8d8ba342
commit 95c31000c6
9 changed files with 75 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Caches/FeaturedArticleList.php
View File

@ -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)

2
app/Caches/FeaturedQuestionList.php
View File

@ -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)

4
app/Http/Home/Controllers/CourseController.php
View File

@ -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);
}
/**

12
app/Http/Home/Views/course/recommended.volt
View File

@ -1,12 +0,0 @@
{{ partial('macros/course') }}
{% if courses %}
<div class="layui-card">
<div class="layui-card-header">推荐课程</div>
<div class="layui-card-body">
{% for course in courses %}
{{ sidebar_course_card(course) }}
{% endfor %}
</div>
</div>
{% endif %}

36
app/Http/Home/Views/course/resources.volt
View File

@ -1,20 +1,22 @@
{% if items|length > 0 %}
<table class="layui-table" lay-skin="line">
<tr>
<th>名称</th>
<th>大小</th>
<th width="15%">操作</th>
</tr>
{% for item in items %}
{% if resources|length > 0 %}
<table class="layui-table" lay-skin="line">
<tr>
<td>{{ item.name }}</td>
<td>{{ item.size|human_size }}</td>
{% if item.me.owned == 1 and auth_user.id > 0 %}
<td><a class="layui-btn layui-btn-sm" href="{{ item.url }}" target="_blank">下载</a></td>
{% else %}
<td><a class="layui-btn layui-btn-sm layui-btn-disabled">下载</a></td>
{% endif %}
<th>名称</th>
<th>大小</th>
<th width="15%">操作</th>
</tr>
{% endfor %}
</table>
{% for resource in resources %}
<tr>
<td>{{ resource.name }}</td>
<td>{{ resource.size|human_size }}</td>
{% if resource.me.owned == 1 %}
<td><a class="layui-btn layui-btn-sm" href="{{ resource.url }}" target="_blank">下载</a></td>
{% else %}
<td><a class="layui-btn layui-btn-sm layui-btn-disabled">下载</a></td>
{% endif %}
</tr>
{% endfor %}
</table>
{% else %}
<div class="no-records">没有相关记录</div>
{% endif %}

52
app/Http/Home/Views/macros/course.volt
View File

@ -45,16 +45,16 @@
<div class="meta">
{% if course.market_price == 0 %}
<span class="free">全员免费</span>
<span class="lesson">{{ course.lesson_count }}节课</span>
<span class="user">{{ course.user_count }}人报名</span>
<span class="lesson">{{ course.lesson_count }} 节课</span>
<span class="user">{{ course.user_count }} 人报名</span>
{% elseif course.vip_price == 0 %}
<span class="free">会员免费</span>
<span class="lesson">{{ course.lesson_count }}节课</span>
<span class="user">{{ course.user_count }}人购买</span>
<span class="lesson">{{ course.lesson_count }} 节课</span>
<span class="user">{{ course.user_count }} 人购买</span>
{% elseif course.market_price > 0 %}
<span class="price">{{ '￥%0.2f'|format(course.market_price) }}</span>
<span class="lesson">{{ course.lesson_count }}节课</span>
<span class="user">{{ course.user_count }}人购买</span>
<span class="lesson">{{ course.lesson_count }} 节课</span>
<span class="user">{{ course.user_count }} 人购买</span>
{% endif %}
</div>
</div>
@ -72,38 +72,20 @@
<a href="{{ course_url }}" title="{{ course.title }}" target="_blank">{{ course.title }}</a>
</div>
<div class="meta">
{% if course.market_price > 0 %}
{% if course.market_price == 0 %}
<span class="free">全员免费</span>
<span class="lesson">{{ course.lesson_count }} 节课</span>
<span class="user">{{ course.user_count }} 人报名</span>
{% elseif course.vip_price == 0 %}
<span class="free">会员免费</span>
<span class="lesson">{{ course.lesson_count }} 节课</span>
<span class="user">{{ course.user_count }} 人购买</span>
{% elseif course.market_price > 0 %}
<span class="price">{{ '￥%0.2f'|format(course.market_price) }}</span>
<span class="level">{{ level_type(course.level) }}</span>
<span class="user">{{ course.user_count }}人购买</span>
{% else %}
<span class="free">免费</span>
<span class="level">{{ level_type(course.level) }}</span>
<span class="user">{{ course.user_count }}人报名</span>
<span class="lesson">{{ course.lesson_count }} 节课</span>
<span class="user">{{ course.user_count }} 人购买</span>
{% endif %}
</div>
</div>
</div>
{%- endmacro %}
{%- macro learning_course_card(item) %}
{% set course_title = item.course.title %}
{% set course_url = url({'for':'home.course.show','id':item.course.id}) %}
<div class="course-card">
<span class="model layui-badge layui-bg-green">{{ model_type(item.course.model) }}</span>
<div class="cover">
<a href="{{ course_url }}" title="{{ course_title }}" target="_blank">
<img src="{{ item.course.cover }}!cover_270" alt="{{ course_title }}">
</a>
</div>
<div class="info">
<div class="title layui-elip">
<a href="{{ course_url }}" title="{{ course_title }}">{{ course_title }}</a>
</div>
<div class="meta">
<span>已学习 {{ item.duration|duration }}</span>
<span>已完成 {{ item.progress }}%</span>
</div>
</div>
</div>
{%- endmacro %}

12
app/Http/Home/Views/search/sidebar.volt
View File

@ -1,8 +1,8 @@
{% if hot_queries %}
{% if related_queries %}
<div class="layui-card">
<div class="layui-card-header">热门搜索</div>
<div class="layui-card-header">相关搜索</div>
<div class="layui-card-body">
{% for query in hot_queries %}
{% for query in related_queries %}
{% set url = url({'for':'home.search.index'},{'type':type,'query':query}) %}
<a class="layui-badge-rim query-badge" href="{{ url }}">{{ query }}</a>
{% endfor %}
@ -21,11 +21,11 @@
<div class="sidebar" id="sidebar-question-list" data-url="{{ load_url }}"></div>
{% endif %}
{% if related_queries %}
{% if hot_queries %}
<div class="layui-card">
<div class="layui-card-header">相关搜索</div>
<div class="layui-card-header">热门搜索</div>
<div class="layui-card-body">
{% for query in related_queries %}
{% for query in hot_queries %}
{% set url = url({'for':'home.search.index'},{'type':type,'query':query}) %}
<a class="layui-badge-rim query-badge" href="{{ url }}">{{ query }}</a>
{% endfor %}

20
app/Http/Home/Views/user/courses.volt
View File

@ -5,7 +5,25 @@
<div class="layui-row layui-col-space20">
{% for item in pager.items %}
<div class="layui-col-md3">
{{ learning_course_card(item) }}
{% set course_title = item.course.title %}
{% set course_url = url({'for':'home.course.show','id':item.course.id}) %}
<div class="course-card">
<span class="model layui-badge layui-bg-green">{{ model_type(item.course.model) }}</span>
<div class="cover">
<a href="{{ course_url }}" title="{{ course_title }}" target="_blank">
<img src="{{ item.course.cover }}!cover_270" alt="{{ course_title }}">
</a>
</div>
<div class="info">
<div class="title layui-elip">
<a href="{{ course_url }}" title="{{ course_title }}">{{ course_title }}</a>
</div>
<div class="meta">
<span>已学习 {{ item.duration|duration }}</span>
<span>已完成 {{ item.progress }}%</span>
</div>
</div>
</div>
</div>
{% endfor %}
</div>

17
app/Http/Home/Views/user/show.volt
View File

@ -15,9 +15,10 @@
<a><cite>{{ user.name }}</cite></a>
</span>
<span class="share">
<a href="javascript:" title="分享到微信"><i class="layui-icon layui-icon-login-wechat share-wechat"></i></a>
<a href="javascript:" title="分享到QQ空间"><i class="layui-icon layui-icon-login-qq share-qq"></i></a>
<a href="javascript:" title="分享到微博"><i class="layui-icon layui-icon-login-weibo share-weibo"></i></a>
<a class="share-wechat" href="javascript:" title="分享到微信"><i class="layui-icon layui-icon-login-wechat"></i></a>
<a class="share-qq" href="javascript:" title="分享到QQ空间"><i class="layui-icon layui-icon-login-qq"></i></a>
<a class="share-weibo" href="javascript:" title="分享到微博"><i class="layui-icon layui-icon-login-weibo"></i></a>
<a class="share-link kg-copy" href="javascript:" title="复制链接" data-clipboard-text="{{ share_url }}"><i class="layui-icon layui-icon-share"></i></a>
</span>
</div>
@ -55,15 +56,15 @@
<div class="tab-wrap">
<div class="layui-tab layui-tab-brief user-tab">
<ul class="layui-tab-title">
<li class="layui-this">课程</li>
<li class="layui-this">在学课程</li>
{% if show_tab_articles %}
<li>文章</li>
<li>我的文章</li>
{% endif %}
{% if show_tab_questions %}
<li>提问</li>
<li>我的提问</li>
{% endif %}
{% if show_tab_answers %}
<li>回答</li>
<li>我的回答</li>
{% endif %}
</ul>
<div class="layui-tab-content">
@ -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 %}