From 8c90b359916186f88549f0bb66c3c058119dd306 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Thu, 30 Jul 2020 20:50:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=A1=B5=E7=BB=86=E5=88=86?= =?UTF-8?q?=E7=95=85=E5=AD=A6=E5=92=8C=E4=BC=98=E6=83=A0=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Views/chapter/edit_lesson_vod.volt | 4 +- .../Admin/Views/partials/media_uploader.volt | 3 +- .../Web/Controllers/ImGroupController.php | 8 ++++ app/Http/Web/Controllers/VipController.php | 6 ++- app/Http/Web/Views/course/show.volt | 24 ++++++------ app/Http/Web/Views/im/find_users.volt | 2 +- app/Http/Web/Views/my/menu.volt | 10 +++++ app/Http/Web/Views/partials/macro_course.volt | 10 ++--- app/Http/Web/Views/teacher/pager.volt | 12 +++--- app/Http/Web/Views/user/friends.volt | 16 +++++--- app/Http/Web/Views/user/groups.volt | 25 ++++++++++++ app/Http/Web/Views/user/show.volt | 38 ++++++++++++++----- app/Http/Web/Views/vip/index.volt | 13 ++++--- app/Http/Web/Views/vip/users.volt | 21 ++++++---- app/Library/Helper.php | 7 +++- app/Library/Utils/FileInfo.php | 26 ++++++++++--- app/Repos/Course.php | 4 +- app/Repos/ImUser.php | 16 ++++++++ app/Repos/User.php | 30 ++++++++++++++- app/Services/Frontend/User/CourseList.php | 2 - app/Services/Frontend/User/UserInfo.php | 9 +++++ app/Services/Frontend/Vip/CourseList.php | 4 +- app/Services/Frontend/Vip/UserList.php | 1 + app/Services/Storage.php | 14 +++++-- composer.json | 1 + public/static/lib/spark-md5.min.js | 1 + public/static/web/css/common.css | 22 +++++------ public/static/web/js/user.show.js | 7 ++++ public/static/web/js/vip.js | 11 ++++-- 29 files changed, 259 insertions(+), 88 deletions(-) create mode 100644 app/Http/Web/Views/user/groups.volt create mode 100644 public/static/lib/spark-md5.min.js diff --git a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt index 3ffdbb1c..1d528c97 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt @@ -32,7 +32,7 @@ 上传视频 -
+
@@ -54,7 +54,7 @@
- +
diff --git a/app/Http/Admin/Views/partials/media_uploader.volt b/app/Http/Admin/Views/partials/media_uploader.volt index e6512799..e416e276 100644 --- a/app/Http/Admin/Views/partials/media_uploader.volt +++ b/app/Http/Admin/Views/partials/media_uploader.volt @@ -50,10 +50,9 @@ uploader.done().then(function (result) { $('input[name=file_id]').val(result.fileId); - var chapterId = $('input[name=chapter_id]').val(); $.ajax({ type: 'POST', - url: '/admin/chapter/' + chapterId + '/content', + url: $('#vod-form').attr('action'), data: {file_id: result.fileId} }); }); diff --git a/app/Http/Web/Controllers/ImGroupController.php b/app/Http/Web/Controllers/ImGroupController.php index f9553789..10fe63a7 100644 --- a/app/Http/Web/Controllers/ImGroupController.php +++ b/app/Http/Web/Controllers/ImGroupController.php @@ -18,6 +18,14 @@ class ImGroupController extends Controller } + /** + * @Get("/{id:[0-9]+}", name="web.im_group.show") + */ + public function showAction($id) + { + + } + /** * @Get("/{id:[0-9]+}/users", name="web.im_group.users") */ diff --git a/app/Http/Web/Controllers/VipController.php b/app/Http/Web/Controllers/VipController.php index 8f5dd2d4..187d00ca 100644 --- a/app/Http/Web/Controllers/VipController.php +++ b/app/Http/Web/Controllers/VipController.php @@ -30,11 +30,13 @@ class VipController extends Controller */ public function coursesAction() { + $type = $this->request->getQuery('type', 'trim', 'discount'); + $service = new VipCourseListService(); - $pager = $service->handle(); + $pager = $service->handle($type); $pager->items = kg_array_object($pager->items); - $pager->target = 'tab-courses'; + $pager->target = "tab-{$type}-courses"; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('pager', $pager); diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index d9d4d409..14b98c15 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -30,26 +30,26 @@
- {% set show_tab_chapters = course.lesson_count > 0 ? 1 : 0 %} - {% set show_tab_packages = course.package_count > 0 ? 1 : 0 %} - {% set show_tab_consults = course.consult_count > 0 ? 1 : 0 %} - {% set show_tab_reviews = course.review_count > 0 ? 1 : 0 %} + {% set show_tab_chapters = course.lesson_count > 0 %} + {% set show_tab_packages = course.package_count > 0 %} + {% set show_tab_consults = course.consult_count > 0 %} + {% set show_tab_reviews = course.review_count > 0 %}
  • 详情
    • - {% if show_tab_chapters == 1 %} + {% if show_tab_chapters %}
  • 目录{{ course.lesson_count }}
    • {% endif %} - {% if show_tab_packages == 1 %} + {% if show_tab_packages %}
  • 套餐{{ course.package_count }}
    • {% endif %} - {% if show_tab_consults == 1 %} + {% if show_tab_consults %}
  • 咨询{{ course.consult_count }}
    • {% endif %} - {% if show_tab_reviews == 1 %} + {% if show_tab_reviews %}
  • 评价{{ course.review_count }}
    • {% endif %}
@@ -57,19 +57,19 @@
{{ course.details }}
- {% if show_tab_chapters == 1 %} + {% if show_tab_chapters %} {% set chapters_url = url({'for':'web.course.chapters','id':course.id}) %}
{% endif %} - {% if show_tab_packages == 1 %} + {% if show_tab_packages %} {% set packages_url = url({'for':'web.course.packages','id':course.id}) %}
{% endif %} - {% if show_tab_consults == 1 %} + {% if show_tab_consults %} {% set consults_url = url({'for':'web.course.consults','id':course.id}) %}
{% endif %} - {% if show_tab_reviews == 1 %} + {% if show_tab_reviews %} {% set reviews_url = url({'for':'web.course.reviews','id':course.id}) %}
{% endif %} diff --git a/app/Http/Web/Views/im/find_users.volt b/app/Http/Web/Views/im/find_users.volt index 21c49110..2f259411 100644 --- a/app/Http/Web/Views/im/find_users.volt +++ b/app/Http/Web/Views/im/find_users.volt @@ -5,7 +5,7 @@
{% if item.vip == 1 %} - 会员 + VIP {% endif %}
{{ item.name }} diff --git a/app/Http/Web/Views/my/menu.volt b/app/Http/Web/Views/my/menu.volt index 4b5bc5cc..3ea4d110 100644 --- a/app/Http/Web/Views/my/menu.volt +++ b/app/Http/Web/Views/my/menu.volt @@ -14,6 +14,16 @@
{{ auth_user.name }} {{ vip_info(auth_user) }}
+
+
教学中心
+
+ +
+
+
课程中心
diff --git a/app/Http/Web/Views/partials/macro_course.volt b/app/Http/Web/Views/partials/macro_course.volt index 12ceedfa..95690991 100644 --- a/app/Http/Web/Views/partials/macro_course.volt +++ b/app/Http/Web/Views/partials/macro_course.volt @@ -93,7 +93,7 @@ {%- macro learning_course_card(item) %} {% set course_title = item.course.title|e %} {% set course_url = url({'for':'web.course.show','id':item.course.id}) %} -
+
{{ course_title }} @@ -103,12 +103,10 @@
{{ course_title }}
-
-
-
-
+
+ 已学习 {{ item.duration|duration }} + 已完成 {{ item.progress }}%
-
已学习 {{ item.duration|duration }}
{%- endmacro %} \ No newline at end of file diff --git a/app/Http/Web/Views/teacher/pager.volt b/app/Http/Web/Views/teacher/pager.volt index 6cb4e625..3866530a 100644 --- a/app/Http/Web/Views/teacher/pager.volt +++ b/app/Http/Web/Views/teacher/pager.volt @@ -1,17 +1,19 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set user_title = item.title ? item.title : '小小教书匠' %} - {% set user_about = item.about ? item.about|e : '这个人很懒，什么都没留下' %} + {% set user_about = item.about ? item.about : '这个人很懒，什么都没留下' %} {% set user_url = url({'for':'web.teacher.show','id':item.id}) %} -
+
- {{ item.name }} + + {{ item.name }} +
- {{ item.name }} + {{ item.name }}
{{ user_title }}
diff --git a/app/Http/Web/Views/user/friends.volt b/app/Http/Web/Views/user/friends.volt index fa61874e..ecaf86b5 100644 --- a/app/Http/Web/Views/user/friends.volt +++ b/app/Http/Web/Views/user/friends.volt @@ -1,18 +1,24 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} + {% set user_about = item.about ? item.about : '这个人很懒，什么都没留下' %} + {% set user_url = url({'for':'web.user.show','id':item.id}) %}
{% if item.vip == 1 %} - 会员 + VIP {% endif %}
- {{ item.name }} + + {{ item.name }} + +
+
+ {{ item.name }}
-
{{ item.name }}
- 加为好友 +
diff --git a/app/Http/Web/Views/user/groups.volt b/app/Http/Web/Views/user/groups.volt new file mode 100644 index 00000000..e5e60db6 --- /dev/null +++ b/app/Http/Web/Views/user/groups.volt @@ -0,0 +1,25 @@ +{% if pager.total_pages > 0 %} +
+
+ {% for item in pager.items %} + {% set group_url = url({'for':'web.im_group.show','id':item.id}) %} +
+
+
+ + {{ item.name }} + +
+
+ {{ item.name }} +
+
+ +
+
+
+ {% endfor %} +
+
+ {{ partial('partials/pager_ajax') }} +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/user/show.volt b/app/Http/Web/Views/user/show.volt index bfb90fd1..f2445e11 100644 --- a/app/Http/Web/Views/user/show.volt +++ b/app/Http/Web/Views/user/show.volt @@ -11,7 +11,7 @@ {{ user.name }}
-

