diff --git a/CHANGELOG.md b/CHANGELOG.md index e058e7df..e293105a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +### [v1.4.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.4.0)(2021-08-03) + +### 更新 + +- 单页增加自定义别名访问 +- 回答增加评论功能 +- 顶部导航微聊增加开关控制 +- 更新默认的ICP备案链接指向 +- 更正部分model定义中字段的类型申明 +- 优化章节过多导致页面过长问题 +- 优化评论前端部分相关逻辑和交互 +- 优化403错误页面，使用forward代替redirect +- 优化播放地址中带queryString的扩展名检查 +- 修正解除第三登录绑定500错误问题 +- 修正教师教授课程未过滤已删除课程问题 +- 修正咨询编辑500错误问题 +- 修正后台列表中restore_url未定义问题 + ### [v1.3.9](https://gitee.com/koogua/course-tencent-cloud/releases/v1.3.9)(2021-07-24) ### 更新 diff --git a/app/Builders/CourseUserList.php b/app/Builders/CourseUserList.php index 9c4d5bca..07c1fada 100644 --- a/app/Builders/CourseUserList.php +++ b/app/Builders/CourseUserList.php @@ -44,7 +44,7 @@ class CourseUserList extends Builder $columns = [ 'id', 'title', 'cover', 'market_price', 'vip_price', - 'rating', 'model', 'level', 'attrs', + 'rating', 'model', 'level', 'attrs', 'published', 'deleted', 'user_count', 'lesson_count', 'review_count', 'favorite_count', ]; @@ -55,9 +55,11 @@ class CourseUserList extends Builder $result = []; foreach ($courses->toArray() as $course) { - $course['cover'] = $baseUrl . $course['cover']; - $course['attrs'] = json_decode($course['attrs'], true); - $result[$course['id']] = $course; + if ($course['deleted'] == 0) { + $course['cover'] = $baseUrl . $course['cover']; + $course['attrs'] = json_decode($course['attrs'], true); + $result[$course['id']] = $course; + } } return $result; diff --git a/app/Http/Admin/Services/Page.php b/app/Http/Admin/Services/Page.php index a9e56b44..e48767a1 100644 --- a/app/Http/Admin/Services/Page.php +++ b/app/Http/Admin/Services/Page.php @@ -72,6 +72,16 @@ class Page extends Service $data['title'] = $validator->checkTitle($post['title']); } + if (isset($post['alias'])) { + $data['alias'] = ''; + if (!empty($post['alias'])) { + $data['alias'] = $validator->checkAlias($post['alias']); + if ($data['alias'] != $page->alias) { + $validator->checkIfAliasTaken($data['alias']); + } + } + } + if (isset($post['content'])) { $data['content'] = $validator->checkContent($post['content']); } diff --git a/app/Http/Admin/Views/page/edit.volt b/app/Http/Admin/Views/page/edit.volt index d7eaca4e..532b3b3f 100644 --- a/app/Http/Admin/Views/page/edit.volt +++ b/app/Http/Admin/Views/page/edit.volt @@ -12,6 +12,12 @@ +
+ +
+ +
+
diff --git a/app/Http/Admin/Views/page/list.volt b/app/Http/Admin/Views/page/list.volt index 52403d25..4f6ecf2c 100644 --- a/app/Http/Admin/Views/page/list.volt +++ b/app/Http/Admin/Views/page/list.volt @@ -2,6 +2,14 @@ {% block content %} + {%- macro alias_tips(alias) %} + {% if alias %} + {{ alias }} + {% else %} + N/A + {% endif %} + {%- endmacro %} + {% set add_url = url({'for':'admin.page.add'}) %}
@@ -24,12 +32,14 @@ + 编号 标题 + 别名 创建时间 更新时间 发布 @@ -42,9 +52,11 @@ {% set edit_url = url({'for':'admin.page.edit','id':item.id}) %} {% set update_url = url({'for':'admin.page.update','id':item.id}) %} {% set delete_url = url({'for':'admin.page.delete','id':item.id}) %} + {% set restore_url = url({'for':'admin.page.restore','id':item.id}) %} {{ item.id }} {{ item.title }} + {{ alias_tips(item.alias) }} {{ date('Y-m-d H:i:s',item.create_time) }} {{ date('Y-m-d H:i:s',item.update_time) }} diff --git a/app/Http/Admin/Views/tag/list.volt b/app/Http/Admin/Views/tag/list.volt index ec21bb5a..4ca7498e 100644 --- a/app/Http/Admin/Views/tag/list.volt +++ b/app/Http/Admin/Views/tag/list.volt @@ -51,6 +51,7 @@ {% set edit_url = url({'for':'admin.tag.edit','id':item.id}) %} {% set update_url = url({'for':'admin.tag.update','id':item.id}) %} {% set delete_url = url({'for':'admin.tag.delete','id':item.id}) %} + {% set restore_url = url({'for':'admin.tag.restore','id':item.id}) %} {{ item.id }} {{ item.name }} diff --git a/app/Http/Home/Controllers/AnswerController.php b/app/Http/Home/Controllers/AnswerController.php index 6ab193be..920d5a83 100644 --- a/app/Http/Home/Controllers/AnswerController.php +++ b/app/Http/Home/Controllers/AnswerController.php @@ -61,7 +61,7 @@ class AnswerController extends Controller } if ($answer['me']['owned'] == 0) { - $this->response->redirect(['for' => 'home.error.403']); + return $this->forbidden(); } $questionId = $answer['question']['id']; diff --git a/app/Http/Home/Controllers/ArticleController.php b/app/Http/Home/Controllers/ArticleController.php index c6b37996..aafe936f 100644 --- a/app/Http/Home/Controllers/ArticleController.php +++ b/app/Http/Home/Controllers/ArticleController.php @@ -107,7 +107,7 @@ class ArticleController extends Controller } if ($article['me']['owned'] == 0) { - $this->response->redirect(['for' => 'home.error.403']); + return $this->forbidden(); } $this->seo->prependTitle(['专栏', $article['title']]); diff --git a/app/Http/Home/Controllers/PageController.php b/app/Http/Home/Controllers/PageController.php index 7d566bcb..20307353 100644 --- a/app/Http/Home/Controllers/PageController.php +++ b/app/Http/Home/Controllers/PageController.php @@ -17,7 +17,7 @@ class PageController extends Controller { /** - * @Get("/{id:[0-9]+}", name="home.page.show") + * @Get("/{id}", name="home.page.show") */ public function showAction($id) { @@ -29,10 +29,6 @@ class PageController extends Controller return $this->notFound(); } - if ($page['me']['owned'] == 0) { - $this->response->redirect(['for' => 'home.error.403']); - } - $featuredCourses = $this->getFeaturedCourses(); $this->seo->prependTitle(['单页', $page['title']]); diff --git a/app/Http/Home/Controllers/QuestionController.php b/app/Http/Home/Controllers/QuestionController.php index 0547fb97..db56dc8f 100644 --- a/app/Http/Home/Controllers/QuestionController.php +++ b/app/Http/Home/Controllers/QuestionController.php @@ -106,7 +106,7 @@ class QuestionController extends Controller } if ($question['me']['owned'] == 0) { - $this->response->redirect(['for' => 'home.error.403']); + return $this->forbidden(); } $this->seo->prependTitle(['问答', $question['title']]); diff --git a/app/Http/Home/Controllers/TopicController.php b/app/Http/Home/Controllers/TopicController.php index 975b1b79..62ed22e5 100644 --- a/app/Http/Home/Controllers/TopicController.php +++ b/app/Http/Home/Controllers/TopicController.php @@ -26,6 +26,10 @@ class TopicController extends Controller $topic = $service->handle($id); + if ($topic['deleted'] == 1) { + return $this->notFound(); + } + $this->seo->prependTitle(['专题', $topic['title']]); $this->seo->setDescription($topic['summary']); diff --git a/app/Http/Home/Views/article/comment.volt b/app/Http/Home/Views/article/comment.volt index 908f74f5..797fb5fb 100644 --- a/app/Http/Home/Views/article/comment.volt +++ b/app/Http/Home/Views/article/comment.volt @@ -10,7 +10,7 @@
- +
diff --git a/app/Http/Home/Views/chapter/comment.volt b/app/Http/Home/Views/chapter/comment.volt index acbe7f76..586d8a66 100644 --- a/app/Http/Home/Views/chapter/comment.volt +++ b/app/Http/Home/Views/chapter/comment.volt @@ -9,7 +9,7 @@
- +
diff --git a/app/Http/Home/Views/comment/list.volt b/app/Http/Home/Views/comment/list.volt index 3fb357d8..fb1e8e06 100644 --- a/app/Http/Home/Views/comment/list.volt +++ b/app/Http/Home/Views/comment/list.volt @@ -20,9 +20,6 @@
{{ item.content }}
-
- {{ item.create_time|time_ago }} -
{% if item.me.liked == 1 %} @@ -35,6 +32,9 @@ {{ item.reply_count }} 回应
+
+ {{ item.create_time|time_ago }} +
@@ -59,12 +59,12 @@
- +
- +
{% endfor %} {{ partial('partials/pager_ajax') }} diff --git a/app/Http/Home/Views/comment/replies.volt b/app/Http/Home/Views/comment/replies.volt index c0a3526b..53273376 100644 --- a/app/Http/Home/Views/comment/replies.volt +++ b/app/Http/Home/Views/comment/replies.volt @@ -24,9 +24,6 @@
{{ item.content }}
-
- {{ item.create_time|time_ago }} -
{% if item.me.liked == 1 %} @@ -35,6 +32,9 @@ 点赞 {% endif %}
+
+ {{ item.create_time|time_ago }} +
@@ -59,7 +59,7 @@
- +
diff --git a/app/Http/Home/Views/consult/edit.volt b/app/Http/Home/Views/consult/edit.volt index 345c8989..e3b95bff 100644 --- a/app/Http/Home/Views/consult/edit.volt +++ b/app/Http/Home/Views/consult/edit.volt @@ -5,14 +5,22 @@ {% set update_url = url({'for':'home.consult.update','id':consult.id}) %}
-
- -
{{ consult.course.title }}
-
-
- -
{{ consult.chapter.title }}
-
+ {% if consult.course.id is defined %} +
+ +
+ +
+
+ {% endif %} + {% if consult.chapter.id is defined %} +
+ +
+ +
+
+ {% endif %}
diff --git a/app/Http/Home/Views/course/show_catalog.volt b/app/Http/Home/Views/course/show_catalog.volt index bb913b3c..bd89a186 100644 --- a/app/Http/Home/Views/course/show_catalog.volt +++ b/app/Http/Home/Views/course/show_catalog.volt @@ -76,12 +76,15 @@ {% endif %} {%- endmacro %} +{% 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 %} diff --git a/app/Http/Home/Views/macros/answer.volt b/app/Http/Home/Views/macros/answer.volt index a2bf14d8..6acc523b 100644 --- a/app/Http/Home/Views/macros/answer.volt +++ b/app/Http/Home/Views/macros/answer.volt @@ -13,6 +13,8 @@ {%- macro answer_card(item,auth_user) %} {% set show_url = full_url({'for':'home.answer.show','id':item.id}) %} {% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %} + {% set comment_create_url = url({'for':'home.comment.create'}) %} + {% set comment_list_url = url({'for':'home.comment.list'},{'item_id':item.id,'item_type':4}) %} {% set report_url = url({'for':'home.report.add'},{'item_id':item.id,'item_type':108}) %} {% set like_url = url({'for':'home.answer.like','id':item.id}) %} {% set edit_url = url({'for':'home.answer.edit','id':item.id}) %} @@ -31,9 +33,6 @@
    {{ item.content }}
    -
    - {{ item.create_time|time_ago }} -
    {% if item.me.liked == 1 %} @@ -42,8 +41,18 @@ 点赞 {% endif %}
    +
    + {{ item.comment_count }} + 回应 +
    +
    + {{ item.create_time|time_ago }} +
    +
    + 回复 +
    链接
    @@ -60,5 +69,20 @@ {% endif %}
    + +
{%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/partials/header.volt b/app/Http/Home/Views/partials/header.volt index fc3cc815..9e697a36 100644 --- a/app/Http/Home/Views/partials/header.volt +++ b/app/Http/Home/Views/partials/header.volt @@ -35,9 +35,11 @@
  • 会员
    • -
  • - 微聊 -
    • + {% if im_info.cs.enabled == 1 %} +
  • + 微聊 +
    • + {% endif %} {% if auth_user.id > 0 %}
  • 创建 diff --git a/app/Http/Home/Views/question/show.volt b/app/Http/Home/Views/question/show.volt index 3cad00c3..91dca280 100644 --- a/app/Http/Home/Views/question/show.volt +++ b/app/Http/Home/Views/question/show.volt @@ -116,6 +116,7 @@ {{ js_include('home/js/question.show.js') }} {{ js_include('home/js/question.share.js') }} {{ js_include('home/js/answer.js') }} + {{ js_include('home/js/comment.js') }} {{ js_include('home/js/copy.js') }} {% endblock %} \ No newline at end of file diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php index 97844901..2beb4868 100644 --- a/app/Library/AppInfo.php +++ b/app/Library/AppInfo.php @@ -16,7 +16,7 @@ class AppInfo protected $link = 'https://koogua.com'; - protected $version = '1.3.9'; + protected $version = '1.4.0'; public function __get($name) { diff --git a/app/Models/Answer.php b/app/Models/Answer.php index d9baf2b2..0fd88c51 100644 --- a/app/Models/Answer.php +++ b/app/Models/Answer.php @@ -100,7 +100,7 @@ class Answer extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Models/Article.php b/app/Models/Article.php index c72bad34..9e1072df 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -109,7 +109,7 @@ class Article extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Models/Comment.php b/app/Models/Comment.php index 460b44a2..5b67874b 100644 --- a/app/Models/Comment.php +++ b/app/Models/Comment.php @@ -87,7 +87,7 @@ class Comment extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Models/Consult.php b/app/Models/Consult.php index d4cddd88..2281e6a5 100644 --- a/app/Models/Consult.php +++ b/app/Models/Consult.php @@ -71,7 +71,7 @@ class Consult extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Models/Page.php b/app/Models/Page.php index 635dd9a1..eff9ad4c 100644 --- a/app/Models/Page.php +++ b/app/Models/Page.php @@ -27,6 +27,13 @@ class Page extends Model */ public $title = ''; + /** + * 别名 + * + * @var string + */ + public $alias = ''; + /** * 内容 * diff --git a/app/Models/Question.php b/app/Models/Question.php index b056bf53..128e1bc3 100644 --- a/app/Models/Question.php +++ b/app/Models/Question.php @@ -158,7 +158,7 @@ class Question extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Models/Report.php b/app/Models/Report.php index ebb9f459..42fa16ce 100644 --- a/app/Models/Report.php +++ b/app/Models/Report.php @@ -69,7 +69,7 @@ class Report extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Models/Review.php b/app/Models/Review.php index ab3ccfa7..46c30a9f 100644 --- a/app/Models/Review.php +++ b/app/Models/Review.php @@ -50,7 +50,7 @@ class Review extends Model /** * 终端IP * - * @var integer + * @var string */ public $client_ip = ''; diff --git a/app/Repos/Page.php b/app/Repos/Page.php index 7c980517..b5355bef 100644 --- a/app/Repos/Page.php +++ b/app/Repos/Page.php @@ -80,6 +80,18 @@ class Page extends Repository ]); } + /** + * @param string $alias + * @return PageModel|Model|bool + */ + public function findByAlias($alias) + { + return PageModel::findFirst([ + 'conditions' => 'alias = :alias:', + 'bind' => ['alias' => $alias], + ]); + } + /** * @param array $ids * @param array|string $columns diff --git a/app/Services/Logic/Page/PageInfo.php b/app/Services/Logic/Page/PageInfo.php index f090fa3a..85143a28 100644 --- a/app/Services/Logic/Page/PageInfo.php +++ b/app/Services/Logic/Page/PageInfo.php @@ -8,7 +8,6 @@ namespace App\Services\Logic\Page; use App\Models\Page as PageModel; -use App\Models\User as UserModel; use App\Services\Logic\PageTrait; use App\Services\Logic\Service as LogicService; @@ -19,19 +18,15 @@ class PageInfo extends LogicService public function handle($id) { - $user = $this->getCurrentUser(true); - $page = $this->checkPage($id); - return $this->handlePage($page, $user); + return $this->handlePage($page); } - protected function handlePage(PageModel $page, UserModel $user) + protected function handlePage(PageModel $page) { $page->content = kg_parse_markdown($page->content); - $me = $this->handleMeInfo($page, $user); - return [ 'id' => $page->id, 'title' => $page->title, @@ -40,19 +35,7 @@ class PageInfo extends LogicService 'deleted' => $page->deleted, 'create_time' => $page->create_time, 'update_time' => $page->update_time, - 'me' => $me, ]; } - protected function handleMeInfo(PageModel $page, UserModel $user) - { - $me = ['owned' => 0]; - - if ($page->published == 1) { - $me['owned'] = 1; - } - - return $me; - } - } diff --git a/app/Services/Logic/User/Console/ConnectDelete.php b/app/Services/Logic/User/Console/ConnectDelete.php index dd051885..b2a4acc6 100644 --- a/app/Services/Logic/User/Console/ConnectDelete.php +++ b/app/Services/Logic/User/Console/ConnectDelete.php @@ -7,6 +7,7 @@ namespace App\Services\Logic\User\Console; +use App\Services\Logic\Service as LogicService; use App\Validators\Connect as ConnectValidator; class ConnectDelete extends LogicService diff --git a/app/Traits/Response.php b/app/Traits/Response.php index 6c235815..77f7363c 100644 --- a/app/Traits/Response.php +++ b/app/Traits/Response.php @@ -16,6 +16,22 @@ use Phalcon\Mvc\Dispatcher; trait Response { + public function forbidden() + { + /** + * @var Dispatcher $dispatcher + */ + $dispatcher = Di::getDefault()->getShared('dispatcher'); + + $dispatcher->forward([ + 'module' => 'home', + 'controller' => 'error', + 'action' => 'show403', + ]); + + return false; + } + public function notFound() { /** diff --git a/app/Validators/ChapterVod.php b/app/Validators/ChapterVod.php index e3e66356..3864c4fe 100644 --- a/app/Validators/ChapterVod.php +++ b/app/Validators/ChapterVod.php @@ -43,7 +43,9 @@ class ChapterVod extends Validator throw new BadRequestException('chapter_vod.invalid_file_url'); } - $ext = strtolower(pathinfo($url, PATHINFO_EXTENSION)); + $path = parse_url($value, PHP_URL_PATH); + + $ext = strtolower(pathinfo($path, PATHINFO_EXTENSION)); /** * 点播只支持mp4,m3u8格式 diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php index 2c37d006..e555a588 100644 --- a/app/Validators/Consult.php +++ b/app/Validators/Consult.php @@ -50,7 +50,7 @@ class Consult extends Validator $length = kg_strlen($value); - if ($length < 15) { + if ($length < 5) { throw new BadRequestException('consult.question_too_short'); } @@ -67,7 +67,7 @@ class Consult extends Validator $length = kg_strlen($value); - if ($length < 15) { + if ($length < 5) { throw new BadRequestException('consult.answer_too_short'); } diff --git a/app/Validators/Page.php b/app/Validators/Page.php index 6086c79c..ae1e708b 100644 --- a/app/Validators/Page.php +++ b/app/Validators/Page.php @@ -10,6 +10,7 @@ namespace App\Validators; use App\Caches\MaxPageId as MaxPageIdCache; use App\Caches\Page as PageCache; use App\Exceptions\BadRequest as BadRequestException; +use App\Library\Validators\Common as CommonValidator; use App\Models\Page as PageModel; use App\Repos\Page as PageRepo; @@ -38,11 +39,13 @@ class Page extends Validator public function checkPage($id) { - $this->checkId($id); - $pageRepo = new PageRepo(); - $page = $pageRepo->findById($id); + if (CommonValidator::intNumber($id)) { + $page = $pageRepo->findById($id); + } else { + $page = $pageRepo->findByAlias($id); + } if (!$page) { throw new BadRequestException('page.not_found'); @@ -81,6 +84,29 @@ class Page extends Validator return $value; } + public function checkAlias($alias) + { + $value = $this->filter->sanitize($alias, ['trim', 'string']); + + $value = str_replace(['/', '?', '#'], '', $value); + + $length = kg_strlen($value); + + if (CommonValidator::intNumber($value)) { + throw new BadRequestException('page.invalid_alias'); + } + + if ($length < 2) { + throw new BadRequestException('page.alias_too_short'); + } + + if ($length > 50) { + throw new BadRequestException('page.alias_too_long'); + } + + return $value; + } + public function checkContent($content) { $value = $this->filter->sanitize($content, ['trim']); @@ -107,4 +133,15 @@ class Page extends Validator return $status; } + public function checkIfAliasTaken($alias) + { + $pageRepo = new PageRepo(); + + $page = $pageRepo->findByAlias($alias); + + if ($page) { + throw new BadRequestException('page.alias_taken'); + } + } + } diff --git a/config/errors.php b/config/errors.php index 6ac4a525..a82e7688 100644 --- a/config/errors.php +++ b/config/errors.php @@ -310,9 +310,9 @@ $error['consult.invalid_rating'] = '无效的评分（范围：1-5）'; $error['consult.invalid_private_status'] = '无效的私密状态'; $error['consult.invalid_publish_status'] = '无效的发布状态'; $error['consult.question_duplicated'] = '你已经咨询过类似问题啦'; -$error['consult.question_too_short'] = '问题内容太短（少于15个字符）'; +$error['consult.question_too_short'] = '问题内容太短（少于5个字符）'; $error['consult.question_too_long'] = '问题内容太长（多于1000个字符）'; -$error['consult.answer_too_short'] = '回复内容太短（少于15个字符）'; +$error['consult.answer_too_short'] = '回复内容太短（少于5个字符）'; $error['consult.answer_too_long'] = '回复内容太长（多于1000个字符）'; $error['consult.edit_not_allowed'] = '当前不允许修改操作'; $error['consult.has_liked'] = '你已经点过赞啦'; @@ -323,8 +323,11 @@ $error['consult.has_liked'] = '你已经点过赞啦'; $error['page.not_found'] = '单页不存在'; $error['page.title_too_short'] = '标题太短（少于2个字符）'; $error['page.title_too_long'] = '标题太长（多于50个字符）'; +$error['page.alias_too_short'] = '别名太短（少于2个字符）'; +$error['page.alias_too_long'] = '别名太长（多于50个字符）'; $error['page.content_too_short'] = '内容太短（少于10个字符）'; $error['page.content_too_long'] = '内容太长（多于30000个字符）'; +$error['page.invalid_alias'] = '无效的别名（推荐使用英文作为别名）'; $error['page.invalid_publish_status'] = '无效的发布状态'; /** diff --git a/db/migrations/20210403184518.php b/db/migrations/20210403184518.php index 9820f295..8ce112a5 100644 --- a/db/migrations/20210403184518.php +++ b/db/migrations/20210403184518.php @@ -694,7 +694,7 @@ final class V20210403184518 extends AbstractMigration [ 'section' => 'site', 'item_key' => 'icp_link', - 'item_value' => 'http://www.miitbeian.gov.cn', + 'item_value' => 'http://beian.miit.gov.cn', ], [ 'section' => 'site', diff --git a/db/migrations/20210802021814.php b/db/migrations/20210802021814.php new file mode 100644 index 00000000..51852a92 --- /dev/null +++ b/db/migrations/20210802021814.php @@ -0,0 +1,32 @@ +alterPageTable(); + } + + protected function alterPageTable() + { + $this->table('kg_page') + ->addColumn('alias', 'string', [ + 'null' => false, + 'default' => '', + 'limit' => 50, + 'collation' => 'utf8mb4_general_ci', + 'encoding' => 'utf8mb4', + 'comment' => '别名', + 'after' => 'title', + ])->save(); + } + +} diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css index ab34534e..95d596df 100644 --- a/public/static/home/css/common.css +++ b/public/static/home/css/common.css @@ -636,6 +636,42 @@ color: green; } +.answer-card { + padding-bottom: 20px; + margin-bottom: 20px; + border-bottom: 1px solid #f6f6f6; +} + +.answer-card:last-child { + padding-bottom: 0; + margin-bottom: 0; + border-bottom: none; +} + +.answer-card .header { + line-height: 32px; + margin-bottom: 20px; +} + +.answer-card .header span { + margin-right: 10px; +} + +.answer-card .avatar img { + width: 32px; + height: 32px; + border-radius: 100%; +} + +.answer-card .content { + margin-bottom: 20px; + overflow-wrap: break-word; +} + +.answer-card .comment-list { + margin-top: 20px; +} + #comment-form { margin-bottom: 30px; } @@ -668,15 +704,13 @@ } .comment-card .avatar { - width: 48px; - height: 48px; - margin-right: 15px; + margin-right: 10px; } .comment-card .avatar img { - width: 100%; - height: 100%; - border-radius: 60px; + width: 32px; + height: 32px; + border-radius: 100%; } .comment-card .info { @@ -684,7 +718,7 @@ } .comment-card .user { - margin-bottom: 10px; + margin-bottom: 15px; color: #666; } @@ -726,60 +760,11 @@ .comment-card .footer .action:hover, .answer-card .footer .action:hover { - background-color: #393D49; cursor: pointer; - color: white; -} - -.comment-card .footer .right .action, -.answer-card .footer .right .action { - display: none; -} - -.comment-card .info:hover .right .action, -.answer-card:hover .right .action { - display: inline; -} - -.answer-card { - padding-bottom: 20px; - margin-bottom: 20px; - border-bottom: 1px solid #f6f6f6; -} - -.answer-card:last-child { - padding-bottom: 0; - margin-bottom: 0; - border-bottom: none; -} - -.answer-card .header { - line-height: 32px; - margin-bottom: 20px; -} - -.answer-card .header span { - margin-right: 10px; -} - -.answer-card .avatar img { - width: 32px; - height: 32px; - border-radius: 100%; -} - -.answer-card .content { - margin-bottom: 20px; - overflow-wrap: break-word; } .reply-list { - margin-left: 48px; -} - -.reply-list .comment-card .info { - float: left; - width: 640px; + margin-left: 42px; } .toolbar-sticky { diff --git a/public/static/home/js/answer.js b/public/static/home/js/answer.js index c562025d..affff515 100644 --- a/public/static/home/js/answer.js +++ b/public/static/home/js/answer.js @@ -1,8 +1,46 @@ -layui.use(['jquery', 'helper'], function () { +layui.use(['jquery', 'form', 'helper'], function () { var $ = layui.jquery; + var form = layui.form; var helper = layui.helper; + form.on('submit(comment_answer)', function (data) { + var submit = $(this); + var answerId = $(this).data('answer-id'); + var $commentForm = $('#answer-comment-form-' + answerId); + var $commentList = $('#answer-comment-list-' + answerId); + var $textarea = $(data.form).find('.layui-textarea'); + var $commentCount = $('#answer-' + answerId).find('.comment-count'); + var commentCount = $commentCount.data('count'); + submit.attr('disabled', 'disabled').addClass('layui-btn-disabled'); + $.ajax({ + type: 'POST', + url: data.form.action, + data: data.field, + success: function (res) { + $.ajax({ + type: 'GET', + url: '/comment/' + res.comment.id + '/info', + success: function (html) { + $commentCount.data('count', commentCount).text(commentCount); + $commentList.prepend(html); + } + }); + $commentForm.hide(); + $commentList.show(); + $textarea.val(''); + layer.msg('发表评论成功'); + submit.removeAttr('disabled').removeClass('layui-btn-disabled'); + }, + error: function (xhr) { + var res = JSON.parse(xhr.responseText); + layer.msg(res.msg); + submit.removeAttr('disabled').removeClass('layui-btn-disabled'); + } + }); + return false; + }); + $('body').on('click', '.answer-like', function () { var $this = $(this); var $likeCount = $this.prev(); @@ -29,4 +67,42 @@ layui.use(['jquery', 'helper'], function () { window.location.href = $(this).data('url'); }); + $('body').on('click', '.answer-comment', function () { + var id = $(this).data('id'); + var $block = $('#answer-comment-form-' + id); + var $textarea = $block.find('textarea'); + $block.toggle(); + $textarea.focus(); + }); + + $('body').on('click', '.answer-comment-cancel', function () { + var id = $(this).data('id'); + $('#answer-comment-form-' + id).hide(); + }); + + $('body').on('click', '.answer-comment-toggle', function () { + var $this = $(this); + var id = $this.data('id'); + var url = $this.data('url'); + var $commentList = $('#answer-comment-list-' + id); + if ($commentList.hasClass('loaded')) { + if ($this.hasClass('expanded')) { + $this.attr('title', '展开回应').removeClass('expanded'); + } else { + $this.attr('title', '收起回应').addClass('expanded'); + } + $commentList.toggle(); + } else { + $.ajax({ + type: 'GET', + url: url, + success: function (html) { + $this.attr('title', '收起回应').addClass('expanded'); + $commentList.addClass('loaded').show(); + $commentList.html(html); + } + }); + } + }); + }); \ No newline at end of file diff --git a/public/static/home/js/comment.js b/public/static/home/js/comment.js index f40ba9f9..8559809a 100644 --- a/public/static/home/js/comment.js +++ b/public/static/home/js/comment.js @@ -49,8 +49,6 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { var $textarea = $(data.form).find('.layui-textarea'); var $replyCount = $('#comment-' + blockId).find('.reply-count'); var replyCount = $replyCount.data('count'); - var $tbCommentCount = $('#toolbar-comment > .text'); - var tbCommentCount = $tbCommentCount.data('count'); submit.attr('disabled', 'disabled').addClass('layui-btn-disabled'); $.ajax({ type: 'POST', @@ -65,12 +63,10 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { } }); replyCount++; - tbCommentCount++; $commentForm.hide(); $replyList.show(); $textarea.val(''); $replyCount.data('count', replyCount).text(replyCount); - $tbCommentCount.data('count', tbCommentCount).text(tbCommentCount); layer.msg('发表回复成功'); submit.removeAttr('disabled').removeClass('layui-btn-disabled'); }, @@ -83,7 +79,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { return false; }); - $('#btn-cancel-comment').on('click', function () { + $('#comment-cancel').on('click', function () { $('#comment-footer').hide(); }); @@ -91,7 +87,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { $('#comment-footer').show(); }); - $('body').on('click', '.btn-cancel-reply', function () { + $('body').on('click', '.reply-cancel', function () { var id = $(this).data('id'); $('#comment-form-' + id).hide(); }); diff --git a/public/static/home/js/user.console.js b/public/static/home/js/user.console.js index 41ceb461..494c2e64 100644 --- a/public/static/home/js/user.console.js +++ b/public/static/home/js/user.console.js @@ -25,7 +25,7 @@ layui.use(['jquery', 'layer'], function () { type: 2, title: '编辑咨询', content: [url, 'no'], - area: ['720px', '400px'], + area: ['720px', '420px'], cancel: function () { parent.location.reload(); }