Merge branch 'feature/address' into 'master'

Feature/address

See merge request !23

src/pages/AfterSaleManage/components/auditModal.jsx

@@ -110,7 +110,10 @@ const AuditModal = props => {
                   {
                     required: true,
                     message: '请填写退货地址!',
-                    pattern: /^([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9_！@#￥%……&*（）——+【】《》、；‘，。!@#$%^&*()_+{}|:“”<>?’~·])+$/gi,
+                  },
+                  {
+                    message: '格式有误，请填写正确的退货地址!',
+                    pattern: /[a-zA-Z0-9_\u4e00-\u9fa5]/g,
                   },
                 ],
               })(<Input placeholder="最多输入50个字符" maxLength="50" allowClear />)}
@@ -122,6 +125,9 @@ const AuditModal = props => {
                   {
                     required: true,
                     message: '请填写收件人!',
+                  },
+                  {
+                    message: '格式有误，请输入中英文、数字!',
                     pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+$/,
                   },
                 ],

src/pages/afterSale/components/audit.jsx

@@ -136,8 +136,11 @@ const AuditModal = props => {
                       rules: [
                         {
                           required: true,
-                          message: '请填写正确退货地址!',
-                          pattern: /^([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[a-zA-Z0-9_！@#￥%……&*（）——+【】《》、；‘，。!@#$%^&*()_+{}|:“”<>?’~·])+$/gi,
+                          message: '请填写退货地址!',
+                        },
+                        {
+                          message: '格式有误，请填写正确的退货地址!',
+                          pattern: /[a-zA-Z0-9_\u4e00-\u9fa5]/g,
                         },
                       ],
                     })(<Input placeholder="最多输入50个字符" maxLength="50" allowClear />)}
@@ -147,7 +150,10 @@ const AuditModal = props => {
                       rules: [
                         {
                           required: true,
-                          message: '请填写正确收件人!',
+                          message: '请填写收件人!',
+                        },
+                        {
+                          message: '格式有误，请输入中英文、数字!',
                           pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+$/,
                         },
                       ],