完善功能

app/admin/service/goods/GoodsService.php

@@ -306,7 +306,7 @@ class GoodsService
             $model->goods_sales_price = $params['goods_sales_price'] ?? '';
             $model->goods_sku_json = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => []]);
             $model->goods_attribute_json = !empty($params['goods_attribute_json']) ? $params['goods_attribute_json'] : '{}';
-            $model->goods_service_json = !empty($params['goods_service_json']) ? $params['goods_service_json'] : '{}';
+//            $model->goods_service_json = !empty($params['goods_service_json']) ? $params['goods_service_json'] : '{}';
             $model->goods_title = $params['goods_title'] ?? '';
             $model->goods_cover = $params['goods_cover'] ?? '';
             $model->goods_on_addtimes = $params['goods_on_addtimes'] ? strtotime($params['goods_on_addtimes']) : null;

app/admin/validate/asset/HouseTypeValidate.php

@@ -9,15 +9,15 @@ class HouseTypeValidate extends Validate
     protected $rule = [
         'asset_id' => 'require|integer',
         'join_asset_category_id' => 'integer',
-        'asset_key' => 'require|alphaDash',
-        'asset_classify' => 'max:32',
-        'asset_status' => 'require|in:ACTIVED,DISABLED',
-        'asset_category' => 'max:32',
-        'asset_house_type' => 'max:32',
-        'asset_area_building' => 'float',
-        'asset_area_floorage' => 'float',
-        'asset_area_shared' => 'float',
-        'asset_remark' => 'max:128',
+        'asset_key|资产标识' => 'require|alphaDash',
+        'asset_classify|归类' => 'max:32',
+        'asset_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'asset_category|分类' => 'max:32',
+        'asset_house_type|户型' => 'max:32',
+        'asset_area_building|建筑面积' => 'float',
+        'asset_area_floorage|室内面积' => 'float',
+        'asset_area_shared|公摊面积' => 'float',
+        'asset_remark|备注' => 'max:128',
         'asset_extend_json' => 'isJson'
     ];
 

app/admin/validate/at_home/GoodsValidate.php

@@ -9,11 +9,11 @@ class GoodsValidate extends Validate
     protected $rule = [
         'goods_id' => 'require|integer',
         'goods_category_id' => 'require|in:108,109,110,111,112,113',
-        'goods_name' => 'require',
-        'goods_img' => 'require|regex:/^[0-9a-zA-Z\.\/]+$/',
-        'goods_mobile' => 'require|mobile',
-        'goods_status' => 'require|in:0,1',
-        'goods_sort' => 'require|integer'
+        'goods_name|商品名称' => 'require',
+        'goods_img|图片' => 'require|regex:/^[0-9a-zA-Z\.\/]+$/',
+        'goods_mobile|联系电话' => 'require|mobile',
+        'goods_status|状态' => 'require|in:0,1',
+        'goods_sort|排序' => 'require|integer'
     ];
 
     protected $message = [];

app/admin/validate/auth/AuthValidate.php

