gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-30 22:24:55 +08:00
Code Issues Releases Wiki Activity

vditor本地化

Browse Source
This commit is contained in:
koogua 2022-05-23 14:52:31 +08:00
parent af65adaf94
commit 8fccecb372
32 changed files with 70 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,3 +1,12 @@
### [v1.5.3](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.3)(2022-05-30)
- 优化章节排序初始值和步长
- 修复删除群组前台列表仍然显示问题
- 设置360浏览器的默认模式为webkit
- 修复首页简单模式课程项顶部缺少空白
- vditor本地化，彻底弃用cdn.jsdelivr.net
- 调整markdown样式
### [v1.5.2](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.2)(2022-04-17) ### [v1.5.2](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.2)(2022-04-17)
- 补充话题列表课程数据结构 - 补充话题列表课程数据结构

9
app/Http/Admin/Services/Chapter.php
View File

@ -81,7 +81,14 @@ class Chapter extends Service
$data['parent_id'] = 0; $data['parent_id'] = 0;
} }
$data['priority'] += 1; /**
* 排序从10开始递增，步长为5
*/
if ($data['priority'] < 10) {
$data['priority'] = 10;
} else {
$data['priority'] += 5;
}
try { try {

4
app/Http/Admin/Views/answer/add.volt
View File

@ -29,13 +29,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endblock %} {% endblock %}

4
app/Http/Admin/Views/answer/edit.volt
View File

@ -28,13 +28,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endblock %} {% endblock %}

4
app/Http/Admin/Views/article/edit.volt
View File

@ -25,13 +25,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('lib/xm-select.js') }} {{ js_include('lib/xm-select.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}

4
app/Http/Admin/Views/chapter/edit_lesson.volt
View File

@ -50,7 +50,7 @@
{% block link_css %} {% block link_css %}
{% if chapter.model == 3 %} {% if chapter.model == 3 %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
@ -59,7 +59,7 @@
{% if chapter.model == 3 %} {% if chapter.model == 3 %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% elseif chapter.model == 1 %} {% elseif chapter.model == 1 %}

4
app/Http/Admin/Views/course/edit.volt
View File

@ -41,13 +41,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('lib/xm-select.js') }} {{ js_include('lib/xm-select.js') }}
{{ js_include('admin/js/cover.upload.js') }} {{ js_include('admin/js/cover.upload.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}

4
app/Http/Admin/Views/help/add.volt
View File

@ -49,13 +49,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endblock %} {% endblock %}

4
app/Http/Admin/Views/help/edit.volt
View File

@ -56,13 +56,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endblock %} {% endblock %}

4
app/Http/Admin/Views/page/add.volt
View File

@ -32,13 +32,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endblock %} {% endblock %}

4
app/Http/Admin/Views/page/edit.volt
View File

@ -45,13 +45,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endblock %} {% endblock %}

4
app/Http/Admin/Views/point_gift/edit.volt
View File

@ -15,7 +15,7 @@
{% block link_css %} {% block link_css %}
{% if gift.type == 2 %} {% if gift.type == 2 %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
@ -23,7 +23,7 @@
{% block include_js %} {% block include_js %}
{% if gift.type == 2 %} {% if gift.type == 2 %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('admin/js/cover.upload.js') }} {{ js_include('admin/js/cover.upload.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}
{% endif %} {% endif %}

4
app/Http/Admin/Views/question/edit.volt
View File

@ -25,13 +25,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('lib/xm-select.js') }} {{ js_include('lib/xm-select.js') }}
{{ js_include('admin/js/vditor.js') }} {{ js_include('admin/js/vditor.js') }}

1
app/Http/Admin/Views/templates/layer.volt
View File

@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="renderer" content="webkit">
<meta name="csrf-token" content="{{ csrfToken.getToken() }}"> <meta name="csrf-token" content="{{ csrfToken.getToken() }}">
<title>管理后台</title> <title>管理后台</title>
{{ icon_link('favicon.ico') }} {{ icon_link('favicon.ico') }}

1
app/Http/Admin/Views/templates/main.volt
View File

@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="renderer" content="webkit">
<meta name="csrf-token" content="{{ csrfToken.getToken() }}"> <meta name="csrf-token" content="{{ csrfToken.getToken() }}">
<title>管理后台</title> <title>管理后台</title>
{{ icon_link('favicon.ico') }} {{ icon_link('favicon.ico') }}

1
app/Http/Home/Services/ImGroup.php
View File

@ -27,6 +27,7 @@ class ImGroup extends Service
$params = $pagerQuery->getParams(); $params = $pagerQuery->getParams();
$params['published'] = 1; $params['published'] = 1;
$params['deleted'] = 0;
$sort = $pagerQuery->getSort(); $sort = $pagerQuery->getSort();
$page = $pagerQuery->getPage(); $page = $pagerQuery->getPage();

4
app/Http/Home/Views/answer/add.volt
View File

@ -41,13 +41,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('home/js/answer.edit.js') }} {{ js_include('home/js/answer.edit.js') }}
{{ js_include('home/js/vditor.js') }} {{ js_include('home/js/vditor.js') }}

4
app/Http/Home/Views/answer/edit.volt
View File

@ -36,13 +36,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('home/js/answer.edit.js') }} {{ js_include('home/js/answer.edit.js') }}
{{ js_include('home/js/vditor.js') }} {{ js_include('home/js/vditor.js') }}

4
app/Http/Home/Views/article/edit.volt
View File

@ -76,13 +76,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('lib/xm-select.js') }} {{ js_include('lib/xm-select.js') }}
{{ js_include('home/js/article.edit.js') }} {{ js_include('home/js/article.edit.js') }}
{{ js_include('home/js/vditor.js') }} {{ js_include('home/js/vditor.js') }}

6
app/Http/Home/Views/index/simple.volt
View File

@ -35,7 +35,7 @@
{% if featured_courses|length > 0 %} {% if featured_courses|length > 0 %}
<div class="index-wrap wrap"> <div class="index-wrap wrap">
<div class="header">推荐课程</div> <div class="header">推荐课程</div>
<div class="content"> <div class="content simple">
{{ show_courses(featured_courses) }} {{ show_courses(featured_courses) }}
</div> </div>
</div> </div>
@ -44,7 +44,7 @@
{% if new_courses|length > 0 %} {% if new_courses|length > 0 %}
<div class="index-wrap wrap"> <div class="index-wrap wrap">
<div class="header">新上课程</div> <div class="header">新上课程</div>
<div class="content"> <div class="content simple">
{{ show_courses(new_courses) }} {{ show_courses(new_courses) }}
</div> </div>
</div> </div>
@ -62,7 +62,7 @@
{% if vip_courses|length > 0 %} {% if vip_courses|length > 0 %}
<div class="index-wrap wrap"> <div class="index-wrap wrap">
<div class="header">会员课程</div> <div class="header">会员课程</div>
<div class="content"> <div class="content simple">
{{ show_courses(vip_courses) }} {{ show_courses(vip_courses) }}
</div> </div>
</div> </div>

4
app/Http/Home/Views/question/edit.volt
View File

@ -56,13 +56,13 @@
{% block link_css %} {% block link_css %}
{{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }} {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %} {% endblock %}
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.staticfile.org/vditor/3.8.13/index.min.js', false) }} {{ js_include('lib/vditor/dist/index.min.js') }}
{{ js_include('lib/xm-select.js') }} {{ js_include('lib/xm-select.js') }}
{{ js_include('home/js/question.edit.js') }} {{ js_include('home/js/question.edit.js') }}
{{ js_include('home/js/vditor.js') }} {{ js_include('home/js/vditor.js') }}

1
app/Http/Home/Views/templates/error.volt
View File

@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="renderer" content="webkit">
<title>出错啦 - {{ site_info.title }}</title> <title>出错啦 - {{ site_info.title }}</title>
{% if site_info.favicon %} {% if site_info.favicon %}
{{ icon_link(site_info.favicon,false) }} {{ icon_link(site_info.favicon,false) }}

1
app/Http/Home/Views/templates/layer.volt
View File

@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="renderer" content="webkit">
<meta name="csrf-token" content="{{ csrfToken.getToken() }}"> <meta name="csrf-token" content="{{ csrfToken.getToken() }}">
<title>{{ site_info.title }}</title> <title>{{ site_info.title }}</title>
{% if site_info.favicon %} {% if site_info.favicon %}

1
app/Http/Home/Views/templates/main.volt
View File

@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="renderer" content="webkit">
<meta name="keywords" content="{{ seo.getKeywords() }}"> <meta name="keywords" content="{{ seo.getKeywords() }}">
<meta name="description" content="{{ seo.getDescription() }}"> <meta name="description" content="{{ seo.getDescription() }}">
<meta name="csrf-token" content="{{ csrfToken.getToken() }}"> <meta name="csrf-token" content="{{ csrfToken.getToken() }}">

2
app/Models/Category.php
View File

@ -83,7 +83,7 @@ class Category extends Model
* *
* @var int * @var int
*/ */
public $priority = 100; public $priority = 10;
/** /**
* 发布标识 * 发布标识

2
app/Models/Chapter.php
View File

@ -110,7 +110,7 @@ class Chapter extends Model
* *
* @var int * @var int
*/ */
public $priority = 100; public $priority = 10;
/** /**
* 免费标识 * 免费标识

2
app/Models/FlashSale.php
View File

@ -180,7 +180,7 @@ class FlashSale extends Model
{ {
$result = []; $result = [];
foreach (range(8, 20, 2) as $hour) { foreach (range(10, 20, 2) as $hour) {
$result[] = [ $result[] = [
'name' => sprintf('%02d点', $hour), 'name' => sprintf('%02d点', $hour),
'hour' => sprintf('%02d', $hour), 'hour' => sprintf('%02d', $hour),

2
app/Models/Help.php
View File

@ -46,7 +46,7 @@ class Help extends Model
* *
* @var int * @var int
*/ */
public $priority = 100; public $priority = 10;
/** /**
* 发布标识 * 发布标识

3
app/Repos/Chapter.php
View File

@ -50,6 +50,8 @@ class Chapter extends Repository
$query->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]); $query->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
} }
$query->orderBy('priority ASC');
return $query->execute(); return $query->execute();
} }
@ -87,6 +89,7 @@ class Chapter extends Repository
return ChapterModel::query() return ChapterModel::query()
->where('parent_id = :parent_id:', ['parent_id' => $id]) ->where('parent_id = :parent_id:', ['parent_id' => $id])
->andWhere('deleted = 0') ->andWhere('deleted = 0')
->orderBy('priority ASC')
->execute(); ->execute();
} }

1
app/Services/Logic/Im/GroupList.php
View File

@ -22,6 +22,7 @@ class GroupList extends LogicService
$params = $pagerQuery->getParams(); $params = $pagerQuery->getParams();
$params['published'] = 1; $params['published'] = 1;
$params['deleted'] = 0;
$sort = $pagerQuery->getSort(); $sort = $pagerQuery->getSort();
$page = $pagerQuery->getPage(); $page = $pagerQuery->getPage();

6
public/static/home/css/common.css
View File

@ -302,7 +302,7 @@
} }
.index-wrap .layui-tab-content { .index-wrap .layui-tab-content {
padding: 20px 0 0 0; padding-top: 20px;
} }
.index-wrap .header { .index-wrap .header {
@ -312,6 +312,10 @@
border-bottom: 1px solid #f6f6f6; border-bottom: 1px solid #f6f6f6;
} }
.index-wrap .simple {
padding-top: 20px;
}
.index-course-list .course-card { .index-course-list .course-card {
box-shadow: none; box-shadow: none;
} }

2
public/static/home/css/markdown.css
View File

@ -60,7 +60,7 @@
.markdown-body { .markdown-body {
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
line-height: 1.5; line-height: 1.8;
color: #24292e; color: #24292e;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
font-size: 14px; font-size: 14px;