+
{{ show_courses(new_courses) }}
-
+
{{ show_courses(vip_courses) }}
diff --git a/app/Http/Home/Views/question/edit.volt b/app/Http/Home/Views/question/edit.volt
index 9937e879..025188b2 100644
--- a/app/Http/Home/Views/question/edit.volt
+++ b/app/Http/Home/Views/question/edit.volt
@@ -56,13 +56,13 @@
{% block link_css %}
- {{ css_link('https://cdn.staticfile.org/vditor/3.8.13/index.css', false) }}
+ {{ css_link('lib/vditor/dist/index.css') }}
{% endblock %}
{% 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('home/js/question.edit.js') }}
{{ js_include('home/js/vditor.js') }}
diff --git a/app/Http/Home/Views/templates/error.volt b/app/Http/Home/Views/templates/error.volt
index 97bc86a7..89b7d25e 100644
--- a/app/Http/Home/Views/templates/error.volt
+++ b/app/Http/Home/Views/templates/error.volt
@@ -4,6 +4,7 @@
+
出错啦 - {{ site_info.title }}
{% if site_info.favicon %}
{{ icon_link(site_info.favicon,false) }}
diff --git a/app/Http/Home/Views/templates/layer.volt b/app/Http/Home/Views/templates/layer.volt
index 2ab29e47..0669b1a7 100644
--- a/app/Http/Home/Views/templates/layer.volt
+++ b/app/Http/Home/Views/templates/layer.volt
@@ -4,6 +4,7 @@
+
{{ site_info.title }}
{% if site_info.favicon %}
diff --git a/app/Http/Home/Views/templates/main.volt b/app/Http/Home/Views/templates/main.volt
index 0eb3c2e7..704172a6 100644
--- a/app/Http/Home/Views/templates/main.volt
+++ b/app/Http/Home/Views/templates/main.volt
@@ -4,6 +4,7 @@
+
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 8b182ef5..29397dd1 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -83,7 +83,7 @@ class Category extends Model
*
* @var int
*/
- public $priority = 100;
+ public $priority = 10;
/**
* 发布标识
diff --git a/app/Models/Chapter.php b/app/Models/Chapter.php
index 07a19a2c..ac4d1189 100644
--- a/app/Models/Chapter.php
+++ b/app/Models/Chapter.php
@@ -110,7 +110,7 @@ class Chapter extends Model
*
* @var int
*/
- public $priority = 100;
+ public $priority = 10;
/**
* 免费标识
diff --git a/app/Models/FlashSale.php b/app/Models/FlashSale.php
index e82eeab0..f8316c5d 100644
--- a/app/Models/FlashSale.php
+++ b/app/Models/FlashSale.php
@@ -180,7 +180,7 @@ class FlashSale extends Model
{
$result = [];
- foreach (range(8, 20, 2) as $hour) {
+ foreach (range(10, 20, 2) as $hour) {
$result[] = [
'name' => sprintf('%02d点', $hour),
'hour' => sprintf('%02d', $hour),
diff --git a/app/Models/Help.php b/app/Models/Help.php
index 75226fde..7886e2dd 100644
--- a/app/Models/Help.php
+++ b/app/Models/Help.php
@@ -46,7 +46,7 @@ class Help extends Model
*
* @var int
*/
- public $priority = 100;
+ public $priority = 10;
/**
* 发布标识
diff --git a/app/Repos/Chapter.php b/app/Repos/Chapter.php
index 57b652cd..e98fcc62 100644
--- a/app/Repos/Chapter.php
+++ b/app/Repos/Chapter.php
@@ -50,6 +50,8 @@ class Chapter extends Repository
$query->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
}
+ $query->orderBy('priority ASC');
+
return $query->execute();
}
@@ -87,6 +89,7 @@ class Chapter extends Repository
return ChapterModel::query()
->where('parent_id = :parent_id:', ['parent_id' => $id])
->andWhere('deleted = 0')
+ ->orderBy('priority ASC')
->execute();
}
diff --git a/app/Services/Logic/Im/GroupList.php b/app/Services/Logic/Im/GroupList.php
index 3246092a..34f70169 100644
--- a/app/Services/Logic/Im/GroupList.php
+++ b/app/Services/Logic/Im/GroupList.php
@@ -22,6 +22,7 @@ class GroupList extends LogicService
$params = $pagerQuery->getParams();
$params['published'] = 1;
+ $params['deleted'] = 0;
$sort = $pagerQuery->getSort();
$page = $pagerQuery->getPage();
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index 8c93a398..8e93579c 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -302,7 +302,7 @@
}
.index-wrap .layui-tab-content {
- padding: 20px 0 0 0;
+ padding-top: 20px;
}
.index-wrap .header {
@@ -312,6 +312,10 @@
border-bottom: 1px solid #f6f6f6;
}
+.index-wrap .simple {
+ padding-top: 20px;
+}
+
.index-course-list .course-card {
box-shadow: none;
}
diff --git a/public/static/home/css/markdown.css b/public/static/home/css/markdown.css
index 706bf95d..a42279f2 100644
--- a/public/static/home/css/markdown.css
+++ b/public/static/home/css/markdown.css
@@ -60,7 +60,7 @@
.markdown-body {
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
- line-height: 1.5;
+ line-height: 1.8;
color: #24292e;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
font-size: 14px;