1

.env.development

@@ -2,11 +2,6 @@
 ENV='development'
 
 # base api
-<<<<<<< HEAD
 VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
 VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
 
-=======
-VUE_APP_BASE_API=http://starter.ali251.langye.net
-VUE_APP_UPLOAD_API=http://starter.ali251.langye.net/api/admin/upload-file
->>>>>>> 20bcb15194373a4db880ebe3edd27d2d277d5c15

package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@smallwei/avue": "^2.9.15",
-    "@tinymce/tinymce-vue": "^3.0.1",
+    "@tinymce/tinymce-vue": "^3.2.8",
     "avue-plugin-map": "^1.0.1",
     "axios": "0.18.1",
     "core-js": "3.6.5",

src/settings.js

@@ -1,10 +1,6 @@
 module.exports = {
 
-<<<<<<< HEAD
   title: '物资仓库管理平台',
-=======
-  title: '朗业基础平台',
->>>>>>> 20bcb15194373a4db880ebe3edd27d2d277d5c15
 
   /**
    * @type {boolean} true | false

vue.config.js

@@ -13,13 +13,9 @@ 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
-<<<<<<< HEAD
 
 const port = process.env.port || process.env.npm_config_port || 8016 // dev port
 
-=======
-const port = process.env.port || process.env.npm_config_port || 8000 // dev port
->>>>>>> 20bcb15194373a4db880ebe3edd27d2d277d5c15
 
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {