Merge remote-tracking branch 'origin/master'

package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@smallwei/avue": "^2.9.15",
-    "@tinymce/tinymce-vue": "^3.0.1",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "af-table-column": "^1.0.3",
     "avue-plugin-map": "^1.0.1",
     "axios": "0.18.1",

src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '朗业基础平台',
+  title: '内部质量保证体系资料汇编',
 
   /**
    * @type {boolean} true | false

vue.config.js

@@ -13,7 +13,7 @@ const name = defaultSettings.title // page title
 // For example, Mac: sudo npm run
 // You can change the port by the following methods:
 // port = 9528 npm run dev OR npm run dev --port = 9528
-const port = process.env.port || process.env.npm_config_port || 8000 // dev port
+const port = process.env.port || process.env.npm_config_port || 8049 // dev port
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -25,8 +25,8 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: './dist',
-  assetsDir: 'static',
+  outputDir: '/Users/liuxiangyu/Work/w-weishengxueyuan/app/weiyuan-document-service/public/admin',
+
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项
       less: {