Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

Services.js

 import { uaaRequest } from './one_stop_public/utils/request';
-import config from '@/config/config';
+import config from '@/webPublic/one_stop_public/config';
 import { message } from 'antd';
 import { setOneStopConfig } from '@/webPublic/zyd_public/utils/utils';
 

one_stop_public/App/DraftEditor.js

@@ -15,7 +15,7 @@ import pic from '../assets/专家经验系统切图/智能报告/pic.png'
 import video from '../assets/专家经验系统切图/智能报告/video.png'
 import sum from '../assets/专家经验系统切图/智能报告/sum.png'
 import attrs from '../assets/专家经验系统切图/智能报告/attr.png'
-import config from '../config/config'
+import config from '@/webPublic/one_stop_public/config'
 import MyBlockRender from './MyBlockRender'
 import { changeToDraftState2, changeFromDraftState2 } from '../utils/myutils'
 import {

one_stop_public/App/ExportCurrentInfo.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/token'
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 
 import QueryItem from './QueryItem';
 import OrderItem from './OrderItem';

one_stop_public/App/ExportInfo.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/token'
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 
 import QueryItem from './QueryItem';
 import OrderItem from './OrderItem';

one_stop_public/App/ImportUtil.js

@@ -13,7 +13,7 @@ import {
 import styles from './ImportUtil.less';
 import ButtonDiy from './ButtonDiy/ButtonDiy';
 import { exportExcel } from 'xlsx-oc'
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 import { connect } from 'dva';
 const Step = Steps.Step;
 const TabPane = Tabs.TabPane;

one_stop_public/App/MyBlockRender.js

 import { Table,Popover  } from 'antd';
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 import table from '../assets/专家经验系统切图/智能报告/table.png'
 import chart from '../assets/专家经验系统切图/智能报告/chart.png'
 import React from 'react';

one_stop_public/App/SearchInfo.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/token'
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 
 import QueryItem from './QueryItem';
 import OrderItem from './OrderItem';

one_stop_public/App/StatisticsInfo.js

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom';
 import { Select, Button, Modal, Input, Table, Row, Col, Tag, Form, message ,notification } from 'antd';
 import { connect } from 'dva';
 import { getToken } from '../utils/token'
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 import QueryItem from './QueryItem';
 import OrderItem from './OrderItem';
 import styles from './Ability.css';

one_stop_public/Signature/index.jsx

@@ -7,7 +7,7 @@ import React, { Component } from 'react'
 import SignatureCanvas from 'react-signature-canvas'
 // import Button from '@/components/NewButton';
 import { message,Button } from 'antd';
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 import { queryApiActionPath } from "../utils/queryConfig";
 import reqwest from 'reqwest';
 function dataURLtoFile (dataurl, filename) { 

one_stop_public/config.js

+
+import req from '@/utils/request';
+// import dictMap from './dictMap';
+import { queryApiActionPath, queryWsPath } from "@/webPublic/one_stop_public/utils/queryConfig";
+var localMockHostPath = "http://rap2api.taobao.org/app/mock/230899";
+var localhostPath = queryApiActionPath();
+var wsPath = queryWsPath();
+// 测试对接接口用地址不用时删除
+let csPath = "http://192.168.3.133:8080/expense";
+const prefix = "http://scjoyedu.eicp.net:7180/onestop/#"
+async function request(data) {
+
+  return req(`${data.url}`, {
+    method: 'POST',
+    body: data.params,
+  });
+}
+//var localhostPath = "http://zyd.cdzhiyong.com:51335"
+const config = {
+  // dictMap:dictMap,
+  httpServer:localhostPath,
+  httpMockServer:localMockHostPath,
+  prefixServer:localhostPath+prefix,
+  rapFlag: true,
+  onlinePath: '/transacApi/',
+  onlineImagePath: "",
+  cs:csPath,
+  img: csPath+"/upload",
+  rapImagePath: localhostPath,
+  uploadUrl:localhostPath+"/upload",
+  websocketUrl:wsPath!=null?wsPath:localhostPath.replace("http","ws")+"/websocket",
+  payUrl:localhostPath+"/createWixinPayCode",
+  checkPath:false,
+ //mobileHost:"http://localhost:51335",
+  //mobileHost:"http://zyd.cdzhiyong.com:51335",
+  mobileUrl:prefix+"/mobile/GHHome",
+  mobileHost:"http://localhost:33333",
+
+  request:request
+}
+
+
+export default config

one_stop_public/libs/ImgUploadCom.jsx

 import React from 'react'
 import { Upload,message } from 'antd';
-import config from '@/config/config'
+import config from '@/webPublic/one_stop_public/config'
 export default class ImgUploadCom extends React.Component {
     constructor(props){
         super(props)

one_stop_public/libs/UploadCom.js

 import React from 'react'
 import { Tree,Upload,Icon,Button,message } from 'antd';
 import { queryApiActionPath } from "../utils/queryConfig";
-import config from '../config/config'
+import config from '@/webPublic/one_stop_public/config'
 const TreeNode = Tree.TreeNode;
 
 

one_stop_public/libs/formList/index.js

@@ -30,13 +30,11 @@ import StatisticsInfo from '../../App/StatisticsInfo';
 import ImportUtil from '../../App/ImportUtil';
 import SearchInfo from '../../App/SearchInfo';
 import {Base16Encode} from "../../Base16/index";
-import baseX from 'base-x'
+
 import {isEmpty} from 'lodash'
 import FilePreview from "@/webPublic/one_stop_public/filePreview";
 import {queryApiActionPath} from "@/webPublic/one_stop_public/utils/queryConfig";
 import UploadCom from "@/webPublic/one_stop_public/libs/UploadCom";
-const BASE16 = '0123456789abcdef'
-const bs16 = baseX(BASE16)
 const FormItem = Form.Item;
 let AllWidth = 0; // 表格总长度
 const { RangePicker } = DatePicker;

one_stop_public/tableCompon/index.jsx

@@ -54,7 +54,7 @@ import moment from 'moment';
 import router from 'umi/router';
 import TableList from '../libs/TableList';
 import styles from './style.less';
-import config from '../config/config';
+import config from '@/webPublic/one_stop_public/config';
 import { isEmpty, isNaN, cloneDeep } from 'lodash'
 import { queryApiActionPath } from "../utils/queryConfig";
 import { extend } from 'umi-request';

one_stop_public/utils/queryConfig.js

@@ -18,6 +18,7 @@ const queryConfig = (key) => {
  * */
 export const querySysCode = () => queryConfig("SYSCODE");
 
+export const queryWsPath = () => queryConfig("WS_PATH");
 
 /**
  * @description 获取服务端请求路径前戳