{{ user.name }} {{ vip_flag }}

+

{{ user.name }} {{ vip_flag }}

{{ user.location }}

{{ date('Y-m-d H:i',user.active_time) }}

@@ -20,21 +20,41 @@ {% endif %}
- {% set courses_url = url({'for':'web.user.courses','id':user.id},{'limit':12}) %} - {% set favorites_url = url({'for':'web.user.favorites','id':user.id},{'limit':12}) %} - {% set friends_url = url({'for':'web.user.friends','id':user.id},{'limit':12}) %} + {% set show_tab_courses = user.course_count > 0 %} + {% set show_tab_favorites = user.favorite_count > 0 %} + {% set show_tab_friends = user.friend_count > 0 %} + {% set show_tab_groups = user.group_count > 0 %} + + {% set courses_url = url({'for':'web.user.courses','id':user.id}) %} + {% set favorites_url = url({'for':'web.user.favorites','id':user.id}) %} + {% set friends_url = url({'for':'web.user.friends','id':user.id}) %} + {% set groups_url = url({'for':'web.user.groups','id':user.id}) %}
    -
  • 课程
    • -
  • 收藏
    • -
  • 好友
    • +
  • 课程{{ user.course_count }}
    • + {% if show_tab_favorites %} +
  • 收藏{{ user.favorite_count }}
    • + {% endif %} + {% if show_tab_friends %} +
  • 好友{{ user.friend_count }}
    • + {% endif %} + {% if show_tab_groups %} +
  • 群组{{ user.group_count }}
    • + {% endif %}
