错误问题处理

src/models/group/detail.js

@@ -65,7 +65,7 @@ export default {
       return { ...state, currentItem };
     },
     saveFilters(state, action) {
-      const filters = action.payload.filters;
+      const filters = action.payload;
       return { ...state, filters };
     },
     showModal(state, action) {

src/models/lesson/detail.js

@@ -66,8 +66,8 @@ export default {
     querySuccess(state, { payload }) {
       return { ...state, currentItem: payload };
     },
-    saveFilters(state, { payload: filters }) {
-      return { ...state, filters };
+    saveFilters(state, action) {
+      return { ...state, filters: action.payload };
     },
     showModal(state) {
       return { ...state, modalVisible: true };

src/models/merchant/merchant.js

@@ -55,10 +55,11 @@ export default modelExtend(pageModel, {
         if (callback) callback();
       }
     },
-    * recharge({ payload, callback }, { call }) {
+    * recharge({ payload, callback }, { call, put }) {
       const { success } = yield call(moneyCharge, payload);
       if (success) {
         message.success('充值成功!');
+        yield put({ type: 'hideModal', payload: {} });
         if (callback) callback();
       }
     },

src/models/tag/detail.js

@@ -71,7 +71,7 @@ export default {
     saveFilters(state, action) {
       return {
         ...state,
-        filters: action.payload.filters,
+        filters: action.payload,
       };
     },
     showModal(state, action) {

src/models/ware/detail.js

@@ -71,7 +71,7 @@ export default {
     saveFilters(state, action) {
       return {
         ...state,
-        filters: action.payload.filters,
+        filters: action.payload,
       };
     },
     showModal(state, action) {

src/routes/CmsUser/table.js

@@ -1,12 +1,14 @@
 import React, { Component } from 'react';
 import moment from 'moment';
 import { Divider, Avatar, Modal, Badge, Table } from 'antd';
-import { Codes, statuses, domains } from '../../utils/config';
+import { Codes, terminalStatuses, domains } from '../../utils/config';
 
 export default class CMSUserTableList extends Component {
   handleOperateItem = (record) => {
     const { onDeleteItem, onRecoverItem } = this.props;
     Modal.confirm({
+      okText: '确定',
+      cancelText: '取消',
       title: `您确定要${record.status === Codes.CODE_NORMAL ? '禁用' : '解禁'}该账户?`,
       onOk() {
         if (record.status === Codes.CODE_NORMAL) {
@@ -73,10 +75,10 @@ export default class CMSUserTableList extends Component {
       dataIndex: 'status',
       key: 'status',
       render: (text, record) => {
-        const statusMap = { [Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error' };
-        return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
+        const statusMap = { [Codes.CODE_NORMAL]: 'success', [Codes.CODE_DISABLE]: 'error' };
+        return (<Badge status={statusMap[record.status]} text={terminalStatuses[record.status]} />);
       },
-      filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
+      filters: Object.keys(terminalStatuses).map(key => ({ text: terminalStatuses[key], value: key })),
       filterMultiple: false,
       filteredValue: curStatus,
       width: '10%',

src/routes/Merchant/List/index.js

@@ -22,7 +22,8 @@ export default class Merchant extends PureComponent {
     Object.keys(filters).map((key) => { filters[key] ? null : delete filters[key]; });
     // 如果搜索内容不为空则添加进filters中
     if (field && keyword) {
-      filters[field] = keyword;
+      filters.field = field;
+      filters.keyword = keyword;
     }
 
     const searchProps = {
@@ -62,7 +63,7 @@ export default class Merchant extends PureComponent {
           payload: data,
           callback: () => {
             dispatch(routerRedux.push({
-              pathname: '/trade/order',
+              pathname: '/merchant',
               search: queryString.stringify(filters),
             }));
           },

src/routes/Order/Edit/OrderProfile.js

@@ -15,7 +15,8 @@ export default class OrderProfile extends Component {
    * 退出页面
    */
   handlePageCancel = () => {
-    const { filters, dispatch } = this.props;
+    const { orderDetail, dispatch } = this.props;
+    const { filters } = orderDetail;
     dispatch(routerRedux.push({
       pathname: '/trade/order',
       search: queryString.stringify(filters),

src/routes/Order/Edit/SubOrderProfile.js

@@ -15,7 +15,8 @@ export default class SubOrderProfile extends Component {
    * 返回订单列表
    */
   handlePageCancel = () => {
-    const { filters, dispatch } = this.props;
+    const { orderDetail, dispatch } = this.props;
+    const { filters } = orderDetail;
     dispatch(routerRedux.push({
       pathname: '/trade/order',
       search: queryString.stringify(filters),

src/routes/TagGroup/Edit/index.js

@@ -37,7 +37,6 @@ export default class GroupDetail extends PureComponent {
   }
 
   handleModalOk = (data) => {
-    console.log('hahaha');
     const { dispatch } = this.props;
     dispatch({
       type: 'groupDetail/saveSortResult',
@@ -69,14 +68,13 @@ export default class GroupDetail extends PureComponent {
           status: Codes.CODE_NORMAL
         };
       } else if (operType == 'update') {
-        const { id, merchantId, status, tagList, name, code } = currentItem;
+        const { id, merchantId, status, name, code } = currentItem;
         data = {
           id,
           merchantId,
           status,
           name,
           code,
-          tagList: (tagList || []).map(item => item.id),
           ...getFieldsValue(),
         };
       }

src/utils/config.js

@@ -44,10 +44,8 @@ Codes.CODE_SEASON = '季';
 Codes.CODE_ITEM = '件';
 
 module.exports = {
-  apiHost: 'http://192.168.1.40:8500',
-  //apiHost: 'http://tt-cms.api.ai160.com',
+  apiHost: '/api/v1',
   ossHost: 'http://efunimgs.oss-cn-beijing.aliyuncs.com',
-  // apiHost: '/api',
   // 每页返回数据量
   pageSize: 20,
   // 标识码