merge...

2d6de0ff · 王鹏飞 · d4b5d816 · 688dd8f8 · 2d6de0ff · 2d6de0ff
--- a/.config.dev.js
+++ b/.config.dev.js
 module.exports = {
  domain: 'dev.ezijing.com',
-  url: 'https://learn-api.ezijing.com/api',
-  apiBaseURL: 'https://learn-api.ezijing.com',
+  url: 'https://learn-api2.ezijing.com/api',
+  apiBaseURL: 'https://learn-api2.ezijing.com',
  others: {
    url: '/app/learn/course',
    loginUrl: 'https://login.ezijing.com/seg/login/index'

--- a/.config.pro.js
+++ b/.config.pro.js
@@ -2,6 +2,7 @@ module.exports = {
  url: '/',
  DesDir: './client-dist',
  apiBaseURL: 'https://learn-api.ezijing.com',
+  // apiBaseURL: '/',
  others: {
    url: '/app/learn/course',
    loginUrl: 'https://login.ezijing.com/seg/login/index'

--- a/.config.test.js
+++ b/.config.test.js
@@ -2,6 +2,7 @@ module.exports = {
  url: '/',
  DesDir: './client-dist',
  apiBaseURL: 'https://learn-api2.ezijing.com',
+  // apiBaseURL: '/',
  others: {
    url: '/app/learn/course',
    loginUrl: 'https://login2.ezijing.com/seg/login/index'

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/modules/offices/mixins/edit.js
+++ b/src/modules/offices/mixins/edit.js
--- a/src/modules/offices/src/reportPaper/edit.vue
+++ b/src/modules/offices/src/reportPaper/edit.vue
--- a/src/modules/offices/src/reportPaper/list.vue
+++ b/src/modules/offices/src/reportPaper/list.vue
--- a/src/modules/viewer/components/work/chapterWork.vue
+++ b/src/modules/viewer/components/work/chapterWork.vue
--- a/src/modules/viewer/components/work/courseExam.vue
+++ b/src/modules/viewer/components/work/courseExam.vue
--- a/src/modules/viewer/languages/zh-CN.js
+++ b/src/modules/viewer/languages/zh-CN.js
--- a/src/tool/convert_time.js
+++ b/src/tool/convert_time.js