Merge branch 'master' into feature/wph

* master:
  fix(auditmodal): 收货地址校验
  fix(audit): 校验规则修改
  fix(audit): 收货地址增加校验

src/pages/AfterSaleManage/components/auditModal.jsx

@@ -110,9 +110,10 @@ const AuditModal = props => {
                   {
                     required: true,
                     message: '请填写退货地址!',
+                    pattern: /^([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9_！@#￥%……&*（）——+【】《》、；‘，。!@#$%^&*()_+{}|:“”<>?’~·])+$/gi,
                   },
                 ],
-              })(<Input placeholder="请填写退货地址" allowClear />)}
+              })(<Input placeholder="最多输入50个字符" maxLength="50" allowClear />)}
             </FormItem>
             <FormItem label="收件人">
               {getFieldDecorator('receiverName', {
@@ -121,9 +122,10 @@ const AuditModal = props => {
                   {
                     required: true,
                     message: '请填写收件人!',
+                    pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+$/,
                   },
                 ],
-              })(<Input placeholder="请填写收件人" allowClear />)}
+              })(<Input placeholder="最多输入25个字符" maxLength="25" allowClear />)}
             </FormItem>
             <FormItem label="手机号码">
               {getFieldDecorator('receiverPhone', {
@@ -142,7 +144,7 @@ const AuditModal = props => {
                     message: '请填写手机号码!',
                   },
                 ],
-              })(<Input maxLength={11} placeholder="请填写手机号码" allowClear />)}
+              })(<Input placeholder="请填写手机号码" maxLength="11" allowClear />)}
             </FormItem>
           </div>
         )}

src/pages/afterSale/components/audit.jsx

@@ -136,20 +136,22 @@ const AuditModal = props => {
                       rules: [
                         {
                           required: true,
-                          message: '请填写退货地址!',
+                          message: '请填写正确退货地址!',
+                          pattern: /^([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9_！@#￥%……&*（）——+【】《》、；‘，。!@#$%^&*()_+{}|:“”<>?’~·])+$/gi,
                         },
                       ],
-                    })(<Input placeholder="请填写退货地址" allowClear />)}
+                    })(<Input placeholder="最多输入50个字符" maxLength="50" allowClear />)}
                   </FormItem>
                   <FormItem label="收件人">
                     {getFieldDecorator('receiverName', {
                       rules: [
                         {
                           required: true,
-                          message: '请填写收件人!',
+                          message: '请填写正确收件人!',
+                          pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+$/,
                         },
                       ],
-                    })(<Input placeholder="请填写收件人" allowClear />)}
+                    })(<Input placeholder="最多输入25个字符" maxLength="25" allowClear />)}
                   </FormItem>
                   <FormItem label="手机号码">
                     {getFieldDecorator('receiverPhone', {
@@ -163,7 +165,7 @@ const AuditModal = props => {
                           message: '请填写手机号码!',
                         },
                       ],
-                    })(<Input placeholder="请填写手机号码" allowClear />)}
+                    })(<Input placeholder="11位数字" maxLength="11" allowClear />)}
                   </FormItem>
                 </div>
               )}