gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-25 04:07:17 +08:00
Code Issues Releases Wiki Activity

整理代码

Browse Source
This commit is contained in:
xiaochong0302 2020-09-08 10:55:36 +08:00
parent 295b27c567
commit d21c0d72e5
7 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Admin/Services/Category.php
View File

@ -43,7 +43,7 @@ class Category extends Service
public function getChildCategories($parentId) public function getChildCategories($parentId)
{ {
$deleted = $this->request->getQuery('deleted', ['int'], 0); $deleted = $this->request->getQuery('deleted', 'int', 0);
$categoryRepo = new CategoryRepo(); $categoryRepo = new CategoryRepo();

2
app/Http/Admin/Services/Nav.php
View File

@ -35,7 +35,7 @@ class Nav extends Service
return $navRepo->findAll([ return $navRepo->findAll([
'position' => NavModel::POS_TOP, 'position' => NavModel::POS_TOP,
'parent_id' => 0, 'parent_id' => 0,
'published' => 1, 'deleted' => 0,
]); ]);
} }

15
app/Http/Admin/Services/Setting.php
View File

@ -114,20 +114,7 @@ class Setting extends Service
public function updateSmserSettings($section, $settings) public function updateSmserSettings($section, $settings)
{ {
$template = $settings['template']; $settings['template'] = kg_json_encode($settings['template']);
$keys = array_keys($template['id']);
$myTemplate = [];
foreach ($keys as $key) {
$myTemplate[$key] = [
'id' => $template['id'][$key],
'content' => $template['content'][$key],
];
}
$settings['template'] = kg_json_encode($myTemplate);
$this->updateSectionSettings($section, $settings); $this->updateSectionSettings($section, $settings);
} }

9
app/Http/Admin/Views/category/list.volt
View File

