完善功能

app/admin/controller/member/CheckupController.php

@@ -92,6 +92,9 @@ class CheckupController extends Curd
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
                 $wellnessRecordFileJson = [];
                 foreach ($item->wellness_record_file_json as $value) {
+                    if (empty($value['url']) || empty($value['name'])){
+                        continue;
+                    }
                     $wellnessRecordFileJson[] = [
                         'url' => getenv('STORAGE_DOMAIN') . $value['url'],
                         'name' => $value['name']

app/admin/validate/healthy/ProductValidate.php

@@ -10,7 +10,7 @@ class ProductValidate extends Validate
         'product_id' => 'require|integer',
         'product_category_id' => 'require|integer',
         'product_shop_id' => 'require|integer',
-        'product_name|产品名称' => 'require|chsDash',
+        'product_name|产品名称' => 'require',
         'product_price|价格' => 'require|float',
         'product_freight_fee|运费' => 'require|float',
         'product_postage_id|运费模板' => 'require|integer',

app/admin/validate/life/CinemaIlkValidate.php

@@ -7,7 +7,7 @@ use support\Validate;
 class CinemaIlkValidate extends Validate
 {
     protected $rule = [
-        'ilk_name|名称' => 'chsDash',
+//        'ilk_name|名称' => 'chsDash',
     ];
 
     protected $message = [];

app/admin/validate/life/CinemaPerformersValidate.php

@@ -7,7 +7,7 @@ use support\Validate;
 class CinemaPerformersValidate extends Validate
 {
     protected $rule = [
-        'performers_name|姓名' => 'require|chsDash',
+        'performers_name|姓名' => 'require',
         'performers_img|照片' => 'url',
         'performers_type|类型' => 'require|in:1,2',
 //        'performers_introduction|简介' => 'chsDash',

app/admin/validate/life/CinemaValidate.php

@@ -8,7 +8,7 @@ class CinemaValidate extends Validate
 {
     protected $rule = [
         'cinema_id' => 'integer',
-        'cinema_name|名称' => 'chsDash',
+        'cinema_name|名称' => 'max:255',
         'cinema_img|图片' => 'url',
         'cinema_video|视频' => 'url',
         'cinema_price|价格' => 'float',

app/admin/validate/life/CollegeCoursesValidate.php

@@ -8,7 +8,7 @@ class CollegeCoursesValidate extends Validate
 {
     protected $rule = [
         'courses_id' => 'require|integer',
-        'courses_name|名称' => 'require|chsDash',
+        'courses_name|名称' => 'require',
         'courses_img|图片' => 'url',
         'courses_introduction|简介' => 'require',
         'courses_type|类型' => 'integer',

app/admin/validate/life/CollegeTeacherValidate.php

@@ -8,8 +8,8 @@ class CollegeTeacherValidate extends Validate
 {
     protected $rule = [
         'teacher_id' => 'require|integer',
-        'teacher_name|老师名称' => 'require|chsDash',
-        'teacher_title|职称' => 'chsDash',
+        'teacher_name|老师名称' => 'require',
+        'teacher_title|职称' => 'max:64',
         'teacher_img|头像' => 'require|url',
         'teacher_introduction|简介' => 'max:255',
         'teacher_is_del' => 'integer',

app/admin/validate/life/CollegeTeachingValidate.php

@@ -8,7 +8,7 @@ class CollegeTeachingValidate extends Validate
 {
     protected $rule = [
         'teaching_id' => 'require|integer',
-        'teaching_name|名称' => 'require|chsDash',
+        'teaching_name|名称' => 'require',
         'teaching_time|上课时间' => 'date',
         'teaching_courses_id|所属课程' => 'require|integer',
         'teaching_price|价格' => 'float',

app/admin/validate/life/FarmGoodsValidate.php

@@ -13,7 +13,7 @@ class FarmGoodsValidate extends Validate
         'goods_status' => 'integer',    // 产品状态 PENDING=待处理|ON=上架(已激活)|OFF=下架|DISABLED=已禁用
         'goods_category' => '',
         'goods_prefix' => '',
-        'goods_name' => 'require|chsDash',
+        'goods_name' => 'require',
         'goods_market_price' => '',
         'goods_sales_price' => '',
         'goods_sku_json' => '',
@@ -30,10 +30,10 @@ class FarmGoodsValidate extends Validate
         'goods_sell_num' => 'require|integer',
         'goods_postage_id' => 'require|integer',
         'goods_weight' => 'float',
-        'goods_storage' => 'chsDash',
-        'goods_packaging' => 'chsDash',
-        'goods_varieties' => 'chsDash',
-        'goods_attr' => 'chsDash',
+        'goods_storage' => 'max:255',
+        'goods_packaging' => 'max:255',
+        'goods_varieties' => 'max:255',
+        'goods_attr' => 'max:255',
         'goods_sort' => 'require|integer'
     ];
 

app/admin/validate/life/FarmLandValidate.php

@@ -8,7 +8,7 @@ class FarmLandValidate extends Validate
 {
     protected $rule = [
         'land_id' => 'require|integer',
-        'land_name|地块名' => 'require|chsDash',
+        'land_name|地块名' => 'require',
         'land_price|价格' => 'require|float',
         'land_long|经度' => 'require|regex:/^[0-9\.]+$/',
         'land_lat|纬度' => 'require|regex:/^[0-9\.]+$/'

app/admin/validate/life/FarmPackageGoodsValidate.php

@@ -9,8 +9,8 @@ class FarmPackageGoodsValidate extends Validate
     protected $rule = [
         'goods_id' => 'require|integer',
         'goods_package_id' => 'require|integer',
-        'goods_name' => 'require|chsDash',
-        'goods_num' => 'require|chsDash',
+        'goods_name' => 'require',
+        'goods_num' => 'require',
         'goods_price' => 'require|float',
         'goods_sort' => 'integer',
     ];

app/admin/validate/life/FarmPackageValidate.php

@@ -12,7 +12,7 @@ class FarmPackageValidate extends Validate
         'package_category_id' => 'require|integer',
         'package_cate' => 'in:次卡,月卡,年卡',
         'package_type' => 'require|integer',
-        'package_name' => 'require|chsDash',
+        'package_name' => 'require',
         'package_image' => 'regex:/^[0-9a-zA-Z\/\.]+$/',
         'package_slide' => 'regex:/^[0-9a-zA-Z\/\.\,]+$/',
         'package_tags' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-\,]+$/u',

app/admin/validate/medical/DoctorValidate.php

@@ -8,8 +8,8 @@ class DoctorValidate extends Validate
 {
     protected $rule = [
         'doctor_id' => 'require|integer',
-        'doctor_name|姓名' => 'require|chsDash',
-        'doctor_position|职位' => 'require|chsDash',
+        'doctor_name|姓名' => 'require',
+        'doctor_position|职位' => 'require',
         'doctor_avatar|头像' => 'require|url',
         'doctor_mobile|联系电话' => 'mobile',
         'doctor_is_visit|是否出诊' => 'require|in:0,1',

app/admin/validate/medical/ReservationServiceValidate.php

@@ -10,7 +10,7 @@ class ReservationServiceValidate extends Validate
         'service_id' => 'require|integer',
         'service_category_id' => 'require|integer',
         'service_shop_id' => 'require|integer',
-        'service_name|名称' => 'require|chsDash',
+        'service_name|名称' => 'require',
         'service_price|价格' => 'require|float',
         'service_avatar|头像' => 'regex:/^[0-9a-zA-Z\.\/]+$/',
         'service_type|是否支持多次预约' => 'in:0,1',

app/admin/validate/medical/SalesmanValidate.php

@@ -9,7 +9,7 @@ class SalesmanValidate extends Validate
     protected $rule = [
         'salesman_id' => 'require|integer',
         'salesman_shop_id' => 'require|integer',
-        'salesman_name|姓名' => 'require|chsDash',
+        'salesman_name|姓名' => 'require',
         'salesman_username|登录名' => 'require|alphaDash',
         'salesman_password|密码' => 'require|alphaDash',
         'salesman_phone|手机号' => 'require|mobile',

app/admin/validate/medical/ShopValidate.php

@@ -8,8 +8,8 @@ class ShopValidate extends Validate
 {
     protected $rule = [
         'shop_id' => 'require|integer',
-        'shop_name|店铺名称' => 'require|chsDash',
-        'shop_real_name|负责人' => 'require|chsDash',
+        'shop_name|店铺名称' => 'require',
+        'shop_real_name|负责人' => 'require',
         'shop_logo|LOGO' => 'url',
         'shop_img|展示图' => 'regex:/^[0-9a-zA-Z\.\/]+$/',
 //        'shop_label' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-\,\s]+$/u',

app/admin/validate/sys_manage/CategoryValidate.php

@@ -7,13 +7,13 @@ use support\Validate;
 class CategoryValidate extends Validate
 {
     protected $rule = [
-        'category_name|分类名称' => 'require|chsDash',
+        'category_name|分类名称' => 'require',
         'category_super_id|上级' => 'integer',
         'category_status|分类' => 'require|in:PENDING,ACTIVED,DISABLED',
-        'category_classify|归类' => 'chsDash',
-        'category_type|类型' => 'chsDash',
+        'category_classify|归类' => 'max:255',
+        'category_type|类型' => 'max:255',
         'category_sort|排序' => 'integer',
-        'category_groupby|分组' => 'chsDash',
+        'category_groupby|分组' => 'max:255',
 //        'category_remark|备注' => 'chsDash'
     ];
 

app/admin/validate/sys_manage/ConfigValidate.php

@@ -10,11 +10,11 @@ class ConfigValidate extends Validate
         'config_status|状态' => 'require|in:ACTIVED,DISABLED',
         'config_category|分类' => 'require|in:SYSTEM,APP',
         'config_key|标识' => 'require|alphaDash',
-        'config_name|名称' => 'chsDash',
-        'config_alias|别名' => 'chsDash',
+        'config_name|名称' => 'max:255',
+        'config_alias|别名' => 'max:255',
         'config_value_json|配置内容' => 'isJson',
         'config_sort|排序' => 'integer',
-        'config_groupby|分组' => 'chsDash',
+        'config_groupby|分组' => 'max:255',
         'config_extend_json' => 'isJson'
     ];
 

app/admin/validate/sys_manage/DeptValidate.php

@@ -12,11 +12,11 @@ class DeptValidate extends Validate
         'dept_status|状态' => 'require|in:ACTIVED,DISABLED',
         'dept_category|分类' => 'require|in:职能部门,财务部门,仓库货仓,外延部门,营业场所,其他',
         'dept_code|编号' => 'require|alphaDash',
-        'dept_city|所在城市' => 'require|chsDash',
-        'dept_name|名称' => 'require|chsDash',
+        'dept_city|所在城市' => 'require',
+        'dept_name|名称' => 'require',
         'dept_telephone|联系电话' => 'mobile',
         'dept_position|坐标' => 'regex:/^[0-9\.]+$/',
-        'dept_address|地址' => 'chsDash',
+        'dept_address|地址' => 'max:255',
 //        'dept_remark' => 'chsDash'
     ];
 

app/admin/validate/sys_manage/FieldValidate.php

@@ -9,7 +9,7 @@ class FieldValidate extends Validate
     protected $rule = [
         'field_status|状态' => 'require|in:ACTIVED,DISABLED',
         'field_category|分类' => 'in:NORMAL,PAGE,OTHER',
-        'field_name|名称' => 'require|chsDash',
+        'field_name|名称' => 'require',
         'field_table|所属表' => 'require|alphaDash',
         'field_column_key|字段列名' => 'alphaDash',
         'field_column_datatype|数据类型' => 'in:string,decimal,text,dateTime',

app/admin/validate/sys_manage/RoleValidate.php

@@ -10,7 +10,7 @@ class RoleValidate extends Validate
         'role_id'       => 'require',
         'role_status|状态'   => 'require|in:ACTIVED,DISABLED',
         'role_category|分类' => 'require|in:NORMAL,OTHER',
-        'role_name|名称'     => 'chsDash'
+        'role_name|名称'     => 'max:255'
     ];
 
     protected $message = [];

app/admin/validate/sys_manage/UserValidate.php

@@ -11,7 +11,7 @@ class UserValidate extends Validate
         'join_user_dept_id'     => 'integer',
         'user_status|状态'           => 'require|in:ACTIVED,DISABLED,PENDING',
         'user_category|分类'         => 'require|in:EMPLOY,OTHER',
-        'user_name|姓名'             => 'require|chsDash',
+        'user_name|姓名'             => 'require',
         'user_login_name|登录名'       => 'require|alphaDash',
         'user_login_pass|登录密码'       => 'require',
         'user_mobile|联系电话'           => 'mobile'