Merge branch 'feature/wph' into 'master'

Feature/wph

See merge request !24

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;
@@ -137,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: '手机号码格式不正确!',
                   },
                   {