From 014941db55c4b2a04e766e97d3c3220834dad8a9 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Mon, 4 Jan 2021 19:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=92=A8=E8=AF=A2=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E7=9B=B4=E6=92=AD=E8=AF=BE=E7=A8=8B=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=B4=AD=E4=B9=B0=E6=8C=89=E9=92=AE=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=92=A8=E8=AF=A2=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Views/consult/add.volt       |  1 +
 app/Http/Home/Views/consult/show.volt      | 10 +++++-----
 app/Http/Home/Views/course/show.volt       |  6 +++++-
 app/Http/Home/Views/course/show_order.volt | 10 +++++++---
 public/static/home/css/common.css          |  2 --
 public/static/home/js/course.show.js       | 15 +++++++++++++++
 6 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/Http/Home/Views/consult/add.volt b/app/Http/Home/Views/consult/add.volt
index 17b792ee..6e1f5706 100644
--- a/app/Http/Home/Views/consult/add.volt
+++ b/app/Http/Home/Views/consult/add.volt
@@ -21,6 +21,7 @@
                 <button class="layui-btn" lay-submit="true" lay-filter="go">提交</button>
                 <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 <input type="hidden" name="chapter_id" value="{{ request.get('chapter_id') }}">
+                <input type="hidden" name="course_id" value="{{ request.get('course_id') }}">
             </div>
         </div>
     </form>
diff --git a/app/Http/Home/Views/consult/show.volt b/app/Http/Home/Views/consult/show.volt
index 76a730b9..b9b6d0d5 100644
--- a/app/Http/Home/Views/consult/show.volt
+++ b/app/Http/Home/Views/consult/show.volt
@@ -4,24 +4,24 @@
 
     {% set consult.answer = consult.answer ? consult.answer : '请耐心等待回复吧' %}
 
-    <div class="consult-info clearfix">
+    <div class="consult-info">
         {% if consult.course.id is defined %}
-            <div class="item">
+            <div class="item clearfix">
                 <div class="label">课程：</div>
                 <div class="title">{{ consult.course.title }}</div>
             </div>
         {% endif %}
         {% if consult.chapter.id is defined %}
-            <div class="item">
+            <div class="item clearfix">
                 <div class="label">章节：</div>
                 <div class="title">{{ consult.chapter.title }}</div>
             </div>
         {% endif %}
-        <div class="item">
+        <div class="item clearfix">
             <div class="label">咨询：</div>
             <div class="content">{{ consult.question }}</div>
         </div>
-        <div class="item">
+        <div class="item clearfix">
             <div class="label">回复：</div>
             <div class="content">{{ consult.answer }}</div>
         </div>
diff --git a/app/Http/Home/Views/course/show.volt b/app/Http/Home/Views/course/show.volt
index 6f24937c..c229a53b 100644
--- a/app/Http/Home/Views/course/show.volt
+++ b/app/Http/Home/Views/course/show.volt
@@ -4,10 +4,11 @@
 
     {{ partial('macros/course') }}
 
-    {% set favorite_title = course.me.favorited ? '取消收藏' : '收藏' %}
+    {% 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':'home.course.show','id':course.id}) %}
     {% set favorite_url = url({'for':'home.course.favorite','id':course.id}) %}
+    {% set consult_url = url({'for':'home.consult.add'},{'course_id':course.id}) %}
     {% set qrcode_url = url({'for':'home.qrcode'},{'text':full_course_url}) %}
 
     <div class="breadcrumb">
@@ -18,6 +19,9 @@
         </span>
         <span class="share">
             <a href="javascript:" title="{{ favorite_title }}" data-url="{{ favorite_url }}"><i class="layui-icon {{ favorite_star }} icon-star"></i></a>
+            {% if course.market_price > 0 %}
+                <a href="javascript:" title="课程咨询" data-url="{{ consult_url }}"><i class="layui-icon layui-icon-help icon-help"></i></a>
+            {% endif %}
             <a href="javascript:" title="分享到微信" data-url="{{ qrcode_url }}"><i class="layui-icon layui-icon-login-wechat icon-wechat"></i></a>
             <a href="javascript:" title="分享到QQ空间"><i class="layui-icon layui-icon-login-qq icon-qq"></i></a>
             <a href="javascript:" title="分享到微博"><i class="layui-icon layui-icon-login-weibo icon-weibo"></i></a>
diff --git a/app/Http/Home/Views/course/show_order.volt b/app/Http/Home/Views/course/show_order.volt
index c7420072..ea89b2c9 100644
--- a/app/Http/Home/Views/course/show_order.volt
+++ b/app/Http/Home/Views/course/show_order.volt
@@ -1,8 +1,12 @@
 {% if course.me.owned == 0 and course.market_price > 0 %}
     {% set order_url = url({'for':'home.order.confirm'},{'item_id':course.id,'item_type':1}) %}
-    <div class="sidebar wrap">
-        <button class="layui-btn layui-btn-fluid layui-bg-red btn-buy" data-url="{{ order_url }}">立即购买</button>
-    </div>
+    {% set live_model_ok = course.model == 2 and course.attrs.end_date < date('Y-m-d') %}
+    {% set other_model_ok = course.model != 2 %}
+    {% if live_model_ok or other_model_ok %}
+        <div class="sidebar wrap">
+            <button class="layui-btn layui-btn-fluid layui-bg-red btn-buy" data-url="{{ order_url }}">立即购买</button>
+        </div>
+    {% endif %}
 {% endif %}
 
 {% if course.market_price == 0 %}
diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css
index aa001338..30ba9113 100644
--- a/public/static/home/css/common.css
+++ b/public/static/home/css/common.css
@@ -1522,8 +1522,6 @@
 .consult-info .item {
     margin-bottom: 15px;
     line-height: 1.5em;
-    height: 1.5em;
-    clear: both;
 }
 
 .consult-info .item .label {
diff --git a/public/static/home/js/course.show.js b/public/static/home/js/course.show.js
index 8e0f17e1..9a022292 100644
--- a/public/static/home/js/course.show.js
+++ b/public/static/home/js/course.show.js
@@ -29,6 +29,21 @@ layui.use(['jquery', 'layer', 'helper'], function () {
         });
     });
 
+    /**
+     * 咨询
+     */
+    $('.icon-help').on('click', function () {
+        var url = $(this).parent().data('url');
+        helper.checkLogin(function () {
+            layer.open({
+                type: 2,
+                title: '课程咨询',
+                content: [url, 'no'],
+                area: ['640px', '300px']
+            });
+        });
+    });
+
     /**
      * 打赏
      */