diff --git a/module/Member/Admin/Controller/ConfigController.php b/module/Member/Admin/Controller/ConfigController.php index ce4e17f3fd040a86f77a3f1080ae5035ef25efe1..f1e307ffb8d3d3e6825d2c15c1d75c617e7597b3 100644 --- a/module/Member/Admin/Controller/ConfigController.php +++ b/module/Member/Admin/Controller/ConfigController.php @@ -33,9 +33,17 @@ class ConfigController extends Controller public function agreement(AdminConfigBuilder $builder) { $builder->pageTitle('用户协议'); - $builder->switch('Member_AgreementEnable', '用户使用协议开启'); - $builder->text('Member_AgreementTitle', '用户使用协议标题')->help('默认为 用户使用协议'); - $builder->richHtml('Member_AgreementContent', '用户使用协议内容'); + $builder->switch('Member_AgreementEnable', '用户使用协议开启') + ->when('=', true, function ($builder) { + $builder->text('Member_AgreementTitle', '用户使用协议标题')->help('默认为 用户使用协议'); + $builder->richHtml('Member_AgreementContent', '用户使用协议内容'); + }); + + $builder->switch('Member_PrivacyEnable', '用户隐私协议开启') + ->when('=', true, function ($builder) { + $builder->text('Member_PrivacyTitle', '用户隐私协议标题')->help('默认为 用户隐私协议'); + $builder->richHtml('Member_PrivacyContent', '用户隐私协议内容'); + }); $builder->formClass('wide'); return $builder->perform(); } diff --git a/module/Member/Admin/Controller/MemberGroupController.php b/module/Member/Admin/Controller/MemberGroupController.php index ebac0e065430459431d50dd99655051a72052259..0dfdfc8f2ac2c751d3eac63c64ca4d7454ff4f06 100644 --- a/module/Member/Admin/Controller/MemberGroupController.php +++ b/module/Member/Admin/Controller/MemberGroupController.php @@ -41,5 +41,6 @@ class MemberGroupController extends Controller ->hookSaved(function (Form $form) { MemberGroupUtil::clearCache(); }); + $builder->repository()->setSortColumn('id'); } } diff --git a/module/Member/Docs/release/2.2.0.md b/module/Member/Docs/release/2.2.0.md index ea0f8895fd5608f0b043bec7f21726ea8a3c4b86..bbf3cccd21dce8525927e68bebda55e4f89afe23 100644 --- a/module/Member/Docs/release/2.2.0.md +++ b/module/Member/Docs/release/2.2.0.md @@ -1,3 +1,6 @@ +用户隐私协议配置,用户系统上周增长报表 +--- - 新增:用户系统上周增长报表 +- 新增:用户隐私协议配置 diff --git a/module/Member/Docs/release/2.3.0.md b/module/Member/Docs/release/2.3.0.md new file mode 100644 index 0000000000000000000000000000000000000000..7706bbe53eeb378decf8dc4ddec08806b216f0c2 --- /dev/null +++ b/module/Member/Docs/release/2.3.0.md @@ -0,0 +1,4 @@ + + +- 优化:地址选择模块依赖提示 +- 修复:用户分组编辑排序字段问题 diff --git a/module/Member/View/pc/member/agreement.blade.php b/module/Member/View/pc/member/page.blade.php similarity index 51% rename from module/Member/View/pc/member/agreement.blade.php rename to module/Member/View/pc/member/page.blade.php index 54c3401ca2e77b3ad28ddf812a15fa4c0ad714a1..19000c867e9594e5bd13e4e3087f28a33aa0b6f7 100644 --- a/module/Member/View/pc/member/agreement.blade.php +++ b/module/Member/View/pc/member/page.blade.php @@ -1,8 +1,8 @@ @extends($_viewFrame) -@section('pageTitleMain'){{modstart_config('Member_AgreementTitle','用户使用协议')}}@endsection -@section('pageKeywords')用户使用协议@endsection -@section('pageDescription')用户使用协议@endsection +@section('pageTitleMain'){{$pageTitle}}@endsection +@section('pageKeywords'){{$pageTitle}}@endsection +@section('pageDescription'){{$pageTitle}}@endsection @section('body') @@ -11,10 +11,10 @@