修改物流单号字段类型

src/models/login.js

@@ -9,12 +9,12 @@ export default {
     loading: false,
   },
   effects: {
-    *login({ payload }, { put, call, select }) {
+    *login({ payload }, { put, call }) {
       yield put({ type: 'save', payload: { loading: true } });
       const { data, success } = yield call(login, payload);
       if (success) {
         addLocalUser(data);
-        message.success('登录成功')
+        message.success('登录成功');
         yield put(routerRedux.push('/'));
       }
       yield put({ type: 'save', payload: { loading: false } });
@@ -22,17 +22,17 @@ export default {
     *logout(_, { put, call }) {
       const { success } = yield call(logout);
       if (success) {
-        message.success('注销成功,请重新登录!')
+        message.success('注销成功,请重新登录!');
         yield put(routerRedux.push('/user/login'));
       }
-    }
+    },
   },
   reducers: {
     save(state, action) {
       return {
         ...state,
         ...action.payload,
-      }
+      };
     },
   },
-}
+};

src/models/order/order.js

@@ -1,6 +1,6 @@
-import { query, create, update, remove } from '../../services/order';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
+import { query, create, update, remove } from '../../services/order';
 import { pageModel } from '../common';
 import { pageSize } from '../../utils/config';
 import { checkSearchParams } from '../../utils/utils';
@@ -27,12 +27,12 @@ export default modelExtend(pageModel, {
           });
         }
       });
-    }
+    },
   },
 
   effects: {
-    * query ({ payload = {} }, { call, put }) {
-      yield put({ type: 'changeLoading', payload: { listLoading: true }});
+    * query({ payload = {} }, { call, put }) {
+      yield put({ type: 'changeLoading', payload: { listLoading: true } });
       const { data, success } = yield call(query, payload);
       if (success) {
         yield put({
@@ -43,33 +43,33 @@ export default modelExtend(pageModel, {
               current: Number(payload.pageNo) || 1,
               pageSize: Number(payload.pageSize) || pageSize,
               total: data.totalSize,
-            }
-          }
+            },
+          },
         });
       }
-      yield put({ type: 'changeLoading', payload: { listLoading: false }});
+      yield put({ type: 'changeLoading', payload: { listLoading: false } });
     },
-    * create ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(create, payload);
+    * create({ payload, callback }, { call }) {
+      const { success } = yield call(create, payload);
       if (success) {
         if (callback) callback();
       }
     },
-    * update ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
+    * update({ payload, callback }, { call, put }) {
+      const { success } = yield call(update, payload);
       if (success) {
         yield put({ type: 'hideModal' });
         if (callback) callback();
       }
     },
-    * delete ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(remove, payload);
+    * delete({ payload, callback }, { call }) {
+      const { success } = yield call(remove, payload);
       if (success) {
         if (callback) callback();
       }
     },
-    * recover ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
+    * recover({ payload, callback }, { call }) {
+      const { success } = yield call(update, payload);
       if (success) {
         if (callback) callback();
       }
@@ -88,5 +88,5 @@ export default modelExtend(pageModel, {
     hideModal(state) {
       return { ...state, modalVisible: false };
     },
-  }
-})
+  },
+});

src/routes/Order/Edit/SubOrderProfile.js

