diff --git a/.env.development b/.env.development index 450ad4f..02f887d 100644 --- a/.env.development +++ b/.env.development @@ -18,4 +18,8 @@ VUE_APP_BASE_IMG = 'http://39.100.77.21:8013' VUE_APP_WS_API = 'wss://baiyee.vip' # 是否启用 babel-plugin-dynamic-import-node插件 +<<<<<<< HEAD VUE_CLI_BABEL_TRANSPILE_MODULES = true +======= +VUE_CLI_BABEL_TRANSPILE_MODULES = true +>>>>>>> 4025a156f728ac573dc4bae6b4f1f08f2072752c diff --git a/package.json b/package.json index 8f000cd..6e837ae 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "js-beautify": "^1.10.2", "js-cookie": "2.2.0", "jsencrypt": "^3.0.0-rc.1", - "jssip": "^3.10.0", + "jssip": "^3.10.1", "jszip": "^3.7.1", "mavon-editor": "^2.9.0", "node-sass": "npm:sass@^1.57.1", diff --git a/src/views/home.vue b/src/views/home.vue index df3d0bf..bf9ff3f 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,2804 +1,2829 @@ - - - - - + + + + +