diff --git a/app/Http/Web/Views/chapter/vod.volt b/app/Http/Web/Views/chapter/vod.volt
index 146b0e63..72dac8c1 100644
--- a/app/Http/Web/Views/chapter/vod.volt
+++ b/app/Http/Web/Views/chapter/vod.volt
@@ -3,21 +3,24 @@
{% block content %}
{% set chapter_full_url = full_url({'for':'web.chapter.show','id':chapter.id}) %}
+ {% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %}
{% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %}
{% set danmu_url = url({'for':'web.chapter.danmu','id':chapter.id}) %}
{% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %}
{% set qrcode_url = url({'for':'web.qrcode_img'},{'text':chapter_full_url}) %}
{% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %}
+ {% set liked_class = chapter.me.liked ? 'active' : '' %}
{{ chapter.user_count }}
- {{ chapter.like_count }}
-
+ {{ chapter.like_count }}
+ {{ chapter.consult_count }}
@@ -111,7 +114,7 @@
{% block include_js %}
-
+
{{ js_include('lib/jquery.min.js') }}
{{ js_include('lib/jquery.danmu.min.js') }}
diff --git a/app/Http/Web/Views/consult/add.volt b/app/Http/Web/Views/consult/add.volt
index 0b89bcbb..d8faa457 100644
--- a/app/Http/Web/Views/consult/add.volt
+++ b/app/Http/Web/Views/consult/add.volt
@@ -5,7 +5,7 @@
-
+
diff --git a/app/Http/Web/Views/course/consults.volt b/app/Http/Web/Views/course/consults.volt
index b51f835a..dcdb28cf 100644
--- a/app/Http/Web/Views/course/consults.volt
+++ b/app/Http/Web/Views/course/consults.volt
@@ -11,7 +11,7 @@
{{ item.question }}
- {{ item.answer }}
+ {% if item.answer %} {{ item.answer }} {% else %} 稍安勿燥，请耐心等待我们的回复吧 {% endif %}
{{ item.create_time|time_ago }}
diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt
index 7a7986ce..b932bea3 100644
--- a/app/Http/Web/Views/course/show.volt
+++ b/app/Http/Web/Views/course/show.volt
@@ -4,7 +4,8 @@
{{ partial('partials/macro_course') }}
- {% set favorite_star_class = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %}
+ {% set favorite_title = course.me.favorited ? '取消收藏' : '收藏' %}
+ {% set favorite_star = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %}
{% set full_course_url = full_url({'for':'web.course.show','id':course.id}) %}
{% set favorite_url = url({'for':'web.course.favorite','id':course.id}) %}
{% set qrcode_url = url({'for':'web.qrcode_img'},{'text':full_course_url}) %}
@@ -18,7 +19,7 @@
{{ course.title }}
{% if course.model == 'vod' %}
-
课程时长 {{ course.attrs.duration|total_duration }}
++ 课程时长{{ course.attrs.duration|total_duration }} +
{% elseif course.model == 'live' %} -直播时间 {{ course.attrs.start_date }} ~ {{ course.attrs.end_date }}
- {% endif %} - {% if course.market_price > 0 %} -- 学习期限 {{ course.study_expiry }}个月 - 退款期限 {{ course.refund_expiry }}天 +
+ 直播时间{{ course.attrs.start_date }} ~ {{ course.attrs.end_date }}
{% endif %} -+ {% if course.market_price > 0 %} +
+ 学习期限{{ course.study_expiry }}个月 + 退款期限{{ course.refund_expiry }}天 +
+ {% endif %} +{% if course.market_price > 0 %} - 市场价格 {{ '￥%0.2f'|format(course.market_price) }} + 市场价格{{ '￥%0.2f'|format(course.market_price) }} {% else %} - 市场价格 免费 + 市场价格免费 {% endif %} {% if course.vip_price > 0 %} - 会员价格 {{ '￥%0.2f'|format(course.vip_price) }} + 会员价格{{ '￥%0.2f'|format(course.vip_price) }} {% else %} - 会员价格 免费 + 会员价格免费 {% endif %}
-- 难度级别 {{ level_info(course.level) }} - 学习人次 {{ course.user_count }} - 综合评分 {{ course.ratings.rating }} +
+ 难度级别{{ level_info(course.level) }} + 学习人次{{ course.user_count }} + 综合评分{{ course.ratings.rating }}
diff --git a/app/Http/Web/Views/my/account.volt b/app/Http/Web/Views/my/account.volt
index 170d81d0..0759ab11 100644
--- a/app/Http/Web/Views/my/account.volt
+++ b/app/Http/Web/Views/my/account.volt
@@ -22,7 +22,7 @@
手机绑定
{% if account.phone %}
- 已绑定手机：{{ account.phone }}
+ 已绑定手机：{{ account.phone|anonymous }}
修改
{% else %}
可用于登录和重置密码
@@ -33,7 +33,7 @@
邮箱绑定
{% if account.phone %}
- 已绑定邮箱：{{ account.email }}
+ 已绑定邮箱：{{ account.email|anonymous }}
修改
{% else %}
可用于登录和重置密码
diff --git a/app/Library/Helper.php b/app/Library/Helper.php
index 80330fd4..bdfcaa0b 100644
--- a/app/Library/Helper.php
+++ b/app/Library/Helper.php
@@ -1,5 +1,6 @@
$end) ? mb_substr($str, $i, 1) : '*';
+ }
+
+ return join('', $list);
+}
+
/**
* 格式化数字
*
@@ -252,48 +286,12 @@ function kg_time_ago($time)
}
/**
- * 播放时长
+ * 格式化时长
*
* @param int $time
* @return string
*/
-function kg_play_duration($time)
-{
- $result = '00:00';
-
- if ($time > 0) {
-
- $hours = floor($time / 3600);
- $minutes = floor(($time - $hours * 3600) / 60);
- $seconds = $time % 60;
-
- $format = [];
-
- if ($hours > 0) {
- $format[] = sprintf('%02d', $hours);
- }
-
- if ($minutes >= 0) {
- $format[] = sprintf('%02d', $minutes);
- }
-
- if ($seconds >= 0) {
- $format[] = sprintf('%02d', $seconds);
- }
-
- $result = implode(':', $format);
- }
-
- return $result;
-}
-
-/**
- * 总时长
- *
- * @param int $time
- * @return string
- */
-function kg_total_duration($time)
+function kg_duration($time)
{
$result = '00分钟';
diff --git a/app/Providers/Volt.php b/app/Providers/Volt.php
index def6382d..b585573d 100644
--- a/app/Providers/Volt.php
+++ b/app/Providers/Volt.php
@@ -54,12 +54,8 @@ class Volt extends Provider
return 'kg_can(' . $resolvedArgs . ')';
});
- $compiler->addFilter('play_duration', function ($resolvedArgs) {
- return 'kg_play_duration(' . $resolvedArgs . ')';
- });
-
- $compiler->addFilter('total_duration', function ($resolvedArgs) {
- return 'kg_total_duration(' . $resolvedArgs . ')';
+ $compiler->addFilter('duration', function ($resolvedArgs) {
+ return 'kg_duration(' . $resolvedArgs . ')';
});
$compiler->addFilter('human_number', function ($resolvedArgs) {
@@ -70,6 +66,10 @@ class Volt extends Provider
return 'kg_time_ago(' . $resolvedArgs . ')';
});
+ $compiler->addFilter('anonymous', function ($resolvedArgs) {
+ return 'kg_anonymous(' . $resolvedArgs . ')';
+ });
+
return $volt;
});
}
diff --git a/app/Repos/Consult.php b/app/Repos/Consult.php
index 9cecee05..9145f504 100644
--- a/app/Repos/Consult.php
+++ b/app/Repos/Consult.php
@@ -86,6 +86,20 @@ class Consult extends Repository
->execute();
}
+ /**
+ * @param int $chapterId
+ * @param int $userId
+ * @return ConsultModel|Model|bool
+ */
+ public function findUserLastChapterConsult($chapterId, $userId)
+ {
+ return ConsultModel::findFirst([
+ 'conditions' => 'chapter_id = ?1 AND user_id = ?2 AND deleted = 0',
+ 'bind' => [1 => $chapterId, 2 => $userId],
+ 'order' => 'id DESC',
+ ]);
+ }
+
public function countConsults()
{
return (int)ConsultModel::count(['conditions' => 'deleted = 0']);
diff --git a/app/Services/Frontend/Chapter/ChapterInfo.php b/app/Services/Frontend/Chapter/ChapterInfo.php
index 2a65c7d5..81338ff0 100644
--- a/app/Services/Frontend/Chapter/ChapterInfo.php
+++ b/app/Services/Frontend/Chapter/ChapterInfo.php
@@ -8,6 +8,7 @@ use App\Models\Course as CourseModel;
use App\Models\CourseUser as CourseUserModel;
use App\Models\User as UserModel;
use App\Repos\Chapter as ChapterRepo;
+use App\Repos\ChapterLike as ChapterLikeRepo;
use App\Services\ChapterVod as ChapterVodService;
use App\Services\Frontend\ChapterTrait;
use App\Services\Frontend\CourseTrait;
@@ -27,7 +28,8 @@ class ChapterInfo extends FrontendService
*/
protected $user;
- use CourseTrait, ChapterTrait;
+ use CourseTrait;
+ use ChapterTrait;
public function handle($id)
{
@@ -47,10 +49,10 @@ class ChapterInfo extends FrontendService
$this->setChapterUser($chapter, $user);
$this->handleChapterUser($chapter, $user);
- return $this->handleChapter($chapter);
+ return $this->handleChapter($chapter, $user);
}
- protected function handleChapter(ChapterModel $chapter)
+ protected function handleChapter(ChapterModel $chapter, UserModel $user)
{
$result = $this->formatChapter($chapter);
@@ -61,18 +63,30 @@ class ChapterInfo extends FrontendService
'position' => 0,
'joined' => 0,
'owned' => 0,
+ 'liked' => 0,
];
- if ($this->courseUser) {
- $me['plan_id'] = $this->courseUser->plan_id;
- }
+ if ($user->id) {
- if ($this->chapterUser) {
- $me['position'] = $this->chapterUser->position;
- }
+ $likeRepo = new ChapterLikeRepo();
- $me['joined'] = $this->joinedChapter ? 1 : 0;
- $me['owned'] = $this->ownedChapter ? 1 : 0;
+ $like = $likeRepo->findChapterLike($chapter->id, $user->id);
+
+ if ($like && $like->deleted == 0) {
+ $me['liked'] = 1;
+ }
+
+ if ($this->courseUser) {
+ $me['plan_id'] = $this->courseUser->plan_id;
+ }
+
+ if ($this->chapterUser) {
+ $me['position'] = $this->chapterUser->position;
+ }
+
+ $me['joined'] = $this->joinedChapter ? 1 : 0;
+ $me['owned'] = $this->ownedChapter ? 1 : 0;
+ }
$result['me'] = $me;
@@ -85,12 +99,6 @@ class ChapterInfo extends FrontendService
'id' => $course->id,
'title' => $course->title,
'cover' => $course->cover,
- 'market_price' => $course->market_price,
- 'vip_price' => $course->vip_price,
- 'model' => $course->model,
- 'level' => $course->level,
- 'user_count' => $course->user_count,
- 'lesson_count' => $course->lesson_count,
];
}
@@ -98,7 +106,7 @@ class ChapterInfo extends FrontendService
{
$item = [];
- switch ($this->course->model) {
+ switch ($chapter->model) {
case CourseModel::MODEL_VOD:
$item = $this->formatChapterVod($chapter);
break;
@@ -127,7 +135,7 @@ class ChapterInfo extends FrontendService
'play_urls' => $playUrls,
'user_count' => $chapter->user_count,
'like_count' => $chapter->like_count,
- 'comment_count' => $chapter->comment_count,
+ 'consult_count' => $chapter->consult_count,
];
}
@@ -166,7 +174,7 @@ class ChapterInfo extends FrontendService
'play_urls' => $playUrls,
'user_count' => $chapter->user_count,
'like_count' => $chapter->like_count,
- 'comment_count' => $chapter->comment_count,
+ 'consult_count' => $chapter->consult_count,
];
}
@@ -184,7 +192,7 @@ class ChapterInfo extends FrontendService
'content' => $read->content,
'user_count' => $chapter->user_count,
'like_count' => $chapter->like_count,
- 'comment_count' => $chapter->comment_count,
+ 'consult_count' => $chapter->consult_count,
];
}
diff --git a/app/Services/Frontend/Chapter/ChapterBasic.php b/app/Services/Frontend/Chapter/ChapterInfoBasic.php
similarity index 98%
rename from app/Services/Frontend/Chapter/ChapterBasic.php
rename to app/Services/Frontend/Chapter/ChapterInfoBasic.php
index 309d9194..71329fba 100644
--- a/app/Services/Frontend/Chapter/ChapterBasic.php
+++ b/app/Services/Frontend/Chapter/ChapterInfoBasic.php
@@ -11,7 +11,7 @@ use App\Services\Frontend\Service as FrontendService;
use App\Services\Live as LiveService;
use WhichBrowser\Parser as BrowserParser;
-class ChapterBasic extends FrontendService
+class ChapterInfoBasic extends FrontendService
{
use ChapterTrait;
diff --git a/app/Services/Frontend/Chapter/ChapterLike.php b/app/Services/Frontend/Chapter/ChapterLike.php
index d8633f64..a8b0c122 100644
--- a/app/Services/Frontend/Chapter/ChapterLike.php
+++ b/app/Services/Frontend/Chapter/ChapterLike.php
@@ -5,9 +5,9 @@ namespace App\Services\Frontend\Chapter;
use App\Models\Chapter as ChapterModel;
use App\Models\ChapterLike as ChapterLikeModel;
use App\Models\User as UserModel;
+use App\Repos\ChapterLike as ChapterLikeRepo;
use App\Services\Frontend\ChapterTrait;
use App\Services\Frontend\Service as FrontendService;
-use App\Validators\Chapter as ChapterValidator;
use App\Validators\UserDailyLimit as UserDailyLimitValidator;
use Phalcon\Events\Manager as EventsManager;
@@ -26,9 +26,9 @@ class ChapterLike extends FrontendService
$validator->checkChapterLikeLimit($user);
- $validator = new ChapterValidator();
+ $likeRepo = new ChapterLikeRepo();
- $chapterLike = $validator->checkIfLiked($chapter->id, $user->id);
+ $chapterLike = $likeRepo->findChapterLike($chapter->id, $user->id);
if (!$chapterLike) {
diff --git a/app/Services/Frontend/Consult/ConsultCreate.php b/app/Services/Frontend/Consult/ConsultCreate.php
index 94b94a3a..d2b0884a 100644
--- a/app/Services/Frontend/Consult/ConsultCreate.php
+++ b/app/Services/Frontend/Consult/ConsultCreate.php
@@ -15,7 +15,8 @@ use App\Validators\UserDailyLimit as UserDailyLimitValidator;
class ConsultCreate extends FrontendService
{
- use CourseTrait, ChapterTrait;
+ use CourseTrait;
+ use ChapterTrait;
public function handle()
{
@@ -35,6 +36,8 @@ class ConsultCreate extends FrontendService
$question = $validator->checkQuestion($post['question']);
+ $validator->checkIfDuplicated($chapter->id, $user->id, $question);
+
$priority = $this->getPriority($course, $user);
$consult = new ConsultModel();
@@ -44,6 +47,7 @@ class ConsultCreate extends FrontendService
$consult->course_id = $course->id;
$consult->chapter_id = $chapter->id;
$consult->user_id = $user->id;
+ $consult->published = 1;
$consult->create();
diff --git a/app/Services/Frontend/Consult/ConsultDelete.php b/app/Services/Frontend/Consult/ConsultDelete.php
index 4efaabfa..d0cc6d6e 100644
--- a/app/Services/Frontend/Consult/ConsultDelete.php
+++ b/app/Services/Frontend/Consult/ConsultDelete.php
@@ -11,7 +11,8 @@ use App\Validators\Consult as ConsultValidator;
class ConsultDelete extends FrontendService
{
- use CourseTrait, ConsultTrait;
+ use ConsultTrait;
+ use CourseTrait;
public function handle($id)
{
diff --git a/app/Services/Frontend/Consult/ConsultUpdate.php b/app/Services/Frontend/Consult/ConsultUpdate.php
index dd308300..c8f136b4 100644
--- a/app/Services/Frontend/Consult/ConsultUpdate.php
+++ b/app/Services/Frontend/Consult/ConsultUpdate.php
@@ -10,7 +10,8 @@ use App\Validators\Consult as ConsultValidator;
class ConsultUpdate extends FrontendService
{
- use CourseTrait, ConsultTrait;
+ use CourseTrait;
+ use ConsultTrait;
public function handle($id)
{
diff --git a/app/Services/Frontend/Course/CourseBasic.php b/app/Services/Frontend/Course/CourseInfoBasic.php
similarity index 96%
rename from app/Services/Frontend/Course/CourseBasic.php
rename to app/Services/Frontend/Course/CourseInfoBasic.php
index 73362717..0ed5339e 100644
--- a/app/Services/Frontend/Course/CourseBasic.php
+++ b/app/Services/Frontend/Course/CourseInfoBasic.php
@@ -6,7 +6,7 @@ use App\Models\Course as CourseModel;
use App\Services\Frontend\CourseTrait;
use App\Services\Frontend\Service as FrontendService;
-class CourseBasic extends FrontendService
+class CourseInfoBasic extends FrontendService
{
use CourseTrait;
diff --git a/app/Services/Frontend/Course/Favorite.php b/app/Services/Frontend/Course/Favorite.php
index c561bca6..799bdd81 100644
--- a/app/Services/Frontend/Course/Favorite.php
+++ b/app/Services/Frontend/Course/Favorite.php
@@ -5,9 +5,9 @@ namespace App\Services\Frontend\Course;
use App\Models\Course as CourseModel;
use App\Models\CourseFavorite as CourseFavoriteModel;
use App\Models\User as UserModel;
+use App\Repos\CourseFavorite as CourseFavoriteRepo;
use App\Services\Frontend\CourseTrait;
use App\Services\Frontend\Service as FrontendService;
-use App\Validators\Course as CourseValidator;
use App\Validators\UserDailyLimit as UserDailyLimitValidator;
class Favorite extends FrontendService
@@ -25,9 +25,9 @@ class Favorite extends FrontendService
$validator->checkFavoriteLimit($user);
- $validator = new CourseValidator();
+ $favoriteRepo = new CourseFavoriteRepo();
- $favorite = $validator->checkIfFavorited($course->id, $user->id);
+ $favorite = $favoriteRepo->findCourseFavorite($course->id, $user->id);
if (!$favorite) {
diff --git a/app/Services/Frontend/My/UserInfo.php b/app/Services/Frontend/My/UserInfo.php
index fde5af2d..9beb4abf 100644
--- a/app/Services/Frontend/My/UserInfo.php
+++ b/app/Services/Frontend/My/UserInfo.php
@@ -33,8 +33,6 @@ class UserInfo extends FrontendService
'lock_expiry_time' => $user->lock_expiry_time,
'edu_role' => $user->edu_role,
'admin_role' => $user->admin_role,
- 'notice_count' => $user->notice_count,
- 'msg_count' => $user->msg_count,
];
}
diff --git a/app/Services/Frontend/Review/ReviewDelete.php b/app/Services/Frontend/Review/ReviewDelete.php
index 25a0892b..986ca3f0 100644
--- a/app/Services/Frontend/Review/ReviewDelete.php
+++ b/app/Services/Frontend/Review/ReviewDelete.php
@@ -11,7 +11,8 @@ use App\Validators\Review as ReviewValidator;
class ReviewDelete extends FrontendService
{
- use CourseTrait, ReviewTrait;
+ use CourseTrait;
+ use ReviewTrait;
public function handle($id)
{
diff --git a/app/Services/Frontend/Review/ReviewUpdate.php b/app/Services/Frontend/Review/ReviewUpdate.php
index 0a7e7271..71af5a6d 100644
--- a/app/Services/Frontend/Review/ReviewUpdate.php
+++ b/app/Services/Frontend/Review/ReviewUpdate.php
@@ -10,7 +10,8 @@ use App\Validators\Review as ReviewValidator;
class ReviewUpdate extends FrontendService
{
- use CourseTrait, ReviewTrait;
+ use CourseTrait;
+ use ReviewTrait;
public function handle($id)
{
diff --git a/app/Validators/Chapter.php b/app/Validators/Chapter.php
index 5c42ca10..eb9e99d1 100644
--- a/app/Validators/Chapter.php
+++ b/app/Validators/Chapter.php
@@ -8,7 +8,6 @@ use App\Exceptions\BadRequest as BadRequestException;
use App\Models\Chapter as ChapterModel;
use App\Models\Course as CourseModel;
use App\Repos\Chapter as ChapterRepo;
-use App\Repos\ChapterLike as ChapterLikeRepo;
use App\Repos\Course as CourseRepo;
class Chapter extends Validator
@@ -174,19 +173,4 @@ class Chapter extends Validator
}
}
- public function checkIfLiked($chapterId, $userId)
- {
- $repo = new ChapterLikeRepo();
-
- $like = $repo->findChapterLike($chapterId, $userId);
-
- if ($like) {
- if ($like->deleted == 0 && time() - $like->create_time > 5 * 60) {
- throw new BadRequestException('chapter.has_liked');
- }
- }
-
- return $like;
- }
-
}
diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php
index 93ef050e..3d6fb578 100644
--- a/app/Validators/Consult.php
+++ b/app/Validators/Consult.php
@@ -42,7 +42,7 @@ class Consult extends Validator
$length = kg_strlen($value);
- if ($length < 5) {
+ if ($length < 15) {
throw new BadRequestException('consult.question_too_short');
}
@@ -59,7 +59,7 @@ class Consult extends Validator
$length = kg_strlen($value);
- if ($length < 5) {
+ if ($length < 15) {
throw new BadRequestException('consult.answer_too_short');
}
@@ -88,6 +88,30 @@ class Consult extends Validator
return $status;
}
+ public function checkIfDuplicated($chapterId, $userId, $question)
+ {
+ $repo = new ConsultRepo();
+
+ $consult = $repo->findUserLastChapterConsult($chapterId, $userId);
+
+ if (!$consult) return;
+
+ $subInQuestion = kg_substr($question, 0, 20);
+ $subDbQuestion = kg_substr($consult->question, 0, 20);
+
+ similar_text($subInQuestion, $subDbQuestion, $percent);
+
+ if ($percent > 80) {
+ throw new BadRequestException('consult.question_duplicated');
+ }
+
+ similar_text($question, $consult->question, $percent);
+
+ if ($percent > 80) {
+ throw new BadRequestException('consult.question_duplicated');
+ }
+ }
+
public function checkIfLiked($chapterId, $userId)
{
$repo = new ConsultLikeRepo();
diff --git a/app/Validators/Course.php b/app/Validators/Course.php
index 51861015..dd4057ef 100644
--- a/app/Validators/Course.php
+++ b/app/Validators/Course.php
@@ -8,7 +8,6 @@ use App\Exceptions\BadRequest as BadRequestException;
use App\Library\Validators\Common as CommonValidator;
use App\Models\Course as CourseModel;
use App\Repos\Course as CourseRepo;
-use App\Repos\CourseFavorite as CourseFavoriteRepo;
class Course extends Validator
{
@@ -243,19 +242,4 @@ class Course extends Validator
}
}
- public function checkIfFavorited($courseId, $userId)
- {
- $repo = new CourseFavoriteRepo();
-
- $favorite = $repo->findCourseFavorite($courseId, $userId);
-
- if ($favorite) {
- if ($favorite->deleted == 0 && time() - $favorite->create_time > 5 * 60) {
- throw new BadRequestException('course.has_favorited');
- }
- }
-
- return $favorite;
- }
-
}
diff --git a/config/errors.php b/config/errors.php
index 35c5e904..7375a372 100644
--- a/config/errors.php
+++ b/config/errors.php
@@ -112,7 +112,6 @@ $error['course.invalid_refund_expiry'] = '无效的退款期限';
$error['course.invalid_publish_status'] = '无效的发布状态';
$error['course.pub_chapter_not_found'] = '尚未发现已发布的课时';
$error['course.pub_chapter_not_enough'] = '已发布的课时太少（小于30%）';
-$error['course.has_favorited'] = '你已收藏过该课程啦';
/**
* 话题相关
@@ -159,7 +158,6 @@ $error['chapter.read_not_ready'] = '文章内容尚未就绪';
$error['chapter.live_not_start'] = '直播尚未开始';
$error['chapter.live_time_empty'] = '直播时间尚未设置';
$error['chapter.child_existed'] = '不允许相关操作（存在子章节）';
-$error['chapter.has_liked'] = '你已经点过赞啦';
/**
* 点播相关
@@ -201,9 +199,10 @@ $error['review.has_liked'] = '你已经点过赞啦';
$error['consult.not_found'] = '咨询不存在';
$error['consult.invalid_private_status'] = '无效的私密状态';
$error['consult.invalid_publish_status'] = '无效的发布状态';
-$error['consult.question_too_short'] = '问题内容太短（少于5个字符）';
+$error['consult.question_duplicated'] = '你已经咨询过类似问题啦';
+$error['consult.question_too_short'] = '问题内容太短（少于15个字符）';
$error['consult.question_too_long'] = '问题内容太长（多于1000个字符）';
-$error['consult.answer_too_short'] = '回复内容太短（少于5个字符）';
+$error['consult.answer_too_short'] = '回复内容太短（少于15个字符）';
$error['consult.answer_too_long'] = '回复内容太长（多于1000个字符）';
$error['consult.has_liked'] = '你已经点过赞啦';
diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css
index 3db71a4e..649cf051 100644
--- a/public/static/web/css/common.css
+++ b/public/static/web/css/common.css
@@ -450,6 +450,14 @@ body {
height: 118px;
}
+.course-meta .info span {
+ margin-right: 5px;
+}
+
+.course-meta .info .value {
+ color: #666;
+}
+
.course-meta .info .price {
color: red;
font-size: 14px;
@@ -459,13 +467,8 @@ body {
color: green;
}
-.course-meta .info span {
- color: #666;
- margin: 0 5px;
-}
-
.course-meta .rating span {
- margin: 0 3px;
+ margin-right: 5px;
}
.course-meta .rating .layui-icon {
@@ -841,6 +844,10 @@ body {
cursor: pointer;
}
+.share .layui-icon-star-fill {
+ color: orange;
+}
+
.share .active, .share .layui-icon:hover {
color: green;
}
@@ -870,6 +877,7 @@ body {
left: 180px;
bottom: 38px;
width: 420px;
+ z-index: 999;
display: none;
}
diff --git a/public/static/web/js/chapter.like.js b/public/static/web/js/chapter.like.js
index 3fc0e2a1..cc1dd00e 100644
--- a/public/static/web/js/chapter.like.js
+++ b/public/static/web/js/chapter.like.js
@@ -5,19 +5,22 @@ layui.use(['jquery', 'helper'], function () {
$('.icon-praise').on('click', function () {
var $this = $(this);
+ var $parent = $this.parent();
var $likeCount = $this.next();
var likeCount = parseInt($likeCount.text());
helper.checkLogin(function () {
$.ajax({
type: 'POST',
- url: $this.parent().data('url'),
+ url: $parent.data('url'),
success: function () {
if ($this.hasClass('active')) {
$this.removeClass('active');
+ $parent.attr('title', '点赞');
$likeCount.text(likeCount - 1);
likeCount -= 1;
} else {
$this.addClass('active');
+ $parent.attr('title', '取消点赞');
$likeCount.text(likeCount + 1);
likeCount += 1;
}
diff --git a/public/static/web/js/chapter.vod.player.js b/public/static/web/js/chapter.vod.player.js
index d8766fd2..6ab8a2ba 100644
--- a/public/static/web/js/chapter.vod.player.js
+++ b/public/static/web/js/chapter.vod.player.js
@@ -16,6 +16,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
var danmuListUrl = $('input[name="chapter.danmu_url"]').val();
var playUrls = JSON.parse($('input[name="chapter.play_urls"]').val());
var $danmuText = $('input[name="danmu.text"]');
+ var $danmuForm = $('.danmu-form');
var playerOptions = {
autoplay: false,
@@ -73,13 +74,24 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () {
*/
$('#player').hover(function () {
clearTimeout(dt);
- $('.danmu-form').show();
+ $danmuForm.show();
}, function () {
dt = setTimeout(function () {
- $('.danmu-form').hide();
+ $danmuForm.hide();
}, 2500);
});
+ /**
+ * 文本框获得焦点后清理dt，不然对输入有干扰
+ */
+ $danmuText.focus(function () {
+ clearTimeout(dt);
+ });
+
+ /**
+ * @todo 弹幕层和播放器控制层css有抵触，待解决
+ */
+
$('#danmu').danmu({
left: 20,
top: 20,
diff --git a/public/static/web/js/course.share.js b/public/static/web/js/course.share.js
index a47c6c2b..9b8941b9 100644
--- a/public/static/web/js/course.share.js
+++ b/public/static/web/js/course.share.js
@@ -1,8 +1,7 @@
-layui.use(['jquery', 'layer', 'helper'], function () {
+layui.use(['jquery', 'layer'], function () {
var $ = layui.jquery;
var layer = layui.layer;
- var helper = layui.helper;
var myShare = {
title: $('input[name="share.title"]').val(),
@@ -11,29 +10,6 @@ layui.use(['jquery', 'layer', 'helper'], function () {
qrcode: $('input[name="share.qrcode"]').val()
};
- $('.icon-praise').on('click', function () {
- var $this = $(this);
- var $likeCount = $this.next();
- var likeCount = parseInt($likeCount.text());
- helper.checkLogin(function () {
- $.ajax({
- type: 'POST',
- url: $this.parent().data('url'),
- success: function () {
- if ($this.hasClass('active')) {
- $this.removeClass('active');
- $likeCount.text(likeCount - 1);
- likeCount -= 1;
- } else {
- $this.addClass('active');
- $likeCount.text(likeCount + 1);
- likeCount += 1;
- }
- }
- });
- });
- });
-
$('.icon-wechat').on('click', function () {
var content = '
';
layer.open({
diff --git a/public/static/web/js/course.show.js b/public/static/web/js/course.show.js
index c7bddff0..ac11bb52 100644
--- a/public/static/web/js/course.show.js
+++ b/public/static/web/js/course.show.js
@@ -9,17 +9,20 @@ layui.use(['jquery', 'layer', 'helper'], function () {
*/
$('.icon-star').on('click', function () {
var $this = $(this);
+ var $parent = $this.parent();
helper.checkLogin(function () {
$.ajax({
type: 'POST',
- url: $this.parent().data('url'),
+ url: $parent.data('url'),
success: function () {
if ($this.hasClass('layui-icon-star-fill')) {
$this.removeClass('layui-icon-star-fill');
$this.addClass('layui-icon-star');
+ $parent.attr('title', '收藏');
} else {
$this.removeClass('layui-icon-star');
$this.addClass('layui-icon-star-fill');
+ $parent.attr('title', '取消收藏');
}
}
});
@@ -74,19 +77,22 @@ layui.use(['jquery', 'layer', 'helper'], function () {
*/
$('body').on('click', '.icon-praise', function () {
var $this = $(this);
+ var $parent = $this.parent();
var $likeCount = $this.next();
var likeCount = parseInt($likeCount.text());
helper.checkLogin(function () {
$.ajax({
type: 'POST',
- url: $this.parent().data('url'),
+ url: $parent.data('url'),
success: function () {
if ($this.hasClass('active')) {
$this.removeClass('active');
+ $parent.attr('title', '点赞');
$likeCount.text(likeCount - 1);
likeCount -= 1;
} else {
$this.addClass('active');
+ $parent.attr('title', '取消点赞');
$likeCount.text(likeCount + 1);
likeCount += 1;
}