From 47e03cd82b80b2870f2f03add189660315fd1e6c Mon Sep 17 00:00:00 2001 From: koogua Date: Sat, 20 Mar 2021 15:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Tasks/CourseIndexTask.php | 8 +- app/Console/Tasks/GroupIndexTask.php | 8 +- app/Console/Tasks/OptimizeTableTask.php | 10 +- app/Console/Tasks/UpgradeTask.php | 14 +- app/Console/Tasks/UserIndexTask.php | 8 +- app/Http/Admin/Controllers/TestController.php | 15 +- .../Admin/Controllers/UploadController.php | 64 +++++ app/Http/Admin/Views/category/list.volt | 4 +- app/Http/Admin/Views/consult/list.volt | 9 +- app/Http/Admin/Views/flash_sale/list.volt | 10 +- app/Http/Admin/Views/im/group/list.volt | 10 +- app/Http/Admin/Views/macros/flash_sale.volt | 6 +- app/Http/Admin/Views/macros/point.volt | 28 +- app/Http/Admin/Views/macros/slide.volt | 6 +- app/Http/Admin/Views/nav/list.volt | 4 +- app/Http/Admin/Views/order/macro.volt | 4 +- app/Http/Admin/Views/package/list.volt | 2 +- app/Http/Admin/Views/setting/site.volt | 4 +- app/Http/Admin/Views/setting/storage.volt | 240 +++++++++++------- app/Http/Admin/Views/topic/list.volt | 2 +- app/Http/Admin/Views/user/list.volt | 18 +- .../Home/Controllers/FlashSaleController.php | 2 + app/Http/Home/Views/flash_sale/index.volt | 8 +- .../Home/Views/im/group/manage/users.volt | 41 +-- app/Http/Home/Views/im/group/pager.volt | 2 +- app/Http/Home/Views/im/group/users.volt | 6 +- app/Http/Home/Views/im/index_groups.volt | 2 +- app/Http/Home/Views/im/index_users.volt | 6 +- app/Http/Home/Views/macros/course.volt | 7 +- app/Http/Home/Views/macros/group.volt | 6 +- app/Http/Home/Views/macros/order.volt | 4 +- app/Http/Home/Views/macros/user.volt | 6 - app/Http/Home/Views/user/console/courses.volt | 8 +- .../Home/Views/user/console/favorites.volt | 5 +- app/Http/Home/Views/user/console/orders.volt | 2 +- app/Http/Home/Views/user/show.volt | 4 +- app/Library/Helper.php | 72 +++++- app/Models/Course.php | 2 +- app/Models/ImGroup.php | 2 +- app/Models/ImUser.php | 2 +- app/Models/Package.php | 2 +- app/Models/PointGift.php | 2 +- app/Models/Upload.php | 1 + app/Models/User.php | 2 +- app/Services/Logic/FlashSale/OrderCreate.php | 25 +- app/Services/Logic/FlashSale/SaleList.php | 2 +- app/Services/Logic/Order/OrderInfo.php | 2 +- .../Logic/User/Console/ProfileInfo.php | 2 +- app/Services/MyStorage.php | 107 +++++++- app/Services/Refund.php | 4 +- app/Services/Storage.php | 3 +- .../20210314045908_schema_202103141300.php | 1 + public/static/admin/css/common.css | 4 + .../static/admin/img/default/course_cover.png | Bin 0 -> 9298 bytes .../static/admin/img/default/gift_cover.png | Bin 0 -> 10001 bytes .../static/admin/img/default/group_avatar.png | Bin 0 -> 6366 bytes .../admin/img/default/package_cover.png | Bin 0 -> 5693 bytes .../static/admin/img/default/user_avatar.png | Bin 0 -> 6366 bytes .../vip_cover.png} | Bin public/static/admin/img/default_avatar.png | Bin 25041 -> 0 bytes public/static/admin/img/default_cover.png | Bin 2692 -> 0 bytes public/static/home/css/common.css | 47 +--- 62 files changed, 553 insertions(+), 312 deletions(-) create mode 100644 public/static/admin/img/default/course_cover.png create mode 100644 public/static/admin/img/default/gift_cover.png create mode 100644 public/static/admin/img/default/group_avatar.png create mode 100644 public/static/admin/img/default/package_cover.png create mode 100644 public/static/admin/img/default/user_avatar.png rename public/static/admin/img/{default_vip_cover.png => default/vip_cover.png} (100%) delete mode 100644 public/static/admin/img/default_avatar.png delete mode 100644 public/static/admin/img/default_cover.png diff --git a/app/Console/Tasks/CourseIndexTask.php b/app/Console/Tasks/CourseIndexTask.php index ec4fc523..087c04b8 100644 --- a/app/Console/Tasks/CourseIndexTask.php +++ b/app/Console/Tasks/CourseIndexTask.php @@ -60,11 +60,11 @@ class CourseIndexTask extends Task $index = $handler->getXS()->getIndex(); - echo 'start clean course index' . PHP_EOL; + echo '------ start clean course index ------' . PHP_EOL; $index->clean(); - echo 'end clean course index' . PHP_EOL; + echo '------ end clean course index ------' . PHP_EOL; } /** @@ -82,7 +82,7 @@ class CourseIndexTask extends Task $index = $handler->getXS()->getIndex(); - echo 'start rebuild course index' . PHP_EOL; + echo '------ start rebuild course index ------' . PHP_EOL; $index->beginRebuild(); @@ -93,7 +93,7 @@ class CourseIndexTask extends Task $index->endRebuild(); - echo 'end rebuild course index' . PHP_EOL; + echo '------ end rebuild course index ------' . PHP_EOL; } /** diff --git a/app/Console/Tasks/GroupIndexTask.php b/app/Console/Tasks/GroupIndexTask.php index 2b3818c8..26c32709 100644 --- a/app/Console/Tasks/GroupIndexTask.php +++ b/app/Console/Tasks/GroupIndexTask.php @@ -60,11 +60,11 @@ class GroupIndexTask extends Task $index = $handler->getXS()->getIndex(); - echo 'start clean group index' . PHP_EOL; + echo '------ start clean group index ------' . PHP_EOL; $index->clean(); - echo 'end clean group index' . PHP_EOL; + echo '------ end clean group index ------' . PHP_EOL; } /** @@ -82,7 +82,7 @@ class GroupIndexTask extends Task $index = $handler->getXS()->getIndex(); - echo 'start rebuild group index' . PHP_EOL; + echo '------ start rebuild group index ------' . PHP_EOL; $index->beginRebuild(); @@ -93,7 +93,7 @@ class GroupIndexTask extends Task $index->endRebuild(); - echo 'end rebuild group index' . PHP_EOL; + echo '------ end rebuild group index ------' . PHP_EOL; } /** diff --git a/app/Console/Tasks/OptimizeTableTask.php b/app/Console/Tasks/OptimizeTableTask.php index f690cb8a..26f60d75 100644 --- a/app/Console/Tasks/OptimizeTableTask.php +++ b/app/Console/Tasks/OptimizeTableTask.php @@ -26,7 +26,7 @@ class OptimizeTableTask extends Task $tableName = $sessionModel->getSource(); - $this->db->delete($tableName, "expire_time < :expire_time", [ + $this->db->delete($tableName, 'expire_time < :expire_time', [ 'expire_time' => strtotime('-3 days'), ]); @@ -39,7 +39,7 @@ class OptimizeTableTask extends Task $tableName = $tokenModel->getSource(); - $this->db->delete($tableName, "expire_time < :expire_time", [ + $this->db->delete($tableName, 'expire_time < :expire_time', [ 'expire_time' => strtotime('-3 days'), ]); @@ -56,7 +56,7 @@ class OptimizeTableTask extends Task $tableName = $messageModel->getSource(); - $this->db->delete($tableName, "create_time < :create_time", [ + $this->db->delete($tableName, 'create_time < :create_time', [ 'create_time' => strtotime('-6 months'), ]); @@ -73,7 +73,7 @@ class OptimizeTableTask extends Task $tableName = $learningModel->getSource(); - $this->db->delete($tableName, "create_time < :create_time", [ + $this->db->delete($tableName, 'create_time < :create_time', [ 'create_time' => strtotime('-6 months'), ]); @@ -90,7 +90,7 @@ class OptimizeTableTask extends Task $tableName = $taskModel->getSource(); - $this->db->delete($tableName, "create_time < :create_time AND status > :status", [ + $this->db->delete($tableName, 'create_time < :create_time AND status > :status', [ 'create_time' => strtotime('-6 months'), 'status' => TaskModel::STATUS_PENDING, ]); diff --git a/app/Console/Tasks/UpgradeTask.php b/app/Console/Tasks/UpgradeTask.php index cfd14aab..2667186d 100644 --- a/app/Console/Tasks/UpgradeTask.php +++ b/app/Console/Tasks/UpgradeTask.php @@ -23,7 +23,7 @@ class UpgradeTask extends Task */ public function resetSettingAction() { - echo "start reset setting..." . PHP_EOL; + echo '------ start reset setting ------' . PHP_EOL; $rows = SettingModel::query()->columns('section')->distinct(true)->execute(); @@ -32,7 +32,7 @@ class UpgradeTask extends Task $cache->rebuild($row->section); } - echo "end reset setting..." . PHP_EOL; + echo '------ end reset setting ------' . PHP_EOL; } /** @@ -48,7 +48,7 @@ class UpgradeTask extends Task $keys = $redis->sMembers($statsKey); - echo "start reset annotation..." . PHP_EOL; + echo '------ start reset annotation ------' . PHP_EOL; if (count($keys) > 0) { $keys = $this->handlePhKeys($keys); @@ -56,7 +56,7 @@ class UpgradeTask extends Task $redis->del($statsKey); } - echo "end reset annotation..." . PHP_EOL; + echo '------ end reset annotation ------' . PHP_EOL; } /** @@ -72,7 +72,7 @@ class UpgradeTask extends Task $keys = $redis->sMembers($statsKey); - echo "start reset metadata..." . PHP_EOL; + echo '------ start reset metadata ------' . PHP_EOL; if (count($keys) > 0) { $keys = $this->handlePhKeys($keys); @@ -90,7 +90,7 @@ class UpgradeTask extends Task */ public function resetVoltAction() { - echo "start reset volt..." . PHP_EOL; + echo '------ start reset volt ------' . PHP_EOL; $dir = cache_path('volt'); @@ -100,7 +100,7 @@ class UpgradeTask extends Task } } - echo "end reset volt..." . PHP_EOL; + echo '------ end reset volt ------' . PHP_EOL; } protected function handlePhKeys($keys) diff --git a/app/Console/Tasks/UserIndexTask.php b/app/Console/Tasks/UserIndexTask.php index ccf999f4..7cae5add 100644 --- a/app/Console/Tasks/UserIndexTask.php +++ b/app/Console/Tasks/UserIndexTask.php @@ -60,11 +60,11 @@ class UserIndexTask extends Task $index = $handler->getXS()->getIndex(); - echo 'start clean user index' . PHP_EOL; + echo '------ start clean user index ------' . PHP_EOL; $index->clean(); - echo 'end clean user index' . PHP_EOL; + echo '------ end clean user index ------' . PHP_EOL; } /** @@ -82,7 +82,7 @@ class UserIndexTask extends Task $index = $handler->getXS()->getIndex(); - echo 'start rebuild user index' . PHP_EOL; + echo '------ start rebuild user index ------' . PHP_EOL; $index->beginRebuild(); @@ -93,7 +93,7 @@ class UserIndexTask extends Task $index->endRebuild(); - echo 'end rebuild user index' . PHP_EOL; + echo '------ end rebuild user index ------' . PHP_EOL; } /** diff --git a/app/Http/Admin/Controllers/TestController.php b/app/Http/Admin/Controllers/TestController.php index 267eab90..38991007 100644 --- a/app/Http/Admin/Controllers/TestController.php +++ b/app/Http/Admin/Controllers/TestController.php @@ -27,18 +27,13 @@ class TestController extends Controller { $storageService = new StorageService(); - $items = []; + $result = $storageService->uploadTestFile(); - $items['hello'] = $storageService->uploadTestFile(); - $items['avatar'] = $storageService->uploadDefaultAvatar(); - $items['cover'] = $storageService->uploadDefaultCover(); - $items['vip_cover'] = $storageService->uploadDefaultVipCover(); - - foreach ($items as $item) { - if (!$item) return $this->jsonError(['msg' => '上传文件失败，请检查相关配置']); + if ($result) { + return $this->jsonSuccess(['msg' => '上传文件成功']); + } else { + return $this->jsonError(['msg' => '上传文件失败，请检查相关配置']); } - - return $this->jsonSuccess(['msg' => '上传文件成功，请到控制台确认']); } /** diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php index 878b784a..a6acddf0 100644 --- a/app/Http/Admin/Controllers/UploadController.php +++ b/app/Http/Admin/Controllers/UploadController.php @@ -10,6 +10,48 @@ use App\Services\MyStorage as StorageService; class UploadController extends Controller { + /** + * @Post("/site/logo", name="admin.upload.site_logo") + */ + public function uploadSiteLogoAction() + { + $service = new StorageService(); + + $file = $service->uploadSiteLogo(); + + if (!$file) { + return $this->jsonError(['msg' => '上传文件失败']); + } + + $data = [ + 'src' => $service->getImageUrl($file->path), + 'title' => $file->name, + ]; + + return $this->jsonSuccess(['data' => $data]); + } + + /** + * @Post("/site/favicon", name="admin.upload.site_favicon") + */ + public function uploadSiteFaviconAction() + { + $service = new StorageService(); + + $file = $service->uploadSiteFavicon(); + + if (!$file) { + return $this->jsonError(['msg' => '上传文件失败']); + } + + $data = [ + 'src' => $service->getImageUrl($file->path), + 'title' => $file->name, + ]; + + return $this->jsonSuccess(['data' => $data]); + } + /** * @Post("/cover/img", name="admin.upload.cover_img") */ @@ -73,6 +115,28 @@ class UploadController extends Controller return $this->jsonSuccess(['data' => $data]); } + /** + * @Post("/default/img", name="admin.upload.default_img") + */ + public function uploadDefaultImageAction() + { + $service = new StorageService(); + + $items = []; + + $items['user_avatar'] = $service->uploadDefaultUserAvatar(); + $items['group_avatar'] = $service->uploadDefaultGroupAvatar(); + $items['course_cover'] = $service->uploadDefaultCourseCover(); + $items['group_cover'] = $service->uploadDefaultPackageCover(); + $items['vip_cover'] = $service->uploadDefaultVipCover(); + + foreach ($items as $item) { + if (!$item) return $this->jsonError(['msg' => '上传文件失败']); + } + + return $this->jsonSuccess(['msg' => '上传文件成功']); + } + /** * @Get("/sign", name="admin.upload.sign") */ diff --git a/app/Http/Admin/Views/category/list.volt b/app/Http/Admin/Views/category/list.volt index 6a2e9b04..65a614ad 100644 --- a/app/Http/Admin/Views/category/list.volt +++ b/app/Http/Admin/Views/category/list.volt @@ -58,8 +58,8 @@ {% else %} {{ item.name }} {% endif %} - {{ item.level }} - {{ item.child_count }} + {{ item.level }} + {{ item.child_count }} diff --git a/app/Http/Admin/Views/consult/list.volt b/app/Http/Admin/Views/consult/list.volt index c4bba140..aed642e2 100644 --- a/app/Http/Admin/Views/consult/list.volt +++ b/app/Http/Admin/Views/consult/list.volt @@ -63,7 +63,14 @@