-
-
+ {% if show_tab_favorites %} +
+ {% endif %} + {% if show_tab_friends %} +
+ {% endif %} + {% if show_tab_groups %} +
+ {% endif %}
diff --git a/app/Http/Web/Views/vip/index.volt b/app/Http/Web/Views/vip/index.volt index fe9d2bdf..0c87b92b 100644 --- a/app/Http/Web/Views/vip/index.volt +++ b/app/Http/Web/Views/vip/index.volt @@ -30,17 +30,20 @@
- {% set courses_url = url({'for':'web.vip.courses'},{'limit':12}) %} - {% set users_url = url({'for':'web.vip.users'},{'limit':12}) %} + {% set free_courses_url = url({'for':'web.vip.courses'},{'type':'free'}) %} + {% set discount_courses_url = url({'for':'web.vip.courses'},{'type':'discount'}) %} + {% set users_url = url({'for':'web.vip.users'}) %}
    -
  • 课程
    • -
  • 成员
    • +
  • 优惠课程
    • +
  • 畅学课程
    • +
  • 新进会员
-
+
+
diff --git a/app/Http/Web/Views/vip/users.volt b/app/Http/Web/Views/vip/users.volt index c40bac25..44f4512e 100644 --- a/app/Http/Web/Views/vip/users.volt +++ b/app/Http/Web/Views/vip/users.volt @@ -1,19 +1,24 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} - {% set user_about = item.about ? item.about|e : '这个人很懒，什么都没留下' %} + {% set user_about = item.about ? item.about : '这个人很懒，什么都没留下' %} {% set user_url = url({'for':'web.user.show','id':item.id}) %} -
-
+
+
+ {% if item.vip == 1 %} + VIP + {% endif %}
- {{ item.name }} + + {{ item.name }} +
- {{ item.name }} + {{ item.name }}
-
- vip +
+
diff --git a/app/Library/Helper.php b/app/Library/Helper.php index c9509bd2..6bd91302 100644 --- a/app/Library/Helper.php +++ b/app/Library/Helper.php @@ -293,9 +293,10 @@ function kg_time_ago($time) * 格式化时长 * * @param int $time + * @param string $mode * @return string */ -function kg_duration($time) +function kg_duration($time, $mode = 'simple') { $result = '00分钟'; @@ -319,6 +320,10 @@ function kg_duration($time) $format[] = sprintf('%02d秒', $seconds); } + if ($mode == 'simple') { + $format = array_slice($format, 0, 2); + } + $result = implode('', $format); } diff --git a/app/Library/Utils/FileInfo.php b/app/Library/Utils/FileInfo.php index b294c412..8dbb4102 100644 --- a/app/Library/Utils/FileInfo.php +++ b/app/Library/Utils/FileInfo.php @@ -5,7 +5,7 @@ namespace App\Library\Utils; class FileInfo { - static function isVideo($mine) + public static function isVideo($mine) { $case1 = self::isSecure($mine); @@ -14,7 +14,7 @@ class FileInfo return $case1 && $case2; } - static function isAudio($mine) + public static function isAudio($mine) { $case1 = self::isSecure($mine); @@ -23,7 +23,7 @@ class FileInfo return $case1 && $case2; } - static function isImage($mine) + public static function isImage($mine) { $case1 = self::isSecure($mine); @@ -32,12 +32,26 @@ class FileInfo return $case1 && $case2; } - static function isSecure($mine) + public static function isSecure($mine) { - return in_array($mine, self::mineTypes()); + return in_array($mine, self::getMineTypes()); } - static function mineTypes() + public static function getMineType($file) + { + $info = new \finfo(FILEINFO_MIME_TYPE); + + return $info->file($file); + } + + public static function getMineTypeByExt($ext) + { + $mineTypes = self::getMineTypes(); + + return $mineTypes[$ext] ?? null; + } + + public static function getMineTypes() { return [ 'aac' => 'audio/aac', diff --git a/app/Repos/Course.php b/app/Repos/Course.php index 43c984e5..38229e97 100644 --- a/app/Repos/Course.php +++ b/app/Repos/Course.php @@ -76,9 +76,11 @@ class Course extends Repository if ($sort == 'free') { $builder->andWhere('market_price = 0'); - } elseif ($sort == 'vip') { + } elseif ($sort == 'vip_discount') { $builder->andWhere('vip_price < market_price'); + $builder->andWhere('vip_price > 0'); } elseif ($sort == 'vip_free') { + $builder->andWhere('market_price > 0'); $builder->andWhere('vip_price = 0'); } diff --git a/app/Repos/ImUser.php b/app/Repos/ImUser.php index 411c4289..56879c3c 100644 --- a/app/Repos/ImUser.php +++ b/app/Repos/ImUser.php @@ -162,4 +162,20 @@ class ImUser extends Repository ]); } + public function countFriends($userId) + { + return (int)ImFriendUserModel::count([ + 'conditions' => 'user_id = :user_id:', + 'bind' => ['user_id' => $userId], + ]); + } + + public function countGroups($userId) + { + return (int)ImGroupUserModel::count([ + 'conditions' => 'user_id = :user_id:', + 'bind' => ['user_id' => $userId], + ]); + } + } diff --git a/app/Repos/User.php b/app/Repos/User.php index 42229ecd..f5696e74 100644 --- a/app/Repos/User.php +++ b/app/Repos/User.php @@ -3,6 +3,9 @@ namespace App\Repos; use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; +use App\Models\CourseFavorite as CourseFavoriteModel; +use App\Models\CourseUser as CourseUserModel; +use App\Models\ImUser as ImUserModel; use App\Models\User as UserModel; use Phalcon\Mvc\Model; use Phalcon\Mvc\Model\Resultset; @@ -98,6 +101,15 @@ class User extends Repository ->execute(); } + /** + * @param int $id + * @return ImUserModel|Model|bool + */ + public function findImUser($id) + { + return ImUserModel::findFirst($id); + } + /** * @return ResultsetInterface|Resultset|UserModel[] */ @@ -113,7 +125,23 @@ class User extends Repository public function countUsers() { - return (int)UserModel::count(['conditions' => 'deleted = 0']); + return (int)UserModel::count(); + } + + public function countCourses($userId) + { + return (int)CourseUserModel::count([ + 'conditions' => 'user_id = :user_id: AND deleted = 0', + 'bind' => ['user_id' => $userId], + ]); + } + + public function countFavorites($userId) + { + return (int)CourseFavoriteModel::count([ + 'conditions' => 'user_id = :user_id: AND deleted = 0', + 'bind' => ['user_id' => $userId], + ]); } } diff --git a/app/Services/Frontend/User/CourseList.php b/app/Services/Frontend/User/CourseList.php index 75457f14..af18e6ca 100644 --- a/app/Services/Frontend/User/CourseList.php +++ b/app/Services/Frontend/User/CourseList.php @@ -4,7 +4,6 @@ namespace App\Services\Frontend\User; use App\Builders\CourseUserList as CourseUserListBuilder; use App\Library\Paginator\Query as PagerQuery; -use App\Models\CourseUser as CourseUserModel; use App\Repos\CourseUser as CourseUserRepo; use App\Services\Frontend\Service as FrontendService; use App\Services\Frontend\UserTrait; @@ -23,7 +22,6 @@ class CourseList extends FrontendService $params = $pagerQuery->getParams(); $params['user_id'] = $user->id; - $params['role_type'] = CourseUserModel::ROLE_STUDENT; $params['deleted'] = 0; $sort = $pagerQuery->getSort(); diff --git a/app/Services/Frontend/User/UserInfo.php b/app/Services/Frontend/User/UserInfo.php index 919f93f9..48b0ccda 100644 --- a/app/Services/Frontend/User/UserInfo.php +++ b/app/Services/Frontend/User/UserInfo.php @@ -3,6 +3,7 @@ namespace App\Services\Frontend\User; use App\Models\User as UserModel; +use App\Repos\User as UserRepo; use App\Services\Frontend\Service as FrontendService; use App\Services\Frontend\UserTrait; @@ -20,6 +21,10 @@ class UserInfo extends FrontendService protected function handleUser(UserModel $user) { + $userRepo = new UserRepo(); + + $imUser = $userRepo->findImUser($user->id); + return [ 'id' => $user->id, 'name' => $user->name, @@ -30,6 +35,10 @@ class UserInfo extends FrontendService 'gender' => $user->gender, 'vip' => $user->vip, 'locked' => $user->locked, + 'course_count' => $user->course_count, + 'favorite_count' => $user->favorite_count, + 'friend_count' => $imUser->friend_count, + 'group_count' => $imUser->group_count, 'active_time' => $user->active_time, 'create_time' => $user->create_time, ]; diff --git a/app/Services/Frontend/Vip/CourseList.php b/app/Services/Frontend/Vip/CourseList.php index cf9b98f4..0a9b6d1b 100644 --- a/app/Services/Frontend/Vip/CourseList.php +++ b/app/Services/Frontend/Vip/CourseList.php @@ -9,7 +9,7 @@ use App\Services\Frontend\Service as FrontendService; class CourseList extends FrontendService { - public function handle() + public function handle($type) { $pagerQuery = new PagerQuery(); @@ -18,7 +18,7 @@ class CourseList extends FrontendService $params['published'] = 1; $params['deleted'] = 0; - $sort = 'vip'; + $sort = $type == 'discount' ? 'vip_discount' : 'vip_free'; $page = $pagerQuery->getPage(); $limit = $pagerQuery->getLimit(); diff --git a/app/Services/Frontend/Vip/UserList.php b/app/Services/Frontend/Vip/UserList.php index ee0ddf0e..d282760a 100644 --- a/app/Services/Frontend/Vip/UserList.php +++ b/app/Services/Frontend/Vip/UserList.php @@ -51,6 +51,7 @@ class UserList extends FrontendService 'avatar' => $user['avatar'], 'title' => $user['title'], 'about' => $user['about'], + 'vip' => $user['vip'], ]; } diff --git a/app/Services/Storage.php b/app/Services/Storage.php index 8e1ec5fc..2d53624a 100644 --- a/app/Services/Storage.php +++ b/app/Services/Storage.php @@ -2,6 +2,7 @@ namespace App\Services; +use App\Library\Utils\FileInfo; use App\Models\ContentImage as ContentImageModel; use Phalcon\Logger\Adapter\File as FileLogger; use Qcloud\Cos\Client as CosClient; @@ -104,6 +105,9 @@ class Storage extends Service $files = $this->request->getUploadedFiles(true); foreach ($files as $file) { + if (!FileInfo::isImage($file->getRealType())) { + continue; + } $extension = $this->getFileExtension($file->getName()); $keyName = $this->generateFileName($extension, $prefix); $path = $this->putFile($keyName, $file->getTempName()); @@ -136,6 +140,7 @@ class Storage extends Service } catch (\Exception $e) { $this->logger->error('Put String Exception ' . kg_json_encode([ + 'line' => $e->getLine(), 'code' => $e->getCode(), 'message' => $e->getMessage(), ])); @@ -168,6 +173,7 @@ class Storage extends Service } catch (\Exception $e) { $this->logger->error('Put File Exception ' . kg_json_encode([ + 'line' => $e->getLine(), 'code' => $e->getCode(), 'message' => $e->getMessage(), ])); @@ -200,6 +206,7 @@ class Storage extends Service } catch (\Exception $e) { $this->logger->error('Delete Object Exception ' . kg_json_encode([ + 'line' => $e->getLine(), 'code' => $e->getCode(), 'message' => $e->getMessage(), ])); @@ -223,12 +230,11 @@ class Storage extends Service /** * 获取数据万象图片URL + * * @param string $key - * @param int $width - * @param int $height * @return string */ - public function getCiImageUrl($key, $width = 0, $height = 0) + public function getCiImageUrl($key) { return $this->getCiBaseUrl() . $key; } @@ -287,7 +293,7 @@ class Storage extends Service } /** - * 获取 CosClient + * 获取CosClient * * @return CosClient */ diff --git a/composer.json b/composer.json index b58e95db..7378a4fa 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,7 @@ "ext-redis": "~4.3", "ext-pdo": "*", "ext-json": "*", + "ext-fileinfo": "*", "phalcon/incubator": "^3.4", "guzzlehttp/guzzle": "^6.3", "swiftmailer/swiftmailer": "^6.0", diff --git a/public/static/lib/spark-md5.min.js b/public/static/lib/spark-md5.min.js new file mode 100644 index 00000000..c849910c --- /dev/null +++ b/public/static/lib/spark-md5.min.js @@ -0,0 +1 @@ +(function(factory){if(typeof exports==="object"){module.exports=factory()}else if(typeof define==="function"&&define.amd){define(factory)}else{var glob;try{glob=window}catch(e){glob=self}glob.SparkMD5=factory()}})(function(undefined){"use strict";var add32=function(a,b){return a+b&4294967295},hex_chr=["0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"];function cmn(q,a,b,x,s,t){a=add32(add32(a,q),add32(x,t));return add32(a<>>32-s,b)}function md5cycle(x,k){var a=x[0],b=x[1],c=x[2],d=x[3];a+=(b&c|~b&d)+k[0]-680876936|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[1]-389564586|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[2]+606105819|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[3]-1044525330|0;b=(b<<22|b>>>10)+c|0;a+=(b&c|~b&d)+k[4]-176418897|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[5]+1200080426|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[6]-1473231341|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[7]-45705983|0;b=(b<<22|b>>>10)+c|0;a+=(b&c|~b&d)+k[8]+1770035416|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[9]-1958414417|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[10]-42063|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[11]-1990404162|0;b=(b<<22|b>>>10)+c|0;a+=(b&c|~b&d)+k[12]+1804603682|0;a=(a<<7|a>>>25)+b|0;d+=(a&b|~a&c)+k[13]-40341101|0;d=(d<<12|d>>>20)+a|0;c+=(d&a|~d&b)+k[14]-1502002290|0;c=(c<<17|c>>>15)+d|0;b+=(c&d|~c&a)+k[15]+1236535329|0;b=(b<<22|b>>>10)+c|0;a+=(b&d|c&~d)+k[1]-165796510|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[6]-1069501632|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[11]+643717713|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[0]-373897302|0;b=(b<<20|b>>>12)+c|0;a+=(b&d|c&~d)+k[5]-701558691|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[10]+38016083|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[15]-660478335|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[4]-405537848|0;b=(b<<20|b>>>12)+c|0;a+=(b&d|c&~d)+k[9]+568446438|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[14]-1019803690|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[3]-187363961|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[8]+1163531501|0;b=(b<<20|b>>>12)+c|0;a+=(b&d|c&~d)+k[13]-1444681467|0;a=(a<<5|a>>>27)+b|0;d+=(a&c|b&~c)+k[2]-51403784|0;d=(d<<9|d>>>23)+a|0;c+=(d&b|a&~b)+k[7]+1735328473|0;c=(c<<14|c>>>18)+d|0;b+=(c&a|d&~a)+k[12]-1926607734|0;b=(b<<20|b>>>12)+c|0;a+=(b^c^d)+k[5]-378558|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[8]-2022574463|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[11]+1839030562|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[14]-35309556|0;b=(b<<23|b>>>9)+c|0;a+=(b^c^d)+k[1]-1530992060|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[4]+1272893353|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[7]-155497632|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[10]-1094730640|0;b=(b<<23|b>>>9)+c|0;a+=(b^c^d)+k[13]+681279174|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[0]-358537222|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[3]-722521979|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[6]+76029189|0;b=(b<<23|b>>>9)+c|0;a+=(b^c^d)+k[9]-640364487|0;a=(a<<4|a>>>28)+b|0;d+=(a^b^c)+k[12]-421815835|0;d=(d<<11|d>>>21)+a|0;c+=(d^a^b)+k[15]+530742520|0;c=(c<<16|c>>>16)+d|0;b+=(c^d^a)+k[2]-995338651|0;b=(b<<23|b>>>9)+c|0;a+=(c^(b|~d))+k[0]-198630844|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[7]+1126891415|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[14]-1416354905|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[5]-57434055|0;b=(b<<21|b>>>11)+c|0;a+=(c^(b|~d))+k[12]+1700485571|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[3]-1894986606|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[10]-1051523|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[1]-2054922799|0;b=(b<<21|b>>>11)+c|0;a+=(c^(b|~d))+k[8]+1873313359|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[15]-30611744|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[6]-1560198380|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[13]+1309151649|0;b=(b<<21|b>>>11)+c|0;a+=(c^(b|~d))+k[4]-145523070|0;a=(a<<6|a>>>26)+b|0;d+=(b^(a|~c))+k[11]-1120210379|0;d=(d<<10|d>>>22)+a|0;c+=(a^(d|~b))+k[2]+718787259|0;c=(c<<15|c>>>17)+d|0;b+=(d^(c|~a))+k[9]-343485551|0;b=(b<<21|b>>>11)+c|0;x[0]=a+x[0]|0;x[1]=b+x[1]|0;x[2]=c+x[2]|0;x[3]=d+x[3]|0}function md5blk(s){var md5blks=[],i;for(i=0;i<64;i+=4){md5blks[i>>2]=s.charCodeAt(i)+(s.charCodeAt(i+1)<<8)+(s.charCodeAt(i+2)<<16)+(s.charCodeAt(i+3)<<24)}return md5blks}function md5blk_array(a){var md5blks=[],i;for(i=0;i<64;i+=4){md5blks[i>>2]=a[i]+(a[i+1]<<8)+(a[i+2]<<16)+(a[i+3]<<24)}return md5blks}function md51(s){var n=s.length,state=[1732584193,-271733879,-1732584194,271733878],i,length,tail,tmp,lo,hi;for(i=64;i<=n;i+=64){md5cycle(state,md5blk(s.substring(i-64,i)))}s=s.substring(i-64);length=s.length;tail=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];for(i=0;i>2]|=s.charCodeAt(i)<<(i%4<<3)}tail[i>>2]|=128<<(i%4<<3);if(i>55){md5cycle(state,tail);for(i=0;i<16;i+=1){tail[i]=0}}tmp=n*8;tmp=tmp.toString(16).match(/(.*?)(.{0,8})$/);lo=parseInt(tmp[2],16);hi=parseInt(tmp[1],16)||0;tail[14]=lo;tail[15]=hi;md5cycle(state,tail);return state}function md51_array(a){var n=a.length,state=[1732584193,-271733879,-1732584194,271733878],i,length,tail,tmp,lo,hi;for(i=64;i<=n;i+=64){md5cycle(state,md5blk_array(a.subarray(i-64,i)))}a=i-64>2]|=a[i]<<(i%4<<3)}tail[i>>2]|=128<<(i%4<<3);if(i>55){md5cycle(state,tail);for(i=0;i<16;i+=1){tail[i]=0}}tmp=n*8;tmp=tmp.toString(16).match(/(.*?)(.{0,8})$/);lo=parseInt(tmp[2],16);hi=parseInt(tmp[1],16)||0;tail[14]=lo;tail[15]=hi;md5cycle(state,tail);return state}function rhex(n){var s="",j;for(j=0;j<4;j+=1){s+=hex_chr[n>>j*8+4&15]+hex_chr[n>>j*8&15]}return s}function hex(x){var i;for(i=0;i>16)+(y>>16)+(lsw>>16);return msw<<16|lsw&65535}}if(typeof ArrayBuffer!=="undefined"&&!ArrayBuffer.prototype.slice){(function(){function clamp(val,length){val=val|0||0;if(val<0){return Math.max(val+length,0)}return Math.min(val,length)}ArrayBuffer.prototype.slice=function(from,to){var length=this.byteLength,begin=clamp(from,length),end=length,num,target,targetArray,sourceArray;if(to!==undefined){end=clamp(to,length)}if(begin>end){return new ArrayBuffer(0)}num=end-begin;target=new ArrayBuffer(num);targetArray=new Uint8Array(target);sourceArray=new Uint8Array(this,begin,num);targetArray.set(sourceArray);return target}})()}function toUtf8(str){if(/[\u0080-\uFFFF]/.test(str)){str=unescape(encodeURIComponent(str))}return str}function utf8Str2ArrayBuffer(str,returnUInt8Array){var length=str.length,buff=new ArrayBuffer(length),arr=new Uint8Array(buff),i;for(i=0;i>2]|=buff.charCodeAt(i)<<(i%4<<3)}this._finish(tail,length);ret=hex(this._hash);if(raw){ret=hexToBinaryString(ret)}this.reset();return ret};SparkMD5.prototype.reset=function(){this._buff="";this._length=0;this._hash=[1732584193,-271733879,-1732584194,271733878];return this};SparkMD5.prototype.getState=function(){return{buff:this._buff,length:this._length,hash:this._hash.slice()}};SparkMD5.prototype.setState=function(state){this._buff=state.buff;this._length=state.length;this._hash=state.hash;return this};SparkMD5.prototype.destroy=function(){delete this._hash;delete this._buff;delete this._length};SparkMD5.prototype._finish=function(tail,length){var i=length,tmp,lo,hi;tail[i>>2]|=128<<(i%4<<3);if(i>55){md5cycle(this._hash,tail);for(i=0;i<16;i+=1){tail[i]=0}}tmp=this._length*8;tmp=tmp.toString(16).match(/(.*?)(.{0,8})$/);lo=parseInt(tmp[2],16);hi=parseInt(tmp[1],16)||0;tail[14]=lo;tail[15]=hi;md5cycle(this._hash,tail)};SparkMD5.hash=function(str,raw){return SparkMD5.hashBinary(toUtf8(str),raw)};SparkMD5.hashBinary=function(content,raw){var hash=md51(content),ret=hex(hash);return raw?hexToBinaryString(ret):ret};SparkMD5.ArrayBuffer=function(){this.reset()};SparkMD5.ArrayBuffer.prototype.append=function(arr){var buff=concatenateArrayBuffers(this._buff.buffer,arr,true),length=buff.length,i;this._length+=arr.byteLength;for(i=64;i<=length;i+=64){md5cycle(this._hash,md5blk_array(buff.subarray(i-64,i)))}this._buff=i-64>2]|=buff[i]<<(i%4<<3)}this._finish(tail,length);ret=hex(this._hash);if(raw){ret=hexToBinaryString(ret)}this.reset();return ret};SparkMD5.ArrayBuffer.prototype.reset=function(){this._buff=new Uint8Array(0);this._length=0;this._hash=[1732584193,-271733879,-1732584194,271733878];return this};SparkMD5.ArrayBuffer.prototype.getState=function(){var state=SparkMD5.prototype.getState.call(this);state.buff=arrayBuffer2Utf8Str(state.buff);return state};SparkMD5.ArrayBuffer.prototype.setState=function(state){state.buff=utf8Str2ArrayBuffer(state.buff,true);return SparkMD5.prototype.setState.call(this,state)};SparkMD5.ArrayBuffer.prototype.destroy=SparkMD5.prototype.destroy;SparkMD5.ArrayBuffer.prototype._finish=SparkMD5.prototype._finish;SparkMD5.ArrayBuffer.hash=function(arr,raw){var hash=md51_array(new Uint8Array(arr)),ret=hex(hash);return raw?hexToBinaryString(ret):ret};return SparkMD5}); \ No newline at end of file diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 0a501496..b0990dd9 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -1266,12 +1266,8 @@ body { color: #666; } -.teach-user-list { - margin-bottom: 30px; -} - -.vip-user-list { - margin-bottom: 30px; +.user-list { + margin-bottom: 20px; } .user-card { @@ -1302,6 +1298,7 @@ body { } .user-card .name { + padding: 0 10px; margin-bottom: 15px; } @@ -1310,6 +1307,13 @@ body { font-size: 12px; } +.user-card .action button { + padding: 0 5px; + height: 20px; + line-height: 20px; + font-size: 12px; +} + .user-card .vip { position: absolute; top: 8px; @@ -1317,16 +1321,12 @@ body { padding: 1px 3px; border-radius: 2px; text-align: center; - font-size: 12px; + font-size: 10px; line-height: 1.5em; background-color: orange; color: white; } -.user-card .action span { - cursor: pointer; -} - .my-sidebar { float: left; width: 220px; diff --git a/public/static/web/js/user.show.js b/public/static/web/js/user.show.js index de5678b1..0b04866d 100644 --- a/public/static/web/js/user.show.js +++ b/public/static/web/js/user.show.js @@ -7,13 +7,20 @@ layui.use(['jquery', 'helper'], function () { var $tabCourses = $('#tab-courses'); helper.ajaxLoadHtml($tabCourses.data('url'), $tabCourses.attr('id')); } + if ($('#tab-favorites').length > 0) { var $tabFavorites = $('#tab-favorites'); helper.ajaxLoadHtml($tabFavorites.data('url'), $tabFavorites.attr('id')); } + if ($('#tab-friends').length > 0) { var $tabFriends = $('#tab-friends'); helper.ajaxLoadHtml($tabFriends.data('url'), $tabFriends.attr('id')); } + if ($('#tab-groups').length > 0) { + var $tabGroups = $('#tab-groups'); + helper.ajaxLoadHtml($tabGroups.data('url'), $tabGroups.attr('id')); + } + }); \ No newline at end of file diff --git a/public/static/web/js/vip.js b/public/static/web/js/vip.js index 352d7370..cf9aa2a5 100644 --- a/public/static/web/js/vip.js +++ b/public/static/web/js/vip.js @@ -3,9 +3,14 @@ layui.use(['jquery', 'helper'], function () { var $ = layui.jquery; var helper = layui.helper; - if ($('#tab-courses').length > 0) { - var $tabCourses = $('#tab-courses'); - helper.ajaxLoadHtml($tabCourses.data('url'), $tabCourses.attr('id')); + if ($('#tab-discount-courses').length > 0) { + var $tabDiscountCourses = $('#tab-discount-courses'); + helper.ajaxLoadHtml($tabDiscountCourses.data('url'), $tabDiscountCourses.attr('id')); + } + + if ($('#tab-free-courses').length > 0) { + var $tabFreeCourses = $('#tab-free-courses'); + helper.ajaxLoadHtml($tabFreeCourses.data('url'), $tabFreeCourses.attr('id')); } if ($('#tab-users').length > 0) {