feat: 6.4.0

Author: modstart

app/Constant/AppConstant.php

@@ -6,5 +6,5 @@ class AppConstant
 {
     const APP = 'cms';
     const APP_NAME = 'ModStartCMS';
-    const VERSION = '6.3.0';
+    const VERSION = '6.4.0';
 }

database/migrations/2015_12_22_213911_create_config.php

@@ -17,7 +17,7 @@ public function up()
             $table->timestamps();
 
             $table->string('key', 100)->nullable()->comment('');
-            $table->text('value');
+            $table->text('value')->nullable()->comment('内容');
 
             $table->index('key');
         });

module/Banner/Admin/Controller/BannerController.php

@@ -11,6 +11,7 @@
 use ModStart\Grid\GridFilter;
 use ModStart\Support\Concern\HasFields;
 use Module\Banner\Type\BannerPosition;
+use Module\Banner\Type\BannerPositionRemark;
 use Module\Banner\Type\BannerType;
 use Module\Banner\Util\BannerUtil;
 
@@ -25,7 +26,7 @@ protected function crud(AdminCRUDBuilder $builder)
             ->field(function ($builder) {
                 /** @var HasFields $builder */
                 $builder->id('id', 'ID');
-                $builder->select('position', '位置')->optionType(BannerPosition::class);
+                $builder->select('position', '位置')->optionType(BannerPositionRemark::class);
                 $builder->image('image', '图片');
                 $builder->radio('type', '样式类型')
                     ->optionType(BannerType::class)

module/Banner/Biz/AbstractBannerPositionBiz.php

@@ -9,4 +9,9 @@ abstract class AbstractBannerPositionBiz
     abstract public function name();
 
     abstract public function title();
+
+    public function remark()
+    {
+        return null;
+    }
 }

module/Banner/Biz/BannerPositionBiz.php

@@ -6,13 +6,19 @@
 
 use Module\Vendor\Provider\BizTrait;
 
+/**
+ * Class BannerPositionBiz
+ * @package Module\Banner\Biz
+ *
+ * @method static AbstractBannerPositionBiz[] listAll()
+ */
 class BannerPositionBiz
 {
     use BizTrait;
 
-    public static function registerQuick($name, $title)
+    public static function registerQuick($name, $title, $remark = null)
     {
-        self::register(QuickBannerPositionBiz::make($name, $title));
+        self::register(QuickBannerPositionBiz::make($name, $title, $remark));
     }
 
     /**

module/Banner/Biz/QuickBannerPositionBiz.php

@@ -8,12 +8,14 @@ class QuickBannerPositionBiz extends AbstractBannerPositionBiz
 {
     protected $name;
     protected $title;
+    protected $remark;
 
-    public static function make($name, $title)
+    public static function make($name, $title, $remark = null)
     {
         $o = new static();
         $o->name = $name;
         $o->title = $title;
+        $o->remark = $remark;
         return $o;
     }
 
@@ -27,5 +29,9 @@ public function title()
         return $this->title;
     }
 
+    public function remark()
+    {
+        return $this->remark;
+    }
 
 }

module/Banner/Docs/release.md

@@ -2,6 +2,7 @@
 
 - 新增：模块快速调用方式
 - 新增：快速调用方式增加container参数
+- 新增：轮播使用者remark参数，显示轮播提示
 
 ---
 

module/Banner/Type/BannerPositionRemark.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace Module\Banner\Type;
+
+
+use Module\Banner\Biz\BannerPositionBiz;
+
+class BannerPositionRemark extends BannerPosition
+{
+    public static function getList()
+    {
+        $map = parent::getList();
+        foreach ($map as $k => $v) {
+            $biz = BannerPositionBiz::get($k);
+            if ($biz && $biz->remark()) {
+                $map[$k] = $v . '(' . $biz->remark() . ')';
+            }
+        }
+        return $map;
+    }
+}

module/Member/Admin/Controller/MemberDashboardController.php

@@ -51,7 +51,8 @@ public function index(AdminPage $page)
         $page->append(Box::make(Line::make()->tableDailyCountLatest(
             [
                 ['title' => '总数', 'table' => 'member_user'],
-            ]
+            ],
+            30
         ), '会员增长趋势'));
         return $page;
     }

module/Member/Docs/release.md

@@ -1,6 +1,7 @@
 ## 3.6.0
 
 - 新增：用户PC充值页面适配快捷支付功能
+- 新增：用户增长趋势显示最近30天记录
 - 修复：在线充值支付中心未安装页面提示
 
 ---