From 1c880d0c56f9bdd10fb5e29df21fb9af35f5ed49 Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Sat, 11 Sep 2021 13:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=92=A8=E8=AF=A2published?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/Controllers/FlashSaleController.php   | 48 +++++++++++++++++++
 app/Http/Home/Views/course/show_catalog.volt  | 15 ++++--
 app/Http/Home/Views/templates/main.volt       |  4 +-
 app/Services/Logic/Chapter/ConsultList.php    |  4 +-
 app/Services/Logic/Course/ConsultList.php     |  5 +-
 public/static/home/css/common.css             | 10 +++-
 6 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 app/Http/Api/Controllers/FlashSaleController.php

diff --git a/app/Http/Api/Controllers/FlashSaleController.php b/app/Http/Api/Controllers/FlashSaleController.php
new file mode 100644
index 00000000..b6b7f46d
--- /dev/null
+++ b/app/Http/Api/Controllers/FlashSaleController.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
+ * @license https://opensource.org/licenses/GPL-2.0
+ * @link https://www.koogua.com
+ */
+
+namespace App\Http\Api\Controllers;
+
+use App\Services\Logic\FlashSale\OrderCreate as OrderCreateService;
+use App\Services\Logic\FlashSale\SaleList as SaleListService;
+use App\Services\Logic\Order\OrderInfo as OrderInfoService;
+
+/**
+ * @RoutePrefix("/api/flash/sale")
+ */
+class FlashSaleController extends Controller
+{
+
+    /**
+     * @Get("/list", name="api.flash_sale.list")
+     */
+    public function listAction()
+    {
+        $service = new SaleListService();
+
+        $sales = $service->handle();
+
+        return $this->jsonSuccess(['sales' => $sales]);
+    }
+
+    /**
+     * @Post("/order", name="api.flash_sale.order")
+     */
+    public function orderAction()
+    {
+        $service = new OrderCreateService();
+
+        $order = $service->handle();
+
+        $service = new OrderInfoService();
+
+        $order = $service->handle($order->sn);
+
+        return $this->jsonSuccess(['order' => $order]);
+    }
+
+}
diff --git a/app/Http/Home/Views/course/show_catalog.volt b/app/Http/Home/Views/course/show_catalog.volt
index b1b2cabc..d6502be6 100644
--- a/app/Http/Home/Views/course/show_catalog.volt
+++ b/app/Http/Home/Views/course/show_catalog.volt
@@ -5,11 +5,14 @@
         <i class="layui-icon layui-icon-play"></i>
         <span class="title">{{ lesson.title }}</span>
         {% if lesson.free == 1 %}
-            <span class="layui-badge free-badge">试听</span>
+            <span class="iconfont icon-trial"></span>
         {% endif %}
         {% if lesson.me.duration > 0 %}
             <span class="study-time" title="学习时长：{{ lesson.me.duration|duration }}"><i class="layui-icon layui-icon-time"></i></span>
         {% endif %}
+        {% if priv == 'deny' %}
+            <span class="iconfont icon-lock"></span>
+        {% endif %}
         <span class="duration">{{ lesson.attrs.duration|duration }}</span>
     </a>
 {%- endmacro %}
@@ -21,11 +24,14 @@
         <i class="layui-icon layui-icon-video"></i>
         <span class="title">{{ lesson.title }}</span>
         {% if lesson.free == 1 %}
-            <span class="layui-badge free-badge">试听</span>
+            <span class="iconfont icon-trial"></span>
         {% endif %}
         {% if lesson.me.duration > 0 %}
             <span class="study-time" title="学习时长：{{ lesson.me.duration|duration }}"><i class="layui-icon layui-icon-time"></i></span>
         {% endif %}
+        {% if priv == 'deny' %}
+            <span class="iconfont icon-lock"></span>
+        {% endif %}
         <span class="live" title="{{ date('Y-m-d H:i',lesson.attrs.start_time) }}">{{ live_status_info(lesson) }}</span>
     </a>
 {%- endmacro %}
