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 '@/webPublic/one_stop_public/config';
+import config from '@/config/config';
 import { message } from 'antd';
 import { setOneStopConfig } from '@/webPublic/zyd_public/utils/utils';