Merge branch 'master' into fix/prologue

src/pages/AfterSaleManage/Pending/index.jsx

@@ -54,6 +54,12 @@ export default () => {
     setSelectedRow(detailData);
   };
   const columns = [
+    {
+      title: '售后状态',
+      dataIndex: 'serviceStatus',
+      hideInSearch: true,
+      width: 100,
+    },
     ...columnSticData,
     {
       title: '售后凭证',
@@ -75,12 +81,6 @@ export default () => {
         return <div>未申诉</div>;
       },
     },
-    {
-      title: '售后状态',
-      dataIndex: 'serviceStatus',
-      hideInSearch: true,
-      width: 100,
-    },
     {
       title: '操作',
       hideInSearch: true,

src/pages/AfterSaleManage/components/auditModal.jsx

 import React from 'react';
-import { Modal, Form, Input, Cascader, notification } from 'antd';
+import { Modal, Form, Input, Cascader, notification, InputNumber } from 'antd';
 import { shopAudit } from '../services';
 
 const FormItem = Form.Item;
@@ -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]+$/,
                   },
                 ],
@@ -131,8 +137,12 @@ const AuditModal = props => {
               {getFieldDecorator('receiverPhone', {
                 initialValue: formData.phone,
                 rules: [
+                  // {
+                  //   pattern: new RegExp(/^1[3456789]\d{9}$/, 'g'),
+                  //   message: '手机号码格式不正确!',
+                  // },
                   {
-                    pattern: new RegExp(/^1[3456789]\d{9}$/, 'g'),
+                    pattern: new RegExp(/^[0-9]*$/),
                     message: '手机号码格式不正确!',
                   },
                   {

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]+$/,
                         },
                       ],