分类
- {% set sc_val = request.get('sc','int','all') %}
{% for category in sub_categories %}
{% set class = sc_val == category.id ? 'layui-btn layui-btn-xs' : 'none' %}
{{ category.name }}
@@ -28,7 +32,6 @@
类型
- {% set model_val = request.get('model','trim','all') %}
{% for model in models %}
{% set class = model_val == model.id ? 'layui-btn layui-btn-xs' : 'none' %}
{{ model.name }}
@@ -38,7 +41,6 @@
\ No newline at end of file
diff --git a/app/Http/Desktop/Views/macros/consult.volt b/app/Http/Desktop/Views/macros/consult.volt
new file mode 100644
index 00000000..fea654b5
--- /dev/null
+++ b/app/Http/Desktop/Views/macros/consult.volt
@@ -0,0 +1,9 @@
+{%- macro priority_info(value) %}
+ {% if value == 10 %}
+ 高
+ {% elseif value == 20 %}
+ 中
+ {% elseif value == 30 %}
+ 低
+ {% endif %}
+{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Desktop/Views/macros/group.volt b/app/Http/Desktop/Views/macros/group.volt
index f4ca289b..33fa8905 100644
--- a/app/Http/Desktop/Views/macros/group.volt
+++ b/app/Http/Desktop/Views/macros/group.volt
@@ -1,9 +1,9 @@
{%- macro type_info(value) %}
- {% if value == '1' %}
+ {% if value == 1 %}
课
- {% elseif value == '2' %}
+ {% elseif value == 2 %}
聊
- {% elseif value == '3' %}
+ {% elseif value == 3 %}
职
{% endif %}
{%- endmacro %}
\ No newline at end of file
diff --git a/app/Http/Desktop/Views/my/consults.volt b/app/Http/Desktop/Views/my/consults.volt
index 2ca3ba83..e77447f7 100644
--- a/app/Http/Desktop/Views/my/consults.volt
+++ b/app/Http/Desktop/Views/my/consults.volt
@@ -33,8 +33,8 @@
{% set delete_url = url({'for':'desktop.consult.delete','id':item.id}) %}
-
{{ date('Y-m-d',item.create_time) }}
diff --git a/app/Http/Desktop/Views/my/favorites.volt b/app/Http/Desktop/Views/my/favorites.volt
index 6753e3c6..38019bb4 100644
--- a/app/Http/Desktop/Views/my/favorites.volt
+++ b/app/Http/Desktop/Views/my/favorites.volt
@@ -37,7 +37,7 @@
{{ item.title }} {{ model_info(item.model) }}
{{ item.user_count }}
{{ item.favorite_count }}
- {{ item.rating }}
+ {{ "%0.1f"|format(item.rating) }}
diff --git a/app/Http/Desktop/Views/my/friends.volt b/app/Http/Desktop/Views/my/friends.volt
index adcc3b31..9b99c5de 100644
--- a/app/Http/Desktop/Views/my/friends.volt
+++ b/app/Http/Desktop/Views/my/friends.volt
@@ -44,7 +44,7 @@
{{ item.name }}
{{ gender_info(item.gender) }}
- {{ item.location }}
+ {{ item.area }}
{{ item.active_time|time_ago }}
diff --git a/app/Http/Desktop/Views/my/groups.volt b/app/Http/Desktop/Views/my/groups.volt
index 4ccb47f6..f5e3a6f4 100644
--- a/app/Http/Desktop/Views/my/groups.volt
+++ b/app/Http/Desktop/Views/my/groups.volt
@@ -2,13 +2,7 @@
{% block content %}
- {%- macro type_info(value) %}
- {% if value == 'course' %}
- 课
- {% elseif value == 'chat' %}
- 聊
- {% endif %}
- {%- endmacro %}
+ {{ partial('macros/group') }}
{% set joined_url = url({'for':'desktop.my.groups'},{'type':'joined'}) %}
{% set owned_url = url({'for':'desktop.my.groups'},{'type':'owned'}) %}
diff --git a/app/Http/Desktop/Views/my/groups_joined.volt b/app/Http/Desktop/Views/my/groups_joined.volt
index aec66dac..fbe983fa 100644
--- a/app/Http/Desktop/Views/my/groups_joined.volt
+++ b/app/Http/Desktop/Views/my/groups_joined.volt
@@ -16,10 +16,11 @@
{% for item in pager.items %}
+ {% set show_url = url({'for':'desktop.group.show','id':item.id}) %}
{% set owner_url = url({'for':'desktop.user.show','id':item.owner.id}) %}
{% set delete_url = url({'for':'desktop.im.quit_group','id':item.id}) %}
- {{ item.name }} {{ type_info(item.type) }}
+ {{ item.name }} {{ type_info(item.type) }}
{{ item.owner.name }}
{{ item.user_count }}
diff --git a/app/Http/Desktop/Views/my/reviews.volt b/app/Http/Desktop/Views/my/reviews.volt
index 799c5afb..544e65ca 100644
--- a/app/Http/Desktop/Views/my/reviews.volt
+++ b/app/Http/Desktop/Views/my/reviews.volt
@@ -36,9 +36,9 @@
-
-
-
+
+
+
diff --git a/app/Http/Desktop/Views/teaching/consults.volt b/app/Http/Desktop/Views/teaching/consults.volt
index 1e7a72a8..811c0628 100644
--- a/app/Http/Desktop/Views/teaching/consults.volt
+++ b/app/Http/Desktop/Views/teaching/consults.volt
@@ -2,6 +2,8 @@
{% block content %}
+ {{ partial('macros/consult') }}
+
{% set status_types = {'all':'全部','pending':'待回复','replied':'已回复'} %}
{% set status = request.get('status','trim','all') %}
@@ -45,7 +47,7 @@
- {{ item.priority }}
+ {{ priority_info(item.priority) }}
{{ date('Y-m-d',item.create_time) }}
diff --git a/app/Http/Desktop/Views/teaching/courses.volt b/app/Http/Desktop/Views/teaching/courses.volt
index 4b696999..71b55dd0 100644
--- a/app/Http/Desktop/Views/teaching/courses.volt
+++ b/app/Http/Desktop/Views/teaching/courses.volt
@@ -37,7 +37,7 @@
{{ item.lesson_count }}
{{ item.user_count }}
{{ item.favorite_count }}
- {{ item.rating }}
+ {{ "%0.1f"|format(item.rating) }}
{% endfor %}
diff --git a/app/Models/Consult.php b/app/Models/Consult.php
index affeddaf..a790c650 100644
--- a/app/Models/Consult.php
+++ b/app/Models/Consult.php
@@ -56,6 +56,13 @@ class Consult extends Model
*/
public $answer;
+ /**
+ * 评分
+ *
+ * @var int
+ */
+ public $rating;
+
/**
* 优先级
*
diff --git a/app/Services/Frontend/Consult/ConsultInfo.php b/app/Services/Frontend/Consult/ConsultInfo.php
index 3f889a04..bf6b00c2 100644
--- a/app/Services/Frontend/Consult/ConsultInfo.php
+++ b/app/Services/Frontend/Consult/ConsultInfo.php
@@ -27,8 +27,8 @@ class ConsultInfo extends FrontendService
'id' => $consult->id,
'question' => $consult->question,
'answer' => $consult->answer,
- 'private' => $consult->private,
'rating' => $consult->rating,
+ 'private' => $consult->private,
'like_count' => $consult->like_count,
'create_time' => $consult->create_time,
'update_time' => $consult->update_time,
diff --git a/db/migrations/20200827112717_insert_setting_data.php b/db/migrations/20200827112717_insert_setting_data.php
index 955feb10..2f677fca 100644
--- a/db/migrations/20200827112717_insert_setting_data.php
+++ b/db/migrations/20200827112717_insert_setting_data.php
@@ -82,52 +82,52 @@ final class InsertSettingData extends AbstractMigration
],
[
'section' => 'live.push',
- 'item_key' => 'push_auth_enabled',
+ 'item_key' => 'auth_enabled',
'item_value' => '1',
],
[
'section' => 'live.push',
- 'item_key' => 'push_auth_key',
+ 'item_key' => 'auth_key',
'item_value' => '',
],
[
'section' => 'live.push',
- 'item_key' => 'push_auth_delta',
+ 'item_key' => 'auth_delta',
'item_value' => '18000',
],
[
'section' => 'live.pull',
- 'item_key' => 'pull_protocol',
+ 'item_key' => 'protocol',
'item_value' => 'http',
],
[
'section' => 'live.pull',
- 'item_key' => 'pull_domain',
+ 'item_key' => 'domain',
'item_value' => '',
],
[
'section' => 'live.pull',
- 'item_key' => 'pull_trans_enabled',
+ 'item_key' => 'trans_enabled',
'item_value' => '0',
],
[
'section' => 'live.pull',
- 'item_key' => 'pull_auth_enabled',
+ 'item_key' => 'auth_enabled',
'item_value' => '1',
],
[
'section' => 'live.pull',
- 'item_key' => 'pull_auth_key',
+ 'item_key' => 'auth_key',
'item_value' => '',
],
[
'section' => 'live.pull',
- 'item_key' => 'pull_auth_delta',
+ 'item_key' => 'auth_delta',
'item_value' => '18000',
],
[
'section' => 'live.notify',
- 'item_key' => 'pull_auth_key',
+ 'item_key' => 'auth_key',
'item_value' => '',
],
[
diff --git a/public/static/desktop/css/common.css b/public/static/desktop/css/common.css
index 25a59b98..7454b7f8 100644
--- a/public/static/desktop/css/common.css
+++ b/public/static/desktop/css/common.css
@@ -73,6 +73,7 @@
}
.pager {
+ margin-top: 20px;
text-align: center;
}
难度
- {% set level_val = request.get('level','trim','all') %}
{% for level in levels %}
{% set class = level_val == level.id ? 'layui-btn layui-btn-xs' : 'none' %}
{{ level.name }}
@@ -48,7 +50,6 @@
- {% set sort_val = request.get('sort','trim','score') %}
{% for sort in sorts %}
{% set class = sort_val == sort.id ? 'layui-btn layui-btn-xs' : 'none' %}
{{ sort.name }}
diff --git a/app/Http/Desktop/Views/course/show_meta.volt b/app/Http/Desktop/Views/course/show_meta.volt
index e33e996d..45d73bdf 100644
--- a/app/Http/Desktop/Views/course/show_meta.volt
+++ b/app/Http/Desktop/Views/course/show_meta.volt
@@ -33,24 +33,24 @@
难度级别{{ level_info(course.level) }} 学习人次{{ course.user_count }} - 综合评分{{ course.ratings.rating }} + 综合评分{{ "%0.1f"|format(course.ratings.rating) }}
提问：{{ item.question }}
-回复：{{ item.answer }}
+提问：{{ item.question }}
+回复：{{ item.answer }}
评价：{{ item.content }}
提问：{{ item.question }}
回复：{{ answer }}