解决env.js冲突

config/routes/returnManageRoute.ts

-/*
- * @Author: XieZhiXiong
- * @Date: 2020-12-18 10:42:26
- * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-18 15:38:02
- * @Description: 退货查询相关路由
- */
-const returnManageRoute = {
-  path: '/returnManage', 
-  name: 'returnManage', 
-  icon: 'SmileOutlined', 
-  routes: [
-    // 换货申请单查询
-    {
-      path: '/returnManage/query',
-      name: 'query',
-      component: '@/pages/returnManage/query/index',
-    }, 
-    // 换货申请单详情
-    {
-      path: '/returnManage/query/detail',
-      name: 'queryDetail',
-      component: '@/pages/returnManage/query/detail',
-      hideInMenu: true, 
-      hidePageHeader: true,
-    }, 
-    // 待退款
-    {
-      path: '/returnManage/returnPrReturn',
-      name: 'returnPrReturn',
-      component: '@/pages/returnManage/returnPrReturn/index',
-    }, 
-    // 待退款-详情
-    {
-      path: '/returnManage/returnPrReturn/detail',
-      name: 'returnPrReturnDetail',
-      component: '@/pages/returnManage/returnPrReturn/detail',
-      hideInMenu: true, 
-      hidePageHeader: true,
-    }, 
-    // 待退款-审核
-    {
-      path: '/returnManage/returnPrReturn/verify',
-      name: 'prReturnVerify',
-      component: '@/pages/returnManage/returnPrReturn/verify',
-      hideInMenu: true, 
-      hidePageHeader: true,
-    }, 
-  ],
-};
-
+/*
+ * @Author: XieZhiXiong
+ * @Date: 2020-12-18 10:42:26
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2020-12-23 14:50:54
+ * @Description: 退货查询相关路由
+ */
+const returnManageRoute = {
+  path: '/returnManage', 
+  name: 'returnManage', 
+  icon: 'SmileOutlined', 
+  routes: [
+    // 退货申请单查询
+    {
+      path: '/returnManage/query',
+      name: 'query',
+      component: '@/pages/returnManage/query/index',
+    }, 
+    // 退货申请单详情
+    {
+      path: '/returnManage/query/detail',
+      name: 'queryDetail',
+      component: '@/pages/returnManage/query/detail',
+      hideInMenu: true, 
+      hidePageHeader: true,
+    }, 
+    // 待退款
+    {
+      path: '/returnManage/returnPrReturn',
+      name: 'returnPrReturn',
+      component: '@/pages/returnManage/returnPrReturn/index',
+    }, 
+    // 待退款-详情
+    {
+      path: '/returnManage/returnPrReturn/detail',
+      name: 'returnPrReturnDetail',
+      component: '@/pages/returnManage/returnPrReturn/detail',
+      hideInMenu: true, 
+      hidePageHeader: true,
+    }, 
+    // 待退款-审核
+    {
+      path: '/returnManage/returnPrReturn/verify',
+      name: 'prReturnVerify',
+      component: '@/pages/returnManage/returnPrReturn/verify',
+      hideInMenu: true, 
+      hidePageHeader: true,
+    }, 
+  ],
+};
+
 export default returnManageRoute;
\ No newline at end of file

env.js

