From 5784be506727806c2e1e4c3e24dc25306ffa9101 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Thu, 8 Oct 2020 17:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=90=8E=E5=8F=B0=E4=BB=8A?= =?UTF-8?q?=E6=97=A5=E7=BB=9F=E8=AE=A1,=E5=A2=9E=E5=8A=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5=E8=8F=9C=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 10 ++++ app/Caches/SiteTodayStat.php | 50 ++++++------------- app/Http/Admin/Controllers/Controller.php | 2 +- app/Http/Admin/Controllers/VodController.php | 2 +- app/Http/Admin/Views/index/index.volt | 5 +- .../Admin/Views/index/main_today_stat.volt | 18 ++++--- public/static/admin/css/common.css | 9 +++- public/static/admin/js/media.upload.js | 2 +- 8 files changed, 51 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5fbe0f3..95530986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### [v1.1.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.1.0)(2020-10-08) + +- 增加运营统计功能 +- 增加课程资料功能 +- 增加changelog +- 忽略schema +- 账户安全页面调整 +- 简化部分路由 +- 修复相关课程列表undefined问题 + ### [v1.0.0-beta1](https://gitee.com/koogua/course-tencent-cloud/releases/v1.0.0-beta1)(2020-09-26) 前台功能： diff --git a/app/Caches/SiteTodayStat.php b/app/Caches/SiteTodayStat.php index dde4824b..13c0ae66 100644 --- a/app/Caches/SiteTodayStat.php +++ b/app/Caches/SiteTodayStat.php @@ -2,8 +2,7 @@ namespace App\Caches; -use App\Models\Order as OrderModel; -use App\Models\User as UserModel; +use App\Repos\Stat as StatRepo; class SiteTodayStat extends Cache { @@ -22,42 +21,21 @@ class SiteTodayStat extends Cache public function getContent($id = null) { + $statRepo = new StatRepo(); + + $date = date('Y-m-d'); + + $saleCount = $statRepo->countDailySales($date); + $saleAmount = $statRepo->sumDailySales($date); + $refundAmount = $statRepo->sumDailyRefunds($date); + $registerCount = $statRepo->countDailyRegisteredUser($date); + return [ - 'user_count' => $this->countUsers(), - 'order_count' => $this->countOrders(), - 'sale_amount' => $this->sumSales(), + 'sale_count' => $saleCount, + 'sale_amount' => $saleAmount, + 'refund_amount' => $refundAmount, + 'register_count' => $registerCount, ]; } - protected function countUsers() - { - return (int)UserModel::count([ - 'conditions' => 'create_time > :time:', - 'bind' => ['time' => strtotime('today')], - ]); - } - - protected function countOrders() - { - return (int)OrderModel::count([ - 'conditions' => 'create_time > :time: AND status = :status:', - 'bind' => [ - 'time' => strtotime('today'), - 'status' => OrderModel::STATUS_FINISHED, - ], - ]); - } - - protected function sumSales() - { - return (float)OrderModel::sum([ - 'column' => 'amount', - 'conditions' => 'create_time > :time: AND status = :status:', - 'bind' => [ - 'time' => strtotime('today'), - 'status' => OrderModel::STATUS_FINISHED, - ], - ]); - } - } diff --git a/app/Http/Admin/Controllers/Controller.php b/app/Http/Admin/Controllers/Controller.php index b38fabe5..058bfa77 100644 --- a/app/Http/Admin/Controllers/Controller.php +++ b/app/Http/Admin/Controllers/Controller.php @@ -49,7 +49,7 @@ class Controller extends \Phalcon\Mvc\Controller * 特例白名单 */ $whitelist = [ - 'controllers' => ['public', 'index', 'vod', 'test', 'xm_course'], + 'controllers' => ['public', 'index', 'vod', 'upload', 'test', 'xm_course'], 'routes' => ['admin.package.guiding'], ]; diff --git a/app/Http/Admin/Controllers/VodController.php b/app/Http/Admin/Controllers/VodController.php index d2ffdfa5..4ee0f40b 100644 --- a/app/Http/Admin/Controllers/VodController.php +++ b/app/Http/Admin/Controllers/VodController.php @@ -11,7 +11,7 @@ class VodController extends Controller { /** - * @Post("/upload/sign", name="admin.vod.upload_sign") + * @Get("/upload/sign", name="admin.vod.upload_sign") */ public function uploadSignatureAction() { diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt index 0db1db09..a676fc79 100644 --- a/app/Http/Admin/Views/index/index.volt +++ b/app/Http/Admin/Views/index/index.volt @@ -13,11 +13,14 @@
- +
    +
  • + 首页 +
    • {% for item in top_menus %}
  • {{ item.title }} diff --git a/app/Http/Admin/Views/index/main_today_stat.volt b/app/Http/Admin/Views/index/main_today_stat.volt index 14de64c0..3f13f9eb 100644 --- a/app/Http/Admin/Views/index/main_today_stat.volt +++ b/app/Http/Admin/Views/index/main_today_stat.volt @@ -2,22 +2,28 @@
    今日统计
    -
    +
    用户注册
    -
    {{ today_stat.user_count }}
    +
    {{ today_stat.register_count }}
    -
    +
    成交订单
    -
    {{ today_stat.order_count }}
    +
    {{ today_stat.sale_count }}
    -
    +
    销售金额
    -
    {{ today_stat.sale_amount }}
    +
    {{ '￥%0.2f'|format(today_stat.sale_amount) }}
    +
    +
    +
    +
    +
    退款金额
    +
    {{ '￥%0.2f'|format(today_stat.refund_amount) }}
    diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css index 23231fef..b5ef5dcc 100644 --- a/public/static/admin/css/common.css +++ b/public/static/admin/css/common.css @@ -60,10 +60,17 @@ } .kg-login-wrap { - width: 400px; + width: 500px; margin: 100px auto; } +.kg-login-wrap .layui-card-header { + height: 50px; + line-height: 50px; + text-align: center; + font-size: 16px; +} + .kg-login-form { padding: 15px 10px 5px 10px; } diff --git a/public/static/admin/js/media.upload.js b/public/static/admin/js/media.upload.js index 0634b353..5f0f0065 100644 --- a/public/static/admin/js/media.upload.js +++ b/public/static/admin/js/media.upload.js @@ -6,7 +6,7 @@ layui.use(['jquery', 'element'], function () { var getSignature = function () { var result = ''; $.ajax({ - type: 'POST', + type: 'GET', url: '/admin/vod/upload/sign', async: false, success: function (res) {