Merge branch 'develop' of https://gitlab.yidian-inc.com/bp/goods into develop

application/library/Validate/GoodsAddValidate.php

@@ -12,28 +12,32 @@ namespace Validate;
 class GoodsAddValidate extends BaseValidate
 {
     protected $rule = [
+        'goods_name' => 'require|length:1,50',
         'category_1_id' => 'require',
         'category_2_id' => 'require',
-        'goods_name' => 'require',
+        'desc' => 'length:0,50',
         'desc_pic_url' => 'require',
-        'expiration_time' => 'require',
-        'rule_desc' => 'require',
+        'original_price' => 'require',
         'price' => 'require',
-        'inventory' => 'require',
-        'publish_user_id' => 'require',
+        'expiration_time' => 'require',
         'sub_shop_ids' => 'require',
+        'rule_refund' => 'require',
+        'introduce' => 'length:0,200',
+        'inventory' => 'require',
     ];
 
     protected $message = [
+        'goods_name' => '请检查商品名称，内容不能太长或者不填写',
         'category_1_id' => '请选择所属类目',
         'category_2_id' => '请选择所属类目',
-        'goods_name' => '商品名称不能为空',
+        'desc' => '商品说明内容不能过长',
         'desc_pic_url' => '请上传商品图片',
-        'expiration_time' => '请填写到期时间',
-        'rule_desc' => '请填写使用规则',
+        'original_price' => '请填写原价',
         'price' => '请填写售价',
-        'inventory' => '请填写库存',
-        'publish_user_id' => 'user_id 不能为空',
+        'expiration_time' => '请填写到期时间',
         'sub_shop_ids' => '门店id不能为空',
+        'rule_refund' => '请选择退款规则',
+        'introduce' => '商品介绍内容不能过长',
+        'inventory' => '请填写库存',
     ];
 }
\ No newline at end of file

application/library/Validate/GoodsEditValidate.php

@@ -12,26 +12,30 @@ namespace Validate;
 class GoodsEditValidate extends BaseValidate
 {
     protected $rule = [
+        'goods_name' => 'require|length:1,50',
         'category_1_id' => 'require',
         'category_2_id' => 'require',
-        'goods_name' => 'require',
+        'desc' => 'length:0,50',
         'desc_pic_url' => 'require',
-        'expiration_time' => 'require',
-        'rule_desc' => 'require',
+        'original_price' => 'require',
         'price' => 'require',
-        'inventory_add' => 'require',
+        'expiration_time' => 'require',
         'sub_shop_ids' => 'require',
+        'rule_refund' => 'require',
+        'introduce' => 'length:0,200',
     ];
 
     protected $message = [
+        'goods_name' => '请检查商品名称，内容不能太长或者不填写',
         'category_1_id' => '请选择所属类目',
         'category_2_id' => '请选择所属类目',
-        'goods_name' => '商品名称不能为空',
+        'desc' => '商品说明内容不能过长',
         'desc_pic_url' => '请上传商品图片',
-        'expiration_time' => '请填写到期时间',
-        'rule_desc' => '请填写使用规则',
+        'original_price' => '请填写原价',
         'price' => '请填写售价',
-        'inventory_add' => '请填写库存',
+        'expiration_time' => '请填写到期时间',
         'sub_shop_ids' => '门店id不能为空',
+        'rule_refund' => '请选择退款规则',
+        'introduce' => '商品介绍内容不能过长',
     ];
 }
\ No newline at end of file