昵称：{{ item.owner.name }}

编号：{{ item.owner.id }}

- {{ date('Y-m-d H:i:s',item.create_time) }} + +

提问：{{ date('Y-m-d H:i:s',item.create_time) }}

+ {% if item.reply_time > 0 %} +

回复：{{ date('Y-m-d H:i:s',item.reply_time) }}

+ {% else %} +

回复：N/A

+ {% endif %} +
diff --git a/app/Http/Admin/Views/flash_sale/list.volt b/app/Http/Admin/Views/flash_sale/list.volt index 2f70168a..d8e113b5 100644 --- a/app/Http/Admin/Views/flash_sale/list.volt +++ b/app/Http/Admin/Views/flash_sale/list.volt @@ -29,17 +29,17 @@ - + 商品信息 - 秒杀时间 - 参与场次 秒杀价格 秒杀库存 + 秒杀时间 + 参与场次 发布 操作 @@ -52,13 +52,13 @@ {% set restore_url = url({'for':'admin.flash_sale.restore','id':item.id}) %} {{ item_full_info(item.item_type,item.item_info) }} + {{ '￥%0.2f'|format(item.price) }} + {{ item.stock }}

开始：{{ date('Y-m-d H:i:s',item.start_time) }}

结束：{{ date('Y-m-d H:i:s',item.end_time) }}

