Merge remote-tracking branch 'origin/master'

FormInsertDiy/AffairPage/ApplyPage/index.js

@@ -18,7 +18,7 @@ import List from './List';
 import pageSetting from './pageSetting';
 import ButtonDiy from '@/baseComponent/ButtonDiy';
 import Shell from '@/baseComponent/Shell';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 
 export default class AffairPage extends React.Component {
   constructor(props) {

FormInsertDiy/AffairPage/Detail.js

@@ -4,7 +4,7 @@ import Shell from '@/baseComponent/Shell';
 import ButtonDiy from '@/baseComponent/ButtonDiy';
 import router from 'umi/router';
 import { getToken } from '@/utils/authority';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 
 
 export default class Detail extends Component{

FormInsertDiy/AffairPage/component/FlowImg.js

@@ -4,7 +4,7 @@
  * 流程图
  */
 import React, { Component } from 'react'
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 export default class FlowImg extends Component {
   render() {
     let { id } = this.props;

FormInsertDiy/AffairPage/component/FormArray.js

@@ -13,7 +13,7 @@ import { countSpecialField } from '@/baseComponent/utils';
 import TableSelect from './TableSelect';
 import ChildForm from './ChildForm';
 import ReactQuill from 'react-quill';
-import baseConfig from '@/webPublic/one_stop_public/config';
+import baseConfig from '@/config/config';
 import 'react-quill/dist/quill.snow.css';
 import ButtonUpload from './ButtonUpload';
 

FormInsertDiy/AffairPage/destruction.js

 import { text, number, date, format, taskNode } from '../config/index';
 import { isJSON } from '@/baseComponent/utils';
 import { translateAddFields } from '../config/index';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 import { Tooltip } from 'antd';
 import moment from 'moment';
 import React from 'react';

FormInsertDiy/AffairPage/publicApiService.js

@@ -9,7 +9,7 @@ import { apiRequest } from '../request';
 import { getFormArrayConfig }  from '../config/index';
 import { setHuanGeToken } from '@/utils/authority';
 import { getOneStopConfig, isJSON } from '@/baseComponent/utils';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 
 const giveValue = (x) => {
   if(x && x.rows){

FormInsertDiy/Export/index.js

@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
 import { Select, Button, Modal, Input, Transfer, Row, Col, Form, message, notification } from 'antd';
 import { connect } from 'dva';
 import { getToken } from '@/utils/authority';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 import QueryItem from './QueryItem';
 import OrderItem from './OrderItem';
 import ButtonDiy from '@/baseComponent/ButtonDiy';

FormInsertDiy/ImportUtil/ImportUtil.js

@@ -3,7 +3,7 @@ import { Button, Modal, Steps, Upload, Icon, message, Tabs, Table } from 'antd';
 import styles from './ImportUtil.less';
 import ButtonDiy from '@/baseComponent/ButtonDiy';
 import { exportExcel } from 'xlsx-oc';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 import { connect } from 'dva';
 
 const Step = Steps.Step;

FormInsertDiy/request.js

@@ -7,7 +7,7 @@ import {notification} from 'antd';
 import FormdataWrapper from "@/utils/object-to-formdata-custom";
 import { getToken } from '@/utils/authority';
 import { offline } from './Toast';
-import systemConfig from '@/webPublic/one_stop_public/config';
+import systemConfig from '@/config/config';
 
 const codeMessage = {
   200: '服务器成功返回请求的数据。',

zyd_public/LoginFromQrCode/LoginWithQrCode.js

 import React, { Component } from 'react';
 import { message, Icon, Spin } from 'antd';
 import QRCode from 'qrcode.react';
-import config from '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 import fetch from 'dva/fetch';
 import FormdataWrapper from '../utils/object-to-formdata-custom';
 import { isJSON } from '../utils/utils';