@ -2,9 +2,9 @@
{% block content %} {% block content %}
{% set back_url = url({'for':'admin.category.list'}) %} {% set back_url = url({'for':'admin.category.list'},{'type':type}) %}
{% set add_url = url({'for':'admin.category.add'},{'type':type,'parent_id':parent.id}) %} {% set add_url = url({'for':'admin.category.add'},{'type':type,'parent_id':parent.id}) %}
{% set allow_add = (type == 'course' and parent.level < 2) or (type == 'help' and parent.level < 1) %} {% set allow_add = (type == 1 and parent.level < 2) or (type == 2 and parent.level < 1) %}
<div class="kg-nav"> <div class="kg-nav">
<div class="kg-nav-left"> <div class="kg-nav-left">
@ -46,7 +46,6 @@
</thead> </thead>
<tbody> <tbody>
{% for item in categories %} {% for item in categories %}
{% set show_child_url = item.type == 'course' and item.level < 2 %}
{% set child_url = url({'for':'admin.category.list'},{'type':item.type,'parent_id':item.id}) %} {% set child_url = url({'for':'admin.category.list'},{'type':item.type,'parent_id':item.id}) %}
{% set edit_url = url({'for':'admin.category.edit','id':item.id}) %} {% set edit_url = url({'for':'admin.category.edit','id':item.id}) %}
{% set update_url = url({'for':'admin.category.update','id':item.id}) %} {% set update_url = url({'for':'admin.category.update','id':item.id}) %}
@ -54,10 +53,10 @@
{% set restore_url = url({'for':'admin.category.restore','id':item.id}) %} {% set restore_url = url({'for':'admin.category.restore','id':item.id}) %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
{% if show_child_url %} {% if item.type == 1 and item.level < 2 %}
<td><a href="{{ child_url }}">{{ item.name }}</a></td> <td><a href="{{ child_url }}">{{ item.name }}</a></td>
{% else %} {% else %}
<td>{{ item.name }}</td> <td><a href="{{ edit_url }}">{{ item.name }}</a></td>
{% endif %} {% endif %}
<td><span class="layui-badge layui-bg-gray">{{ item.level }}</span></td> <td><span class="layui-badge layui-bg-gray">{{ item.level }}</span></td>
<td><span class="layui-badge layui-bg-gray">{{ item.child_count }}</span></td> <td><span class="layui-badge layui-bg-gray">{{ item.child_count }}</span></td>

4
app/Http/Admin/Views/nav/list.volt
View File

@ -72,10 +72,10 @@
{% set restore_url = url({'for':'admin.nav.restore','id':item.id}) %} {% set restore_url = url({'for':'admin.nav.restore','id':item.id}) %}
<tr> <tr>
<td>{{ item.id }}</td> <td>{{ item.id }}</td>
{% if item.position == 'top' and item.level < 2 %} {% if item.position == 1 and item.level < 2 %}
<td><a href="{{ child_url }}">{{ item.name }}</a></td> <td><a href="{{ child_url }}">{{ item.name }}</a></td>
{% else %} {% else %}
<td>{{ item.name }}</td> <td><a href="{{ edit_url }}">{{ item.name }}</a></td>
{% endif %} {% endif %}
<td><span class="layui-badge layui-bg-gray">{{ item.level }}</span></td> <td><span class="layui-badge layui-bg-gray">{{ item.level }}</span></td>
<td><span class="layui-badge layui-bg-gray">{{ item.child_count }}</span></td> <td><span class="layui-badge layui-bg-gray">{{ item.child_count }}</span></td>

16
app/Http/Admin/Views/setting/smser.volt
View File

@ -47,26 +47,26 @@
<tbody> <tbody>
<tr> <tr>
<td>身份验证</td> <td>身份验证</td>
<td><input class="layui-input" type="text" name="template[id][verify]" value="{{ template.verify.id }}" lay-verify="required"></td> <td><input class="layui-input" type="text" name="template[verify]" value="{{ template.verify }}" lay-verify="required"></td>
<td><input id="tc-verify" class="layui-input" type="text" name="template[content][verify]" value="{{ template.verify.content }}" readonly="readonly" lay-verify="required"></td> <td><input id="tc-verify" class="layui-input" type="text" value="验证码：{1}，{2} 分钟内有效，如非本人操作请忽略。" readonly="readonly"></td>
<td><span class="kg-copy layui-btn" data-clipboard-target="#tc-verify">复制</span></td> <td><span class="kg-copy layui-btn" data-clipboard-target="#tc-verify">复制</span></td>
</tr> </tr>
<tr> <tr>
<td>订单通知</td> <td>订单通知</td>
<td><input class="layui-input" type="text" name="template[id][order]" value="{{ template.order.id }}" lay-verify="required"></td> <td><input class="layui-input" type="text" name="template[order]" value="{{ template.order }}" lay-verify="required"></td>
<td><input id="tc-order" class="layui-input" type="text" name="template[content][order]" value="{{ template.order.content }}" readonly="readonly" lay-verify="required"></td> <td><input id="tc-order" class="layui-input" type="text" value="下单成功，商品名称：{1}，订单序号：{2}，订单金额：￥{3}" readonly="readonly"></td>
<td><span class="kg-copy layui-btn" data-clipboard-target="#tc-order">复制</span></td> <td><span class="kg-copy layui-btn" data-clipboard-target="#tc-order">复制</span></td>
</tr> </tr>
<tr> <tr>
<td>退款通知</td> <td>退款通知</td>
<td><input class="layui-input" type="text" name="template[id][refund]" value="{{ template.refund.id }}" lay-verify="required"></td> <td><input class="layui-input" type="text" name="template[refund]" value="{{ template.refund }}" lay-verify="required"></td>
<td><input id="tc-refund" class="layui-input" type="text" name="template[content][refund]" value="{{ template.refund.content }}" readonly="readonly" lay-verify="required"></td> <td><input id="tc-refund" class="layui-input" type="text" value="退款成功，商品名称：{1}，订单序号：{2}，退款金额：￥{3}" readonly="readonly"></td>
<td><span class="kg-copy layui-btn" data-clipboard-target="#tc-refund">复制</span></td> <td><span class="kg-copy layui-btn" data-clipboard-target="#tc-refund">复制</span></td>
</tr> </tr>
<tr> <tr>
<td>直播通知</td> <td>直播通知</td>
<td><input class="layui-input" type="text" name="template[id][live]" value="{{ template.live.id }}" lay-verify="required"></td> <td><input class="layui-input" type="text" name="template[live]" value="{{ template.live }}" lay-verify="required"></td>
<td><input id="tc-live" class="layui-input" type="text" name="template[content][live]" value="{{ template.live.content }}" readonly="readonly" lay-verify="required"></td> <td><input id="tc-live" class="layui-input" type="text" value="直播预告，课程名称：{1}，章节名称：{2}，开播时间：{3}" readonly="readonly"></td>
<td><span class="kg-copy layui-btn" data-clipboard-target="#tc-live">复制</span></td> <td><span class="kg-copy layui-btn" data-clipboard-target="#tc-live">复制</span></td>
</tr> </tr>
</tbody> </tbody>

2
db/migrations/20200827112717_insert_setting_data.php
View File

@ -348,7 +348,7 @@ final class InsertSettingData extends AbstractMigration
[ [
'section' => 'smser', 'section' => 'smser',
'item_key' => 'template', 'item_key' => 'template',
'item_value' => '{"verify":{"id":"561282","content":"验证码：{1}，{2} 分钟内有效，如非本人操作请忽略。"},"order":{"id":"561954","content":"下单成功，商品名称：{1}，订单序号：{2}，订单金额：￥{3}"},"refund":{"id":"561286","content":"退款成功，商品名称：{1}，订单序号：{2}，退款金额：￥{3}"},"live":{"id":"561288","content":"直播预告，课程名称：{1}，章节名称：{2}，开播时间：{3}"}}', 'item_value' => '{"verify":"561282","order":"561954","refund":"561286","live":"561288"}',
], ],
[ [
'section' => 'cos', 'section' => 'cos',