fixbug

src/models/order/detail.js

@@ -59,7 +59,6 @@ export default {
       }
     },
     * remove({ payload, callback }, { call }) {
-      console.log(payload);
       const { success } = yield call(remove, payload);
       if (success) {
         message.success('操作成功!');

src/routes/Merchant/Edit/baseInfo.js

@@ -66,11 +66,13 @@ export default class BaseInfoCard extends PureComponent {
             </Form.Item>
             <Form.Item label="联系人" hasFeedback {...formItemLayout}>
               {getFieldDecorator('contactName', {
+                rules: [{ required: true, type: 'string', message: '联系人为必填项!' }],
                 initialValue: item.contactName,
               })(<Input />)}
             </Form.Item>
             <Form.Item label="联系电话" hasFeedback {...formItemLayout}>
               {getFieldDecorator('mobile', {
+                rules: [{ required: true, type: 'string', message: '联系电话为必填项!' }],
                 initialValue: item.mobile,
               })(<Input />)}
             </Form.Item>

src/routes/Order/Edit/SubOrderProfile.js

@@ -51,8 +51,7 @@ export default class SubOrderProfile extends Component {
     const { id } = currentItem;
     validateFields((errors) => {
       if (!errors) {
-        const data = getFieldsValue();
-        const { trackNo } = data;
+        const { trackNo } = getFieldsValue();
         dispatch({
           type: 'orderDetail/orderSend',
           payload: { id, trackNo },
@@ -355,9 +354,8 @@ export default class SubOrderProfile extends Component {
         >
           <Form layout="horizontal">
             <Form.Item label="物流单号：" hasFeedback {...formItemLayout}>
-              {getFieldDecorator('code', {
+              {getFieldDecorator('trackNo', {
                 rules: [{ required: true, type: 'string', message: '请填写正确的物流单号!' }],
-                initialValue: trackNo,
               })(<Input placeholder="请填写物流单号" />)}
             </Form.Item>
           </Form>

src/routes/SoldProduct/index.js

@@ -11,7 +11,7 @@ import {
   Select,
 } from 'antd';
 import moment from 'moment';
-import { productType } from '../../utils/config';
+import { productType, pageSize } from '../../utils/config';
 import styles from './index.less';
 
 @Form.create()
@@ -48,17 +48,21 @@ export default class SoldProductList extends Component {
   handleFilterSubmit = (e) => {
     e.preventDefault();
     const filters = this.getFormValue();
-    this.props.dispatch({ type: 'snapshot/query', payload: filters });
+    this.props.dispatch({ type: 'snapshot/query', payload: { ...filters, pageSize } });
   }
 
   handleFilterReset = () => {
     this.props.form.resetFields();
-    this.props.dispatch({ type: 'snapshot/query', payload: {} });
+    this.props.dispatch({ type: 'snapshot/query', payload: { pageSize } });
   }
 
   handleTableChange = (pagination) => {
-    const filters = { ...this.getFormValue(), ...pagination };
-    this.props.dispatch({ type: 'snapshot/query', payload: filters });
+    const filters = {
+      ...this.getFormValue(),
+      pageNo: pagination.current,
+      pageSize: pagination.pageSize
+    };
+    this.props.dispatch({ type: 'snapshot/query', payload: { ...filters, pageSize } });
   }
 
   render() {