@@ -2,29 +2,6 @@
 
 const path = require('path')
 module.exports = {
-  demo: {
-    SITE_ID: '1',
-    BACK_GATEWAY: 'http://lingxi-all.wg.shushangyun.com',
-    USE_ROUTE_CONFIG: false,
-    SOCKET_URL: 'ws://lingxi-all.wg.shushangyun.com',
-    ssh: JSON.stringify({
-      user: "www",
-      // Password optional, prompted if none given
-      password: "!@#project_$%^231(1)wwwuser3",
-      host: "119.23.219.65",
-      port: 8122,
-      localRoot: path.resolve('./dist/'),
-      remoteRoot: "/usr/local/nginx/html/lingxi/yanshi/api/all/admin/dist/",
-      // include: ["*", "**/*"],      // this would upload everything except dot files
-      include: ["*"],
-      // e.g. exclude sourcemaps, and ALL files in node_modules (including dot files)
-      // exclude: ["dist/**/*.map", "node_modules/**", "node_modules/**/.*", ".git/**"],
-      // delete ALL existing files at destination before uploading, if true
-      deleteRemote: true,
-      // Passive mode is forced (EPSV command is not sent)
-      forcePasv: true
-    })
-  },
   scm: {
     SITE_ID: '1',
     BACK_GATEWAY: 'http://lingxi-scm.wg.shushangyun.com',

src/components/PolymericTable/NormalTable.tsx

-/*
- * @Author: XieZhiXiong
- * @Date: 2020-08-20 16:15:59
- * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-09-10 14:07:35
- * @Description: 简单封装了分页事件的 Table
- */
-import React from 'react';
-import { Table } from 'antd';
-import classNames from 'classnames';
-import { StandardTableProps } from './interface';
-import styles from './index.less';
-
-export default class NormalTable extends React.PureComponent<StandardTableProps> {
-
-  state = {
-    page: 1,
-    size: 10,
-  };
-
-  handlePaginationChange = (page: number, size: number) => {
-    const { pagination = {}, onPaginationChange } = this.props;
-    const { current, pageSize } = pagination;
-
-    // 内部自己维护 page、size， 单独控制当前页 或 当前页数
-    if (!('current' in pagination)) {
-      this.setState({ page: current });
-    }
-    if (!('pageSize' in pagination)) {
-      this.setState({ size: pageSize });
-    }
-
-    if (onPaginationChange) {
-      onPaginationChange(page, size);
-    }
-  };
-
-  render() {
-    const { page, size } = this.state; 
-    const { 
-      columns, 
-      dataSource,
-      rowKey = 'id', 
-      pagination = {}, 
-      loading, 
-      className, 
-      onPaginationChange, 
-      ...restProps
-    } = this.props;
-
-    const newPagination: any = pagination ? {
-      current: page, 
-      pageSize: size,
-      showSizeChanger: true,
-      showQuickJumper: true,
-      onChange: this.handlePaginationChange,
-      onShowSizeChange: this.handlePaginationChange,
-      size: 'small', 
-      showTotal: () => `共 ${pagination.total || 0} 条`,
-      ...pagination, 
-    } : false;
-
-    return (
-      <div className={classNames(className)}>
-        <Table 
-          rowKey={rowKey}
-          columns={columns}
-          dataSource={dataSource}
-          loading={loading}
-          pagination={newPagination}
-          {...restProps}
-        />
-      </div>
-    )
-  }
+/*
+ * @Author: XieZhiXiong
+ * @Date: 2020-08-20 16:15:59
+ * @LastEditors: XieZhiXiong
+ * @LastEditTime: 2020-12-21 13:57:49
+ * @Description: 简单封装了分页事件的 Table
+ */
+import React from 'react';
+import { Table } from 'antd';
+import classNames from 'classnames';
+import { StandardTableProps } from './interface';
+import styles from './index.less';
+
+export default class NormalTable extends React.PureComponent<StandardTableProps> {
+
+  state = {
+    page: 1,
+    size: 10,
+  };
+
+  handlePaginationChange = (page: number, size: number) => {
+    const { pagination = {}, onPaginationChange } = this.props;
+    const { current, pageSize } = pagination;
+
+    // 内部自己维护 page、size， 单独控制当前页 或 当前页数
+    if (!('current' in pagination)) {
+      this.setState({ page: current });
+    }
+    if (!('pageSize' in pagination)) {
+      this.setState({ size: pageSize });
+    }
+
+    if (onPaginationChange) {
+      onPaginationChange(page, size);
+    }
+  };
+
+  render() {
+    const { page, size } = this.state; 
+    const { 
+      columns, 
+      dataSource,
+      rowKey = 'id', 
+      pagination = {}, 
+      loading, 
+      className, 
+      onPaginationChange, 
+      ...restProps
+    } = this.props;
+
+    const newPagination: any = pagination ? {
+      current: page, 
+      pageSize: size,
+      showSizeChanger: true,
+      showQuickJumper: true,
+      onChange: this.handlePaginationChange,
+      size: 'small', 
+      showTotal: () => `共 ${pagination.total || 0} 条`,
+      ...pagination, 
+    } : false;
+
+    return (
+      <div className={classNames(className)}>
+        <Table 
+          rowKey={rowKey}
+          columns={columns}
+          dataSource={dataSource}
+          loading={loading}
+          pagination={newPagination}
+          {...restProps}
+        />
+      </div>
+    )
+  }
 }
\ No newline at end of file

src/pages/rfq/list/index.tsx

@@ -69,7 +69,7 @@ const List:React.FC<{}> = () => {
     dataIndex: 'externalState',
     render: (text: any, record: any) => ExternalState(text)
   }]
-  
+
   const fecheData = (params:any) => {
     return new Promise((resolve, reject) => {
       PublicApi.getOrderPlatformInquiryList({...params}).then(res => {
@@ -118,4 +118,4 @@ const List:React.FC<{}> = () => {
     </PageHeaderWrapper>
   )
 }
-export default List
\ No newline at end of file
+export default List

src/pages/systemManage/platformArg/index.tsx

@@ -31,8 +31,8 @@ const SensitiveWords: React.FC<{}> = () => {
       dataIndex: 'state',
       render: (text: any, record: any) => (
         <StatusSwitch
-          fieldNames="status"
-          handleConfirm={() => handleChangeStatus(record.id, record.status)}
+          fieldNames="state"
+          handleConfirm={() => handleChangeStatus(record.id, record.state)}
           record={record}
           expectTrueValue={1}
         />