@@ -37,11 +43,14 @@
         <i class="layui-icon layui-icon-read"></i>
         <span class="title">{{ lesson.title }}</span>
         {% if lesson.free == 1 %}
-            <span class="layui-badge free-badge">试读</span>
+            <span class="iconfont icon-trial"></span>
         {% endif %}
         {% if lesson.me.duration > 0 %}
             <span class="study-time" title="学习时长：{{ lesson.me.duration|duration }}"><i class="layui-icon layui-icon-time"></i></span>
         {% endif %}
+        {% if priv == 'deny' %}
+            <span class="iconfont icon-lock"></span>
+        {% endif %}
     </a>
 {%- endmacro %}
 
diff --git a/app/Http/Home/Views/templates/main.volt b/app/Http/Home/Views/templates/main.volt
index 0e1fdec0..0eb3c2e7 100644
--- a/app/Http/Home/Views/templates/main.volt
+++ b/app/Http/Home/Views/templates/main.volt
@@ -13,8 +13,8 @@
     {% else %}
         {{ icon_link('favicon.ico') }}
     {% endif %}
-    <link rel="preload" href="//at.alicdn.com/t/font_2760791_c83l29k7bz.woff2" as="font" type="font/woff2" crossorigin="anonymous">
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2760791_c83l29k7bz.css">
+    <link rel="preload" href="//at.alicdn.com/t/font_2760791_mj6x0o9n15s.woff2" as="font" type="font/woff2" crossorigin="anonymous">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_2760791_mj6x0o9n15s.css">
     {{ css_link('lib/layui/css/layui.css') }}
     {{ css_link('home/css/common.css') }}
     {% block link_css %}{% endblock %}
diff --git a/app/Services/Logic/Chapter/ConsultList.php b/app/Services/Logic/Chapter/ConsultList.php
index 69a60893..f9c22113 100644
--- a/app/Services/Logic/Chapter/ConsultList.php
+++ b/app/Services/Logic/Chapter/ConsultList.php
@@ -8,6 +8,7 @@
 namespace App\Services\Logic\Chapter;
 
 use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Consult as ConsultModel;
 use App\Repos\Consult as ConsultRepo;
 use App\Services\Logic\ChapterTrait;
 use App\Services\Logic\Course\ConsultListTrait;
@@ -31,8 +32,9 @@ class ConsultList extends LogicService
 
         $params = [
             'chapter_id' => $chapter->id,
+            'published' => ConsultModel::PUBLISH_APPROVED,
+            'deleted' => 0,
             'private' => 0,
-            'published' => 1,
         ];
 
         $consultRepo = new ConsultRepo();
diff --git a/app/Services/Logic/Course/ConsultList.php b/app/Services/Logic/Course/ConsultList.php
index 28de70fd..77e2796c 100644
--- a/app/Services/Logic/Course/ConsultList.php
+++ b/app/Services/Logic/Course/ConsultList.php
@@ -8,6 +8,7 @@
 namespace App\Services\Logic\Course;
 
 use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Consult as ConsultModel;
 use App\Repos\Consult as ConsultRepo;
 use App\Services\Logic\CourseTrait;
 use App\Services\Logic\Service as LogicService;
@@ -30,9 +31,9 @@ class ConsultList extends LogicService
 
         $params = [
             'course_id' => $course->id,
-            'private' => 0,
-            'published' => 1,
+            'published' => ConsultModel::PUBLISH_APPROVED,
             'deleted' => 0,
+            'private' => 0,
         ];
 
         $consultRepo = new ConsultRepo();
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index 1e01acbf..d43d5451 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -1029,7 +1029,9 @@
     margin: 0 5px;
 }
 
-.lesson-item .free-badge {
+.lesson-item .icon-trial {
+    color: red;
+    font-size: 24px;
     margin-right: 5px;
 }
 
@@ -1347,12 +1349,16 @@
 }
 
 .player-wrap {
-    position: relative;
     width: 760px;
     height: 428px;
     margin-bottom: 20px;
 }
 
+.dplayer {
+    width: 760px;
+    height: 428px;
+}
+
 .chat-wrap .layui-card-header {
     text-align: center;
 }