解决冲突

operationSupport/package-lock.json

@@ -4872,9 +4872,9 @@
       "dev": true
     },
     "element-ui": {
-      "version": "2.15.6",
-      "resolved": "https://registry.npmmirror.com/element-ui/download/element-ui-2.15.6.tgz",
-      "integrity": "sha1-yWCa3TWvWmhqS3aF3B11fHXgHfM=",
+      "version": "2.13.2",
+      "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.13.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.13.2.tgz",
+      "integrity": "sha1-WCv0eqqqr+I+oZWPriF6aHrQZEc=",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",

operationSupport/src/config/env.sit.js

@@ -9,6 +9,7 @@ module.exports = {
     edition: "production",
     Env: "sit", // 商用环境： prod   |   演示环境： demo
     baseUrl: "http://114.135.61.186:21020/userCenter/", // 项目地址
+    baseCeAPI:"http://114.135.61.186:21020",
     baseApi: "http://114.135.61.186:21020", // 本地api请求地址
     baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
     baseExcelApi: "http://114.135.61.186:21020", // excel请求地址

operationSupport/src/utils/http.js

@@ -15,7 +15,7 @@ http.interceptors.request.use(
     (config) => {
         // 所有请求都添加/user-auth前缀，方便接口代理
         // config.url = `/user-auth${config.url}`;
-        if (config.url.indexOf('/user-auth') !== -1) {
+        if (config.url.indexOf('/sc-user-auth') !== -1) {
             config.url = config.url;
         } else if (config.url.indexOf('/sc-message') !== -1) {
             config.url = config.url;

operationSupport/vue.config.js

@@ -75,7 +75,7 @@ module.exports = {
         open: false, // 配置自动启动浏览器  open: 'Google Chrome'-默认启动谷歌
         // 配置多个代理
         proxy: {
-            '/user-auth': {
+            '/sc-user-auth': {
                 target: envConfig.baseApi,
                 ws: true, // 代理的WebSockets
                 changeOrigin: true, // 允许websockets跨域