Merge branch 'x' of gitlab.ezijing.com:ezijing/new-project into x

.config.pro.js

 module.exports = {
   url: '//project-api.ezijing.com',
   DesDir: './client-dist',
-  apiBaseURL: '//project-api.ezijing.com/api',
+  apiBaseURL: '//project-api.ezijing.com',
   isUploadStatic: false,
   isEnableToIphoneDebugger: false,
   webpack: {

.config.test.js

 module.exports = {
   url: '//project-api.ezijing.com',
   DesDir: './client-dist',
-  apiBaseURL: '//project-api.ezijing.com/api',
+  apiBaseURL: '//project-api.ezijing.com',
   CDN_DIR: 'static/build/learn-test/',
   isUploadStatic: false,
   isEnableToIphoneDebugger: true,

src/api/article_api.js

@@ -6,7 +6,7 @@ export default class ScoreAPI extends BaseAPI {
   // 获取文章
   getArticle = (obj = {}) => this.get('/api/microservices/api/article/list', obj, {})
   // 获取文章详情
-  getArticleDetail = (id) => this.get(`/microservices/api/article/${id}/info`)
+  getArticleDetail = (id) => this.get(`/api/microservices/api/article/${id}/info`)
   // formCommit = (data) => this.post('/api/microservices/api/form/commit', data)
   formCommit = (data) => this.post('/api/microservices/api/apply/teacher-form', data)
   // 获取轮播