feat: 9.7.0

Author: modstart

app/Constant/AppConstant.php

@@ -6,6 +6,6 @@ class AppConstant
 {
     const APP = 'cms9';
     const APP_NAME = 'ModStartCMS9';
-    const VERSION = '9.6.0';
+    const VERSION = '9.7.0';
 
 }

module/AdminManager/Util/ModuleUtil.php

@@ -20,7 +20,8 @@ public static function modules()
             if (!$info) {
                 continue;
             }
-            $modules[] = "$m:$info[version]";
+            $isSystem = ModuleManager::isSystemModule($info['name']);
+            $modules[] = "$m:" . ($isSystem ? 'S' : 'U') . ":$info[version]";
         }
         return $modules;
     }

module/AdminManager/View/widget/serverInfo.blade.php

@@ -28,7 +28,10 @@
             <div class="col-lg-4 col-md-6">
                 <div class="tw-flex ub-border-bottom tw-p-2">
                     <div class="tw-w-24 tw-flex-shrink-0 tw-font-bold">PHP版本</div>
-                    <div class="tw-flex-grow">V{{PHP_VERSION}}</div>
+                    <div class="tw-flex-grow">
+                        V{{PHP_VERSION}}
+                        {{PHP_INT_SIZE == 8 ? '64' : '32'}}位
+                    </div>
                 </div>
             </div>
             <div class="col-lg-4 col-md-6">

module/Cms/Docs/release.md

@@ -1,3 +1,16 @@
+## 4.0.1 前台默认调用「其他备案信息」配置信息
+
+- 新增：前台默认调用「其他备案信息」配置信息
+
+---
+
+## 4.0.0 产品详情界面type自定义字段默认移除
+
+- 升级：模块基础依赖升级
+- 修复：产品详情界面type自定义字段默认移除
+
+---
+
 ## 3.9.0 记录新增seo相关字段无效的问题，已知缺陷修复
 
 - 修复：记录新增seo相关字段无效的问题

module/Cms/View/pc/cms/detail/product.blade.php

@@ -57,14 +57,14 @@
                             <div class="info">
                                 <div class="ub-pair">
                                     <div class="name">价格：</div>
-                                    <div class="value">{{empty($record['_data']['price'])?'暂无':$record['_data']['price']}}</div>
-                                </div>
-                                <div class="ub-pair">
-                                    <div class="name">分类：</div>
-                                    <div class="value">{{empty($record['_data']['type'])?'暂无':$record['_data']['type']}}</div>
+                                    <div class="value">
+                                        <div class="tw-text-lg tw-text-red-500">
+                                            {{empty($record['_data']['price'])?'暂无':$record['_data']['price']}}
+                                        </div>
+                                    </div>
                                 </div>
                                 <div class="ub-pair">
-                                    <div class="name">说明：</div>
+                                    <div class="name">介绍：</div>
                                     <div class="value">{{empty($record['summary'])?'[摘要]':$record['summary']}}</div>
                                 </div>
                             </div>

module/Cms/View/widget/cmsInfo.blade.php

@@ -17,6 +17,7 @@
                     @if(!config('modstart.admin.versionCheckDisable',false))
                         <div data-admin-version class="tw-mb-2"></div>
                     @endif
+                    <div data-module-notice class="tw-hidden tw-mb-2"></div>
                 </div>
                 <script type="text/javascript">
                     // 最新版本检测

module/Cms/config.json

@@ -15,11 +15,17 @@
         "WordSpliter",
         "SiteMapManager"
     ],
-    "tags": [],
-    "version": "3.9.0",
-    "modstartVersion": ">=4.1.0",
+    "tags": [
+        "CMS",
+        "内容系统"
+    ],
+    "version": "4.0.1",
+    "modstartVersion": ">=4.1.2",
     "author": "ModStart",
     "description": "提供通用的动态模型内容管理系统",
     "providers": [],
-    "config": {}
-}
+    "config": {},
+    "types": [
+        "PC"
+    ]
+}

module/Member/Admin/Controller/MemberController.php

@@ -41,6 +41,7 @@
 use Module\Member\Config\MemberOauth;
 use Module\Member\Events\MemberUserRegisteredEvent;
 use Module\Member\Events\MemberUserVipChangeEvent;
+use Module\Member\Model\MemberUser;
 use Module\Member\Provider\MemberAdminShowPanel\MemberAdminShowPanelProvider;
 use Module\Member\Type\Gender;
 use Module\Member\Type\MemberStatus;
@@ -58,7 +59,7 @@ protected function crud(AdminCRUDBuilder $builder)
     {
 
         $builder
-            ->init('member_user')
+            ->init(MemberUser::class)
             ->field(function ($builder) {
                 /** @var HasFields $builder */
                 $builder->id('id', 'ID');

module/Member/Admin/Controller/MemberCreditController.php

@@ -25,11 +25,11 @@ public function charge(AdminDialogPage $page)
     {
         $memberUserId = InputPackage::buildFromInput()->getInteger('memberUserId');
         $form = Form::make('');
-        $form->display('_total', '总积分')->value(MemberCreditUtil::getTotal($memberUserId))->addable(true);
-        $form->number('change', '积分变更')->help('负数表示减少')->required();
+        $form->display('_total', '总' . modstart_module_config('Member', 'creditName', '积分'))->value(MemberCreditUtil::getTotal($memberUserId))->addable(true);
+        $form->number('change', modstart_module_config('Member', 'creditName', '积分') . '变更')->help('负数表示减少')->required();
         $form->text('remark', '说明')->defaultValue('系统变更')->required();
         $form->showSubmit(false)->showReset(false);
-        return $page->pageTitle('积分变更')->body($form)->handleForm($form, function (Form $form) use ($memberUserId) {
+        return $page->pageTitle(modstart_module_config('Member', 'creditName', '积分') . '变更')->body($form)->handleForm($form, function (Form $form) use ($memberUserId) {
             AdminPermission::demoCheck();
             $data = $form->dataForming();
             ModelUtil::transactionBegin();

module/Member/Admin/Controller/MemberMoneyController.php

@@ -29,7 +29,7 @@ public function charge(AdminDialogPage $page)
         $form->decimal('change', '金额')->help('负数表示减少')->required();
         $form->text('remark', '说明')->defaultValue('系统变更')->required();
         $form->showSubmit(false)->showReset(false);
-        return $page->pageTitle('积分变更')->body($form)->handleForm($form, function (Form $form) use ($memberUserId) {
+        return $page->pageTitle(modstart_module_config('Member', 'creditName', '积分') . '变更')->body($form)->handleForm($form, function (Form $form) use ($memberUserId) {
             AdminPermission::demoCheck();
             $data = $form->dataForming();
             ModelUtil::transactionBegin();