Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/app/adminapi/controller/UpgradeController.php

@@ -15038,9 +15038,9 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont
 (3006, 3001, '', '修改文章分类', '', '', '', 'cms/category/<id>', 'PUT', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733862d224', 0, '修改文章分类'),
 (3007, 3001, '', '获取修改文章分类表单', '', '', '', 'cms/category/<id>/edit', 'GET', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-edit', 0, '获取修改文章分类表单'),
 (3008, 3002, '', '删除文章分类', '', '', '', 'cms/category/<id>', 'DELETE', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733a5e8994', 0, '删除文章分类'),
-(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-index', 0, '商城首页'),
-(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-cate', 0, '商品分类'),
-(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-user', 0, '个人中心'),
+(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-index', 0, '商城首页'),
+(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-cate', 0, '商品分类'),
+(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-user', 0, '个人中心'),
 (3012, 3009, '', '添加专题页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-add', 0, '添加专题页'),
 (3013, 3009, '', '编辑页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-edit', 0, '编辑页面'),
 (3014, 3009, '', '删除页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-delete', 0, '删除页面'),

crmeb/app/adminapi/route/setting.php

@@ -127,7 +127,7 @@ Route::group('setting', function () {
     /** 组合数据 */
     Route::group(function () {
         //组合数据资源路由
-        Route::resource('group', 'v1.setting.SystemGroup')->except(['read'])->option([
+        Route::resource('group', 'v1.setting.SystemGroup')->option([
             'real_name' => [
                 'index' => '获取组合数据列表',
                 'create' => '获取组合数据表单',

crmeb/app/services/system/admin/SystemAdminServices.php

@@ -257,6 +257,10 @@ class SystemAdminServices extends BaseServices
         }
         unset($data['conf_pwd']);
 
+        if (strlen(trim($data['pwd'])) < 6 || strlen(trim($data['pwd'])) > 32) {
+            throw new AdminException(400762);
+        }
+
         if ($this->dao->count(['account' => $data['account'], 'is_del' => 0])) {
             throw new AdminException(400596);
         }
@@ -319,6 +323,11 @@ class SystemAdminServices extends BaseServices
             if ($data['conf_pwd'] != $data['pwd']) {
                 throw new AdminException(400264);
             }
+
+            if (strlen(trim($data['pwd'])) < 6 || strlen(trim($data['pwd'])) > 32) {
+                throw new AdminException(400762);
+            }
+
             $adminInfo->pwd = $this->passwordHash($data['pwd']);
         }
         //修改账号

crmeb/public/install/crmeb.sql

@@ -48059,9 +48059,9 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont
 (3006, 3001, '', '修改文章分类', '', '', '', 'cms/category/<id>', 'PUT', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733862d224', 0, '修改文章分类'),
 (3007, 3001, '', '获取修改文章分类表单', '', '', '', 'cms/category/<id>/edit', 'GET', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-edit', 0, '获取修改文章分类表单'),
 (3008, 3002, '', '删除文章分类', '', '', '', 'cms/category/<id>', 'DELETE', '[]', 1, 1, 0, 1, '', '', 2, '', 0, 'cms-category-646733a5e8994', 0, '删除文章分类'),
-(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-index', 0, '商城首页'),
-(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-cate', 0, '商品分类'),
-(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 1, '', 0, 'pages-diy-user', 0, '个人中心'),
+(3009, 657, '', '商城首页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-index', 0, '商城首页'),
+(3010, 657, '', '商品分类', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-cate', 0, '商品分类'),
+(3011, 657, '', '个人中心', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657', 3, '', 0, 'pages-diy-user', 0, '个人中心'),
 (3012, 3009, '', '添加专题页', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-add', 0, '添加专题页'),
 (3013, 3009, '', '编辑页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-edit', 0, '编辑页面'),
 (3014, 3009, '', '删除页面', 'admin', '', '', '', '', '[]', 0, 1, 0, 1, '/', '12/656/657/3009', 3, '', 0, 'pages-diy-delete', 0, '删除页面'),

template/admin/src/pages/marketing/storeCouponIssue/create.vue

@@ -29,7 +29,7 @@
             <Radio :label="4">付费会员专享</Radio>
           </RadioGroup>
           <div class="tip">
-            用户领取：用户需要手动领取优惠券；新用户自动发放：新注册的用户自动发放；系统赠送：后台发放制定用户或者添加到商品里面用户购买该商品获得；付费会员专享：仅付费会员可以领取和使用
+            用户领取：用户需要手动领取优惠券；新用户自动发放：新注册的用户自动发放；系统赠送：后台发放指定用户或者添加到商品里面用户购买该商品获得；付费会员专享：仅付费会员可以领取和使用
           </div>
         </FormItem>
         <FormItem label="优惠劵类型">