{{ schedules_info(item.schedules) }} - {{ '￥%0.2f'|format(item.price) }} - {{ item.stock }}
diff --git a/app/Http/Admin/Views/im/group/list.volt b/app/Http/Admin/Views/im/group/list.volt index a321fbb0..6f1724d0 100644 --- a/app/Http/Admin/Views/im/group/list.volt +++ b/app/Http/Admin/Views/im/group/list.volt @@ -4,13 +4,13 @@ {%- macro type_info(value) %} {% if value == 1 %} - 课程 + 课程 {% elseif value == 2 %} - 聊天 + 水吧 {% elseif value == 3 %} - 职工 + 职工 {% else %} - 未知 + 未知 {% endif %} {%- endmacro %} @@ -56,7 +56,7 @@ 编号 名称 - 名称 + 类型 群主 成员 发布 diff --git a/app/Http/Admin/Views/macros/flash_sale.volt b/app/Http/Admin/Views/macros/flash_sale.volt index 2a55af6b..4a63a320 100644 --- a/app/Http/Admin/Views/macros/flash_sale.volt +++ b/app/Http/Admin/Views/macros/flash_sale.volt @@ -1,10 +1,10 @@ {%- macro item_type_info(value) %} {% if value == 1 %} - 课程 + 课程 {% elseif value == 2 %} - 套餐 + 套餐 {% elseif value == 3 %} - 会员 + 会员 {% endif %} {%- endmacro %} diff --git a/app/Http/Admin/Views/macros/point.volt b/app/Http/Admin/Views/macros/point.volt index 06aced06..85bcbc60 100644 --- a/app/Http/Admin/Views/macros/point.volt +++ b/app/Http/Admin/Views/macros/point.volt @@ -1,20 +1,20 @@ {%- macro redeem_status_info(value) %} {% if value == 1 %} - 处理中 + 处理中 {% elseif value == 2 %} - 已完成 + 已完成 {% elseif value == 3 %} - 已失败 + 已失败 {% endif %} {%- endmacro %} {%- macro gift_type_info(value) %} {% if value == 1 %} - 课程 + 课程 {% elseif value == 2 %} - 商品 + 商品 {% elseif value == 3 %} - 现金 + 现金 {% endif %} {%- endmacro %} @@ -28,21 +28,21 @@ {%- macro event_type_info(value) %} {% if value == 1 %} - 订单消费 + 订单消费 {% elseif value == 2 %} - 积分兑换 + 积分兑换 {% elseif value == 3 %} - 积分退款 + 积分退款 {% elseif value == 4 %} - 帐号注册 + 帐号注册 {% elseif value == 5 %} - 站点访问 + 站点访问 {% elseif value == 6 %} - 课时学习 + 课时学习 {% elseif value == 7 %} - 课程评价 + 课程评价 {% elseif value == 8 %} - 微聊讨论 + 微聊讨论 {% endif %} {%- endmacro %} diff --git a/app/Http/Admin/Views/macros/slide.volt b/app/Http/Admin/Views/macros/slide.volt index 130bb4b0..2901eb6a 100644 --- a/app/Http/Admin/Views/macros/slide.volt +++ b/app/Http/Admin/Views/macros/slide.volt @@ -1,10 +1,10 @@ {%- macro target_info(value) %} {% if value == 1 %} - 课程 + 课程 {% elseif value == 2 %} - 单页 + 单页 {% elseif value == 3 %} - 链接 + 链接 {% endif %} {%- endmacro %} diff --git a/app/Http/Admin/Views/nav/list.volt b/app/Http/Admin/Views/nav/list.volt index 20bf8ba2..86d3f7d6 100644 --- a/app/Http/Admin/Views/nav/list.volt +++ b/app/Http/Admin/Views/nav/list.volt @@ -77,8 +77,8 @@ {% else %} {{ item.name }} {% endif %} - {{ item.level }} - {{ item.child_count }} + {{ item.level }} + {{ item.child_count }} {{ position_info(item.position) }} {{ target_info(item.target) }} diff --git a/app/Http/Admin/Views/order/macro.volt b/app/Http/Admin/Views/order/macro.volt index 433099c2..ef8de879 100644 --- a/app/Http/Admin/Views/order/macro.volt +++ b/app/Http/Admin/Views/order/macro.volt @@ -68,8 +68,8 @@ {% if value == 0 %} N/A {% elseif value == 1 %} - 限时秒杀 + 秒杀 {% elseif value == 2 %} - 限时折扣 + 折扣 {% endif %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Admin/Views/package/list.volt b/app/Http/Admin/Views/package/list.volt index 6dd5c922..f88bda07 100644 --- a/app/Http/Admin/Views/package/list.volt +++ b/app/Http/Admin/Views/package/list.volt @@ -51,7 +51,7 @@ {{ item.id }} {{ item.title }} - {{ item.course_count }} + {{ item.course_count }} {{ '￥%0.2f'|format(item.market_price) }} {{ '￥%0.2f'|format(item.vip_price) }} diff --git a/app/Http/Admin/Views/setting/site.volt b/app/Http/Admin/Views/setting/site.volt index 5067bfc6..59dab4c0 100644 --- a/app/Http/Admin/Views/setting/site.volt +++ b/app/Http/Admin/Views/setting/site.volt @@ -172,7 +172,7 @@ upload.render({ elem: '#upload-logo', - url: '/admin/upload/content/img', + url: '/admin/upload/site/logo', exts: 'gif|jpg|png', before: function () { layer.load(); @@ -188,7 +188,7 @@ upload.render({ elem: '#upload-favicon', - url: '/admin/upload/content/img', + url: '/admin/upload/site/favicon', exts: 'gif|jpg|png|ico', before: function () { layer.load(); diff --git a/app/Http/Admin/Views/setting/storage.volt b/app/Http/Admin/Views/setting/storage.volt index f6874821..e0f7b07d 100644 --- a/app/Http/Admin/Views/setting/storage.volt +++ b/app/Http/Admin/Views/setting/storage.volt @@ -2,96 +2,160 @@ {% block content %} -
-
- 存储桶配置 -
-
- -
- +
+
    +
  • 基本配置
    • +
  • 图片样式
    • +
  • 默认图片
    • +
+
+
+ +
+ 存储桶配置 +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+ +
+
+ 上传测试 +
+
+ +
+ +
+
+
+ +
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
样式名称样式描述
avatar_160imageMogr2/thumbnail/160x/interlace/0
cover_270mageMogr2/thumbnail/270x/interlace/0
content_800mageMogr2/thumbnail/800x/interlace/0
slide_1100imageMogr2/thumbnail/1100x/interlace/0
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
文件名称文件位置
用户头像public/static/admin/img/default/user_cover.png
群组头像public/static/admin/img/default/group_cover.png
课程封面public/static/admin/img/default/course_cover.png
套餐封面public/static/admin/img/default/package_cover.png
会员封面public/static/admin/img/default/vip_cover.png
礼品封面public/static/admin/img/default/gift_cover.png
+
+
+ +
+ + +
+
+
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- 图片处理样式 -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
样式名称样式描述
avatar_160imageMogr2/thumbnail/160x/interlace/0
cover_270mageMogr2/thumbnail/270x/interlace/0
content_800mageMogr2/thumbnail/800x/interlace/0
slide_1100imageMogr2/thumbnail/1100x/interlace/0
-
-
- -
- - -
-
- +
+ + + + + -
-
- 上传测试 -
-
- -
- -
-
-
- -
- - -
-
-
{% endblock %} \ No newline at end of file diff --git a/app/Http/Admin/Views/topic/list.volt b/app/Http/Admin/Views/topic/list.volt index 10290a79..fb7f0bc1 100644 --- a/app/Http/Admin/Views/topic/list.volt +++ b/app/Http/Admin/Views/topic/list.volt @@ -52,7 +52,7 @@ {{ item.id }} {{ item.title }} - {{ item.course_count }} + {{ item.course_count }} {{ date('Y-m-d H:i',item.create_time) }} {{ date('Y-m-d H:i',item.update_time) }} diff --git a/app/Http/Admin/Views/user/list.volt b/app/Http/Admin/Views/user/list.volt index 8d164110..20469b77 100644 --- a/app/Http/Admin/Views/user/list.volt +++ b/app/Http/Admin/Views/user/list.volt @@ -12,17 +12,17 @@ {% endif %} {%- endmacro %} - {%- macro edu_role_info(user) %} - {% if user.edu_role.id == 1 %} + {%- macro edu_role_info(role) %} + {% if role.id == 1 %} 学员 - {% elseif user.edu_role.id == 2 %} - 讲师 + {% elseif role.id == 2 %} + 讲师 {% endif %} {%- endmacro %} - {%- macro admin_role_info(user) %} - {% if user.admin_role.id > 0 %} - {{ user.admin_role.name }} + {%- macro admin_role_info(role) %} + {% if role.id > 0 %} + {{ role.name }} {% endif %} {%- endmacro %} @@ -85,8 +85,8 @@ {{ item.id }} {{ item.name }}{{ status_info(item) }} {{ gender_info(item.gender) }} - {{ edu_role_info(item) }} - {{ admin_role_info(item) }} + {{ edu_role_info(item.edu_role) }} + {{ admin_role_info(item.admin_role) }} {{ date('Y-m-d H:i:s',item.active_time) }} {{ date('Y-m-d H:i:s',item.create_time) }} diff --git a/app/Http/Home/Controllers/FlashSaleController.php b/app/Http/Home/Controllers/FlashSaleController.php index 570f059d..16e89c0c 100644 --- a/app/Http/Home/Controllers/FlashSaleController.php +++ b/app/Http/Home/Controllers/FlashSaleController.php @@ -29,6 +29,8 @@ class FlashSaleController extends Controller */ public function indexAction() { + $this->seo->prependTitle('秒杀'); + $service = new SaleListService(); $sales = $service->handle(); diff --git a/app/Http/Home/Views/flash_sale/index.volt b/app/Http/Home/Views/flash_sale/index.volt index 223c6128..05becda3 100644 --- a/app/Http/Home/Views/flash_sale/index.volt +++ b/app/Http/Home/Views/flash_sale/index.volt @@ -98,6 +98,11 @@
{% endmacro %} +
+ 首页 + 秒杀 +
+ {% for date_sale in sales %}
{{ date_sale.date }}
@@ -106,8 +111,7 @@
    {% for item in date_sale.items %} {% set class = item.selected == 1 ? 'layui-this' : 'none' %} - {% set style = item.status == 'finished' ? 'pointer-events:none;' : '' %} -
  • {{ item.hour }}（{{ sale_status(item.status) }}）
    • +
  • {{ item.hour }}（{{ sale_status(item.status) }}）
    • {% endfor %}
diff --git a/app/Http/Home/Views/im/group/manage/users.volt b/app/Http/Home/Views/im/group/manage/users.volt index 69197bcf..44a4c5f0 100644 --- a/app/Http/Home/Views/im/group/manage/users.volt +++ b/app/Http/Home/Views/im/group/manage/users.volt @@ -2,30 +2,31 @@ {% block content %} -
-
-
- {% for item in pager.items %} - {% set delete_url = url({'for':'home.igm.delete_user','gid':group.id,'uid':item.id}) %} -
-
- {% if item.vip == 1 %} - 会员 - {% endif %} -
- {{ item.name }} -
-
{{ item.name }}
-
- + {% if pager.total_items > 0 %} +
+
+
+ {% for item in pager.items %} + {% set delete_url = url({'for':'home.igm.delete_user','gid':group.id,'uid':item.id}) %} +
+
+
+ + {{ item.name }} + +
+
{{ item.name }}
+
+ +
-
- {% endfor %} + {% endfor %} +
+ {{ partial('partials/pager') }}
- {{ partial('partials/pager') }} -
+ {% endif %} {% endblock %} diff --git a/app/Http/Home/Views/im/group/pager.volt b/app/Http/Home/Views/im/group/pager.volt index 9d24dfa3..86a390d1 100644 --- a/app/Http/Home/Views/im/group/pager.volt +++ b/app/Http/Home/Views/im/group/pager.volt @@ -8,7 +8,7 @@ {% set item.about = item.about ? item.about : '这家伙真懒，什么都没留下！' %}
- {{ type_info(item.type) }} + {{ type_info(item.type) }}
{{ item.name }} diff --git a/app/Http/Home/Views/im/group/users.volt b/app/Http/Home/Views/im/group/users.volt index 59485efe..e582b83d 100644 --- a/app/Http/Home/Views/im/group/users.volt +++ b/app/Http/Home/Views/im/group/users.volt @@ -3,12 +3,10 @@ {% for item in pager.items %} {% set user_url = url({'for':'home.user.show','id':item.id}) %} {% set item.title = item.title ? item.title : '暂露头角' %} + {% set avatar_class = item.vip == 1 ? 'avatar vip' : 'avatar' %}
- {% if item.vip == 1 %} - 宾 - {% endif %} -
+
{{ item.name }} diff --git a/app/Http/Home/Views/im/index_groups.volt b/app/Http/Home/Views/im/index_groups.volt index 31ccfbca..90178a1a 100644 --- a/app/Http/Home/Views/im/index_groups.volt +++ b/app/Http/Home/Views/im/index_groups.volt @@ -5,7 +5,7 @@ {% set group.about = group.about ? group.about : '这家伙真懒，什么都没留下！' %}
- {{ type_info(group.type) }} + {{ type_info(group.type) }}
{{ group.name }} diff --git a/app/Http/Home/Views/im/index_users.volt b/app/Http/Home/Views/im/index_users.volt index 7167671d..6a1a888a 100644 --- a/app/Http/Home/Views/im/index_users.volt +++ b/app/Http/Home/Views/im/index_users.volt @@ -4,10 +4,10 @@ {% set user.title = user.title ? user.title : '暂露头角' %} {% set user.about = user.about ? user.about : '这个人很懒，什么都没留下' %} {% set user_url = url({'for':'home.user.show','id':user.id}) %} -
+ {% set avatar_class = user.vip == 1 ? 'avatar vip' : 'avatar' %} +
- {{ vip_info(user.vip) }} -
+
{{ user.name }} diff --git a/app/Http/Home/Views/macros/course.volt b/app/Http/Home/Views/macros/course.volt index 82f6d237..55a4248a 100644 --- a/app/Http/Home/Views/macros/course.volt +++ b/app/Http/Home/Views/macros/course.volt @@ -1,10 +1,10 @@ {%- macro model_info(value) %} {% if value == '1' %} - 点播 + 点播 {% elseif value == '2' %} - 直播 + 直播 {% elseif value == '3' %} - 专栏 + 专栏 {% endif %} {%- endmacro %} @@ -30,6 +30,7 @@ {%- macro course_card(course) %} {% set course_url = url({'for':'home.course.show','id':course.id}) %}
+ {{ model_info(course.model) }}
{{ course.title }} diff --git a/app/Http/Home/Views/macros/group.volt b/app/Http/Home/Views/macros/group.volt index 32095faa..4a63a95a 100644 --- a/app/Http/Home/Views/macros/group.volt +++ b/app/Http/Home/Views/macros/group.volt @@ -1,9 +1,9 @@ {%- macro type_info(value) %} {% if value == 1 %} - 课程 + 课程 {% elseif value == 2 %} - 水吧 + 水吧 {% elseif value == 3 %} - 职工 + 职工 {% endif %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/macros/order.volt b/app/Http/Home/Views/macros/order.volt index cf3987d8..1ae967f0 100644 --- a/app/Http/Home/Views/macros/order.volt +++ b/app/Http/Home/Views/macros/order.volt @@ -70,8 +70,8 @@ {% if value == 0 %} N/A {% elseif value == 1 %} - 限时秒杀 + 秒杀 {% elseif value == 2 %} - 限时折扣 + 折扣 {% endif %} {%- endmacro %} diff --git a/app/Http/Home/Views/macros/user.volt b/app/Http/Home/Views/macros/user.volt index 965d3827..34542d2e 100644 --- a/app/Http/Home/Views/macros/user.volt +++ b/app/Http/Home/Views/macros/user.volt @@ -1,9 +1,3 @@ -{%- macro vip_info(value) %} - {% if value == 1 %} - 宾 - {% endif %} -{%- endmacro %} - {%- macro gender_icon(value) %} {% if value == 1 %} diff --git a/app/Http/Home/Views/user/console/courses.volt b/app/Http/Home/Views/user/console/courses.volt index c0c51fb6..4d9a7f58 100644 --- a/app/Http/Home/Views/user/console/courses.volt +++ b/app/Http/Home/Views/user/console/courses.volt @@ -15,7 +15,6 @@ {% if pager.total_pages > 0 %} - @@ -23,7 +22,6 @@ - @@ -37,13 +35,13 @@ - - +
课程类型 进度 操作

标题：{{ item.course.title }}

- 来源：{{ source_type_info(item.source_type) }} + 类型：{{ model_info(item.course.model) }} + 来源：{{ source_type_info(item.source_type) }} {% if item.expiry_time > 0 %} - 期限：{{ date('Y-m-d',item.expiry_time) }} + 期限：{{ date('Y-m-d',item.expiry_time) }} {% endif %}

{{ model_info(item.course.model) }}

用时：{{ item.duration|duration }}

进度：{{ item.progress }}%

diff --git a/app/Http/Home/Views/user/console/favorites.volt b/app/Http/Home/Views/user/console/favorites.volt index 1f9e1fed..b66abc28 100644 --- a/app/Http/Home/Views/user/console/favorites.volt +++ b/app/Http/Home/Views/user/console/favorites.volt @@ -32,7 +32,10 @@ {% set course_url = url({'for':'home.course.show','id':item.id}) %} {% set favorite_url = url({'for':'home.course.favorite','id':item.id}) %}
{{ item.title }} {{ model_info(item.model) }} + {{ item.title }} + {{ model_info(item.model) }} + {{ item.user_count }} {{ "%0.1f"|format(item.rating) }} diff --git a/app/Http/Home/Views/user/console/orders.volt b/app/Http/Home/Views/user/console/orders.volt index 140fe31f..d43233e9 100644 --- a/app/Http/Home/Views/user/console/orders.volt +++ b/app/Http/Home/Views/user/console/orders.volt @@ -28,7 +28,7 @@ 编号：{{ item.sn }} 时间：{{ date('Y-m-d H:i:s',item.create_time) }} {% if item.promotion_type > 0 %} - {{ promotion_type(item.promotion_type) }} + 促销：{{ promotion_type(item.promotion_type) }} {% endif %}
diff --git a/app/Http/Home/Views/user/show.volt b/app/Http/Home/Views/user/show.volt index f8c616e4..aa0eb43e 100644 --- a/app/Http/Home/Views/user/show.volt +++ b/app/Http/Home/Views/user/show.volt @@ -9,6 +9,7 @@ {% set qrcode_url = url({'for':'home.qrcode'},{'text':full_user_url}) %} {% set user.area = user.area ? user.area : '火星' %} {% set user.about = user.about ? user.about : '这个家伙很懒，什么都没留下！' %} + {% set avatar_class = user.vip == 1 ? 'avatar vip' : 'avatar' %}
@@ -25,8 +26,7 @@