@@ -51,7 +51,8 @@ export default class SubOrderProfile extends Component {
     const { id } = currentItem;
     validateFields((errors) => {
       if (!errors) {
-        const trackNo = getFieldsValue(['tracKNo']);
+        const data = getFieldsValue();
+        const { trackNo } = data;
         dispatch({
           type: 'orderDetail/orderSend',
           payload: { id, trackNo },

src/routes/Terminal/Edit/campus.js

@@ -1,10 +1,7 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import SelectModal from '../../../components/SelectModal';
-import { Codes } from '../../../utils/config';
 
 export default class CampusSelectModal extends PureComponent {
-
   render() {
     const {
       modalVisible,
@@ -29,15 +26,13 @@ export default class CampusSelectModal extends PureComponent {
       searchSelect: true,
       searchSelectOptions: [{
         value: 'name', name: '校区名称', mode: 'input',
-      },{
+      }, {
         value: 'code', name: '校区编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
-      },
-      onSearch: (value) => {
-        onSearch(value);
+        defaultValue: 'code',
       },
+      onSearch: value => onSearch(value),
     };
 
     const fsTableProps = {
@@ -46,26 +41,26 @@ export default class CampusSelectModal extends PureComponent {
         dataIndex: 'code',
         key: 'code',
         width: '30%',
-      },{
+      }, {
         title: '校区名称',
         dataIndex: 'name',
         key: 'name',
         width: '35%',
-      },{
+      }, {
         title: '渠道名称',
         dataIndex: 'merchantName',
         key: 'merchantName',
         width: '20%',
       }],
       ...fsTableOpts,
-    }
+    };
 
     return (
       <SelectModal
         mode="single"
-        { ...searchProps }
-        { ...fsTableProps }
-        { ...modalProps }
+        {...searchProps}
+        {...fsTableProps}
+        {...modalProps}
       />
     );
   }

src/routes/Terminal/Edit/index.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Card, Form, List, Input, Select, Switch, Tooltip, Button, message } from 'antd';
+import { Card, Form, List, Input, Switch, Tooltip, Button, message } from 'antd';
 import { routerRedux } from 'dva/router';
 import { connect } from 'dva';
 import queryString from 'query-string';
@@ -13,7 +13,6 @@ import { Codes, pageSize } from '../../../utils/config';
   campus: state.campus,
 }))
 export default class TerminalProfile extends Component {
-
   handleCampusSelectClick = () => {
     this.props.dispatch({ type: 'terminalDetail/showModal' });
     this.props.dispatch({
@@ -89,7 +88,7 @@ export default class TerminalProfile extends Component {
   render() {
     const { form, terminalDetail, campus } = this.props;
     const { currentItem, modalShow, operType } = terminalDetail;
-    const { name, code, password, status, campusId, campusName, campusCode, merchantName } = currentItem;
+    const { name, password, status, campusId, campusName, merchantName } = currentItem;
     const { getFieldDecorator } = form;
 
     const formItemLayout = {
@@ -118,46 +117,50 @@ export default class TerminalProfile extends Component {
           <Form layout="horizontal" onSubmit={this.handlePageSubmit}>
             <Form.Item hasFeedback label="所属校区" {...formItemLayout}>
               <Tooltip placement="top" title="点击选择校区">
-                <Button disabled={operType === "update" ? true: false} style={{ marginRight: 20 }} type="primary" size="small" icon="select" onClick={this.handleCampusSelectClick}>选择</Button>
+                <Button disabled={operType === 'update'} style={{ marginRight: 20 }} type="primary" size="small" icon="select" onClick={this.handleCampusSelectClick}>选择</Button>
               </Tooltip>
-              {operType == 'update' ?
-                <List
-                  size="small"
-                  bordered
-                  dataSource={[
+              {operType === 'update' ?
+                (
+                  <List
+                    size="small"
+                    bordered
+                    dataSource={[
                     `所属校区: ${campusName}`,
                     `所属渠道: ${merchantName}`,
                   ]}
-                  renderItem={item => <List.Item>{item}</List.Item>}
-                />
-              : (campusId ? <List size="small" bordered dataSource={[`${campusName}`]} renderItem={item => <List.Item>{item}</List.Item>}/>
-              : null)}
+                    renderItem={item => <List.Item>{item}</List.Item>}
+                  />
+                ) : (
+                  campusId ? <List size="small" bordered dataSource={[`${campusName}`]} renderItem={item => <List.Item>{item}</List.Item>} /> : null)
+              }
             </Form.Item>
             <Form.Item label="终端名称：" hasFeedback {...formItemLayout}>
               {getFieldDecorator('name', {
                 initialValue: name,
-              })(<Input placeholder="请输入(例: 教室三/教室四...)"/>)}
+              })(<Input placeholder="请输入(例: 教室三/教室四...)" />)}
             </Form.Item>
             {operType === 'create' ?
-              <Form.Item label="终端密码：" hasFeedback {...formItemLayout}>
-                {getFieldDecorator('password', {
+              (
+                <Form.Item label="终端密码：" hasFeedback {...formItemLayout}>
+                  {getFieldDecorator('password', {
                   rules: [{ required: true, type: 'string', message: '密码为必填项!' }],
                   initialValue: password,
                 })(<Input placeholder="请输入" />)}
-              </Form.Item>
-              :
-              <Form.Item label="终端密码：" hasFeedback {...formItemLayout}>
-                {getFieldDecorator('password', {
+                </Form.Item>
+              ) : (
+                <Form.Item label="终端密码：" hasFeedback {...formItemLayout}>
+                  {getFieldDecorator('password', {
                   initialValue: password,
                 })(<Input placeholder="修改密码时填写" />)}
-              </Form.Item>
+                </Form.Item>
+              )
             }
             <Form.Item label="账号状态：" {...formItemLayout}>
               {getFieldDecorator('status', {
                 valuePropsName: 'checked',
             })(
               <Switch
-                defaultChecked={status === Codes.CODE_NORMAL ? true : false}
+                defaultChecked={status === Codes.CODE_NORMAL}
                 checkedChildren="使用中"
                 unCheckedChildren="禁用中"
               />
@@ -168,7 +171,7 @@ export default class TerminalProfile extends Component {
               <Button type="primary" style={{ marginLeft: 35 }} htmlType="submit">提交</Button>
             </Form.Item>
           </Form>
-          {/*校区模态选择框*/}
+          {/* 校区模态选择框 */}
           <CampusSelectModal
             rowKeyName="id"
             modalVisible={modalShow}

src/theme.js

@@ -5,5 +5,4 @@ module.exports = {
   'table-header-bg': '#3eabe8',
   'table-padding-vertical': '6px',
   'table-padding-horizontal': '6px',
-  // 'border-radius-base': '4px',
 };

src/utils/request.js

@@ -1,5 +1,4 @@
 import fetch from 'dva/fetch';
-import { stringify } from 'qs';
 import { message, notification } from 'antd';
 import { routerRedux } from 'dva/router';
 import store from '../index';
@@ -28,7 +27,6 @@ const customCodeMessage = {
   10004: 'Token认证失败',
   10003: 'Token失效',
   10002: '账号或密码错误',
-  800  : '数据不存在',
 };
 
 /**
@@ -56,10 +54,10 @@ function apiErrorHandler(data) {
   if (!data.success) {
     const errortext = customCodeMessage[data.code] || data.message;
     // 登录密码错误
-    if (data.code == 10002) {
+    if (data.code === 10002) {
       message.error(errortext);
     // Token失效，跳转到登录界面
-  } else if (data.code == 10003 || data.code == 10004) {
+    } else if (data.code === 10003 || data.code === 10004) {
       const { dispatch } = store;
       dispatch(routerRedux.push('/user/login'));
     // 其它错误打出错误代码
@@ -86,23 +84,22 @@ function promise2Json(response) {
  */
 export default function request(url, options) {
   const defaultOptions = {
-    credentials: 'include',   // with cookies(Post CORS requests)
+    credentials: 'include', // with cookies(Post CORS requests)
   };
   const newOptions = { ...defaultOptions, ...options };
   newOptions.method = (newOptions.method || 'GET').toUpperCase();
   if (newOptions.method === 'POST' || newOptions.method === 'PUT' ||
     newOptions.method === 'PATCH' || newOptions.method === 'DELETE') {
     newOptions.headers = {
-      'Accept': 'application/json',
+      Accept: 'application/json',
       'Content-Type': 'application/json; charset=utf-8',
       ...newOptions.headers,
     };
-  }
-  else {
+  } else {
     newOptions.headers = {
-      'Accept': 'application/json',
+      Accept: 'application/json',
       ...newOptions.headers,
-    }
+    };
   }
 
   return fetch(url, newOptions)