@@ -8,8 +8,8 @@ use think\Validate;
 class AuthValidate extends Validate
 {
     protected $rule = [
-        'username' => 'require|alphaDash',
-        'password' => 'require',
+        'username|用户名' => 'require|alphaDash',
+        'password|密码' => 'require',
     ];
 
     protected $message = [];

app/admin/validate/coupon/CouponValidate.php

@@ -12,11 +12,11 @@ class CouponValidate extends Validate
      */
     protected $rule = [
         'coupon_id' => 'require|alphaDash',
-        'coupon_status' => 'require|in:ACTIVED,DISABLED',
-        'coupon_category' => 'max:32',
-        'coupon_name' => 'require|max:32',
-        'coupon_begindate' => 'require',
-        'coupon_enddate' => 'require',
+        'coupon_status|优惠券状态' => 'require|in:ACTIVED,DISABLED',
+        'coupon_category|分类' => 'max:32',
+        'coupon_name|名称' => 'require|max:32',
+        'coupon_begindate|启用日期' => 'require',
+        'coupon_enddate|过期时间' => 'require',
     ];
 
     /**

app/admin/validate/device/DeviceValidate.php

@@ -13,11 +13,11 @@ class DeviceValidate extends Validate
     protected $rule = [
         'device_id' => 'require|alphaDash',
         'join_device_ledger_id' => 'require|integer',
-        'device_status' => 'require|in:WAITING,PROCESSING,PENDING,ACTIVED,DISABLED',
-        'device_category' => 'max:32',
-        'device_type' => 'max:32',
-        'device_identify' => 'max:32',
-        'device_name' => 'max:32',
+        'device_status|设备状态' => 'require|in:WAITING,PROCESSING,PENDING,ACTIVED,DISABLED',
+        'device_category|分类' => 'max:32',
+        'device_type类型' => 'max:32',
+        'device_identify|标识' => 'max:32',
+        'device_name|名称' => 'max:32',
         'device_config_json' => 'isJson',
         'device_extend_json' => 'isJson',
     ];

app/admin/validate/device/LedgerValidate.php

@@ -9,15 +9,15 @@ class LedgerValidate extends Validate
     protected $rule = [
         'device_ledger_id' => 'require|integer',
         'join_device_ledger_category_id' => 'integer',
-        'device_ledger_status' => 'require|in:ACTIVED,DISABLED',
-        'device_ledger_category' => 'max:32',
-        'device_ledger_type' => 'max:32',
-        'device_ledger_key' => 'max:32',
-        'device_ledger_name' => 'max:32',
-        'device_ledger_protocol_json' => 'isJson',
-        'device_ledger_identify_json' => 'isJson',
-        'device_ledger_metadata_json' => 'isJson',
-        'device_ledger_command_json' => 'isJson',
+        'device_ledger_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'device_ledger_category|分类' => 'max:32',
+        'device_ledger_type|类型' => 'max:32',
+        'device_ledger_key|标识' => 'max:32',
+        'device_ledger_name|名称' => 'max:32',
+        'device_ledger_protocol_json|通信' => 'isJson',
+        'device_ledger_identify_json|识别' => 'isJson',
+        'device_ledger_metadata_json|元数据' => 'isJson',
+        'device_ledger_command_json|指令集' => 'isJson',
         'device_ledger_extend_json' => 'isJson'
     ];
 

app/admin/validate/goods/GoodsValidate.php

@@ -10,39 +10,39 @@ class GoodsValidate extends Validate
         'goods_id' => 'require|alphaDash',
         'join_goods_category_id' => 'integer',
         'join_goods_device_id' => 'max:32',
-        'goods_classify' => 'require|in:GOODS,DEVICE,SERVICE,SPECIAL,PACKAGE,OTHER',  // GOODS=实物商品|DEVICE=设备|SERIVCE=服务|SPECIAL=专题业务|PACKAGE=套包|OTHER=其他
-        'goods_status' => 'require|in:PENDING,ON,OFF,DISABLED',    // 产品状态 PENDING=待处理|ON=上架(已激活)|OFF=下架|DISABLED=已禁用
-        'goods_category' => 'max:32',
-        'goods_prefix' => 'max:64 ',
-        'goods_name' => 'require|max:32',
-        'goods_market_price' => 'float',
-        'goods_sales_price' => 'float',
+        'goods_classify|归类' => 'require|in:GOODS,DEVICE,SERVICE,SPECIAL,PACKAGE,OTHER',  // GOODS=实物商品|DEVICE=设备|SERIVCE=服务|SPECIAL=专题业务|PACKAGE=套包|OTHER=其他
+        'goods_status|状态' => 'require|in:PENDING,ON,OFF,DISABLED',    // 产品状态 PENDING=待处理|ON=上架(已激活)|OFF=下架|DISABLED=已禁用
+        'goods_category|分类' => 'max:32',
+        'goods_prefix|前缀' => 'max:64 ',
+        'goods_name|名称' => 'require|max:32',
+        'goods_market_price|市场价' => 'float',
+        'goods_sales_price|销售价' => 'float',
 //        'goods_sku_json' => 'isJson',
-        'goods_attribute_json' => 'isJson',
-        'goods_service_json' => 'isJson',
-        'goods_title' => 'max:128',
-        'goods_cover' => 'url',
-        'goods_on_addtimes' => 'date',
-        'goods_sort' => 'integer',
-        'goods_groupby' => 'max:32;',
+        'goods_attribute_json|属性' => 'isJson',
+        'goods_service_json|服务' => 'isJson',
+        'goods_title|标题' => 'max:128',
+        'goods_cover|封面' => 'url',
+        'goods_on_addtimes|上架时间' => 'date',
+        'goods_sort|排序' => 'integer',
+        'goods_groupby|分组' => 'max:32;',
         'goods_extend_json' => 'isJson',
 //        'goods_slide' => 'regex:/^[0-9a-zA-Z\.\/\,]+$/',
-        'goods_specs_json' => 'isJson',
+        'goods_specs_json|规格参数' => 'isJson',
 //        'goods_content' => '',
-        'goods_label' => 'max:32',
+        'goods_label|标签' => 'max:32',
 //        'goods_label_extend_json' => '',
-        'goods_storage' => 'float',
-        'goods_sale' => 'float',
-        'goods_running_off_type' => 'require|in:H,T',
-        'goods_running_off_json' => 'isJson',
-        'goods_sku_status' => 'in:PENDING,ON,OFF,DISABLED',   // 产品sku状态 PENDING=待启用|ON=上架|OFF=下架|DISABLED=已禁用
-        'goods_sku_specs_json' => 'isJson',
-        'goods_sku_title' => 'max:64',
-        'goods_sku_images_json' => 'isJson',
+        'goods_storage|库存量' => 'float',
+        'goods_sale|销售量' => 'float',
+        'goods_running_off_type|下架方式' => 'require|in:H,T',
+        'goods_running_off_json|下架' => 'isJson',
+        'goods_sku_status|SKU状态' => 'in:PENDING,ON,OFF,DISABLED',   // 产品sku状态 PENDING=待启用|ON=上架|OFF=下架|DISABLED=已禁用
+        'goods_sku_specs_json|规格' => 'isJson',
+        'goods_sku_title|SKU标题' => 'max:64',
+        'goods_sku_images_json|SKU图片' => 'isJson',
 //        'goods_sku_content' => '',
-        'goods_sku_market_price' => 'float',
-        'goods_sku_sales_price' => 'float',
-        'goods_sku_storage_json' => 'isJson',
+        'goods_sku_market_price|市场价' => 'float',
+        'goods_sku_sales_price|销售价' => 'float',
+        'goods_sku_storage_json|库存' => 'isJson',
         'goods_sku_service_json' => 'isJson',
         'goods_sku_extend_json' => 'isJson',
     ];

app/admin/validate/healthy/ProductValidate.php

@@ -10,21 +10,21 @@ class ProductValidate extends Validate
         'product_id' => 'require|integer',
         'product_category_id' => 'require|integer',
         'product_shop_id' => 'require|integer',
-        'product_name' => 'require|chsDash',
-        'product_price' => 'require|float',
-        'product_freight_fee' => 'require|float',
-        'product_postage_id' => 'require|integer',
-        'product_packing_fee' => 'require|float',
-        'product_weight' => 'require|float',
-        'product_image' => 'regex:/^[0-9a-zA-Z\.\/]+$/',
-        'product_image_slide' => 'regex:/^[0-9a-zA-Z\.\/\,]+$/',
-        'product_limit' => 'max:150',
-        'product_notice' => 'max:150',
-        'product_guarantee' => 'max:150',
-        'product_type' => 'in:0,1',
-        'product_status' => 'in:0,1',
-        'product_audit' => 'in:0,1,2',
-        'product_sort' => 'require|integer',
+        'product_name|产品名称' => 'require|chsDash',
+        'product_price|价格' => 'require|float',
+        'product_freight_fee|运费' => 'require|float',
+        'product_postage_id|运费模板' => 'require|integer',
+        'product_packing_fee|打包费' => 'require|float',
+        'product_weight|重量' => 'require|float',
+        'product_image|图片' => 'regex:/^[0-9a-zA-Z\.\/]+$/',
+        'product_image_slide|轮播图' => 'regex:/^[0-9a-zA-Z\.\/\,]+$/',
+        'product_limit|限制内容' => 'max:150',
+        'product_notice|产品须知' => 'max:150',
+        'product_guarantee|产品保障' => 'max:150',
+        'product_type|产品类型' => 'in:0,1',
+        'product_status|状态' => 'in:0,1',
+        'product_audit|审核' => 'in:0,1,2',
+        'product_sort|排序' => 'require|integer',
         'product_reject_reason' => 'max:255'
     ];
 

app/admin/validate/life/CinemaIlkValidate.php

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

app/admin/validate/life/CinemaPerformersValidate.php

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

app/admin/validate/life/CinemaValidate.php

@@ -8,20 +8,20 @@ class CinemaValidate extends Validate
 {
     protected $rule = [
         'cinema_id' => 'integer',
-        'cinema_name' => 'chsDash',
-        'cinema_img' => 'url',
-        'cinema_video' => 'url',
-        'cinema_price' => 'float',
-        'cinema_seat' => 'integer',
-        'cinema_join' => 'integer',
-        'cinema_length' => 'integer',
-        'cinema_week' => 'integer',
+        'cinema_name|名称' => 'chsDash',
+        'cinema_img|图片' => 'url',
+        'cinema_video|视频' => 'url',
+        'cinema_price|价格' => 'float',
+        'cinema_seat|座位数量' => 'integer',
+        'cinema_join|已预订数量' => 'integer',
+        'cinema_length|时长' => 'integer',
+        'cinema_week|上映时间' => 'integer',
         'cinema_time' => '',
 //        'cinema_label' => 'regex:/^[0-9\,]+$/',
 //        'cinema_mold' => 'regex:/^[0-9\,]+$/',
 //        'cinema_director' => 'integer',
 //        'cinema_star' => 'regex:/^[0-9\,]+$/',
-        'cinema_introduction' => 'chsDash',
+//        'cinema_introduction' => 'chsDash',
 //        'cinema_performers' => 'regex:/^[0-9\,]+$/',
         'cinema_is_del' => 'integer',
         'cinema_status' => 'integer',

app/admin/validate/life/CollegeCoursesValidate.php

@@ -8,19 +8,19 @@ class CollegeCoursesValidate extends Validate
 {
     protected $rule = [
         'courses_id' => 'require|integer',
-        'courses_name' => 'require|chsDash',
-        'courses_img' => 'url',
-        'courses_introduction' => 'require',
-        'courses_type' => 'integer',
+        'courses_name|名称' => 'require|chsDash',
+        'courses_img|图片' => 'url',
+        'courses_introduction|简介' => 'require',
+        'courses_type|类型' => 'integer',
 //        'courses_time' => '',
 //        'courses_long'=>'',
 //        'courses_week' => 'integer',
-        'courses_category_id' => 'require|integer',
-        'courses_teacher_id' => 'require|integer',
-        'courses_num' => 'require|integer',
-        'courses_join_num' => 'integer',
+        'courses_category_id|关联分类' => 'require|integer',
+        'courses_teacher_id|关联老师' => 'require|integer',
+        'courses_num|上课人数' => 'require|integer',
+        'courses_join_num|参与人数' => 'integer',
 //        'courses_label' => 'chsDash',
-        'courses_status' => 'integer',
+        'courses_status|状态' => 'integer',
         'courses_is_del' => 'integer'
     ];
 

app/admin/validate/medical/DoctorValidate.php

@@ -8,17 +8,17 @@ class DoctorValidate extends Validate
 {
     protected $rule = [
         'doctor_id' => 'require|integer',
-        'doctor_name' => 'require|chsDash',
-        'doctor_position' => 'require|chsDash',
-        'doctor_avatar' => 'require|url',
-        'doctor_mobile' => 'mobile',
-        'doctor_is_visit' => 'require|in:0,1',
-        'doctor_price' => 'require|float',
-        'doctor_type' => 'require|in:0,1,2',
-        'doctor_on_line' => 'require|in:0,1',
+        'doctor_name|姓名' => 'require|chsDash',
+        'doctor_position|职位' => 'require|chsDash',
+        'doctor_avatar|头像' => 'require|url',
+        'doctor_mobile|联系电话' => 'mobile',
+        'doctor_is_visit|是否出诊' => 'require|in:0,1',
+        'doctor_price|收费标准' => 'require|float',
+        'doctor_type|类型' => 'require|in:0,1,2',
+        'doctor_on_line|是否支持在线沟通' => 'require|in:0,1',
         'doctor_shop_id' => 'require|integer',
         'doctor_subject_id' => 'require|integer',
-        'doctor_status' => 'in:0,1'
+        'doctor_status|医生状态' => 'in:0,1'
     ];
 
     protected $message = [];

app/admin/validate/medical/ReservationServiceValidate.php

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

app/admin/validate/medical/SalesmanValidate.php

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

app/admin/validate/medical/ShopValidate.php

@@ -8,20 +8,20 @@ class ShopValidate extends Validate
 {
     protected $rule = [
         'shop_id' => 'require|integer',
-        'shop_name' => 'require|chsDash',
-        'shop_real_name' => 'require|chsDash',
-        'shop_logo' => 'url',
-        'shop_img' => 'regex:/^[0-9a-zA-Z\.\/]+$/',
+        'shop_name|店铺名称' => 'require|chsDash',
+        'shop_real_name|负责人' => 'require|chsDash',
+        'shop_logo|LOGO' => 'url',
+        'shop_img|展示图' => 'regex:/^[0-9a-zA-Z\.\/]+$/',
 //        'shop_label' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-\,\s]+$/u',
         'shop_category_id' => 'require|integer',
-        'shop_score' => 'require|float',
-        'shop_type' => 'require|in:1,2,3,4,5',
-        'shop_is_audit' => 'require|in:0,1',
-        'shop_lat' => 'regex:/^[0-9a-zA-Z\.]+$/',
-        'shop_lng' => 'regex:/^[0-9a-zA-Z\.]+$/',
-        'shop_phone' => 'mobile',
-        'shop_sort' => 'require|integer',
-        'shop_status' => 'require|in:0,1'
+        'shop_score|店铺评分' => 'require|float',
+        'shop_type|店铺类型' => 'require|in:1,2,3,4,5',
+        'shop_is_audit|是否需要发布审核' => 'require|in:0,1',
+        'shop_lat|纬度' => 'regex:/^[0-9a-zA-Z\.]+$/',
+        'shop_lng|经度' => 'regex:/^[0-9a-zA-Z\.]+$/',
+        'shop_phone|电话' => 'mobile',
+        'shop_sort|排序' => 'require|integer',
+        'shop_status|状态' => 'require|in:0,1'
     ];
 
     protected $message = [];

app/admin/validate/member/MemberValidate.php

@@ -8,20 +8,20 @@ class MemberValidate extends Validate
 {
     protected $rule = [
         'id' => 'require',
-        'account_name' => 'require',
-        'avatar' => 'require',
-        'source' => 'require', // 来源
+        'account_name|账号名称' => 'require',
+        'avatar|头像' => 'require',
+        'source|来源' => 'require', // 来源
         'is_owner' => 'require|in:Y,N',
-        'classify' => 'require', // 归类 会员/游客
-        'birth' => 'require',
-        'gender' => 'require|in:male,female,unknown',
-        'status' => 'require|in:ACTIVED,DISABLED',
-        'mobile' => 'require|mobile',
-        'addr' => 'require',
-        'cert_name' => 'require',
-        'cert_nbr' => 'require|idCard',
-        'member_cert_face' => 'url', // 身份证人像面照片 base64
-        'member_cert_photo' => 'url' // 身份证国徽面照片 base64
+        'classify|归类' => 'require', // 归类 会员/游客
+        'birth|生日' => 'require',
+        'gender|性别' => 'require|in:male,female,unknown',
+        'status|状态' => 'require|in:ACTIVED,DISABLED',
+        'mobile|手机号' => 'require|mobile',
+        'addr|具体地址' => 'require',
+        'cert_name证件姓名' => 'require',
+        'cert_nbr|身份证号' => 'require|idCard',
+        'member_cert_face|身份证人像面照片' => 'url', // 身份证人像面照片 base64
+        'member_cert_photo|身份证国徽面照片' => 'url' // 身份证国徽面照片 base64
     ];
 
     protected $message = [];

app/admin/validate/member/WellnessRecordValidate.php

@@ -9,11 +9,11 @@ class WellnessRecordValidate extends Validate
     protected $rule = [
         'wellness_record_id' => 'require|integer',
         'join_wellness_record_member_id' => 'require',
-        'wellness_record_status' => 'max:32',
-        'wellness_record_category' => 'in:档案,体检,病例,医嘱,来访,其他',
-        'wellness_record_name' => 'require',
+        'wellness_record_status|状态' => 'max:32',
+        'wellness_record_category|分类' => 'in:档案,体检,病例,医嘱,来访,其他',
+        'wellness_record_name|名称' => 'require',
 //        'wellness_record_datetime' => 'max:20',
-        'wellness_record_file_json' => 'isJson',
+        'wellness_record_file_json|文件' => 'isJson',
         'wellness_record_json' => 'isJson',
         'wellness_record_extend_json' => 'isJson',
     ];

app/admin/validate/sys_manage/UserValidate.php

@@ -24,8 +24,4 @@ class UserValidate extends Validate
         'update' => ['join_user_role_id','join_user_dept_id','user_status','user_category','user_name'],
         'update_status' => ['user_status'],
     ];
-
-    protected $alias = [
-
-    ];
 }