Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

config/index.js

@@ -16,9 +16,9 @@ module.exports = {
       '/proxyApi': {
         // 线上环境
         target: 'https://www.muzhikeji.cn/api',
-        // 客户环境
-        // target: 'https://192.168.2.110/api',
-        // 客户环境2
+        // 东齐环境
+        // target: 'https://192.168.2.124/api',
+        // 昌柘环境
         // target: 'https://192.168.110.222/api',
         changeOrigin: true,
         pathRewrite: {

src/views/main.vue

@@ -95,9 +95,9 @@
             // websocket初始化
             // 线上地址
             this.$store.dispatch('websocket/WEBSOCKET_INIT', 'wss://www.muzhikeji.cn/wss/web_socket/' + data.data.userId + '_' + (Math.ceil(Math.random() * 100000000)).toString())
-            // 客户环境
-            // this.$store.dispatch('websocket/WEBSOCKET_INIT', 'wss://192.168.2.110/wss/web_socket/' + data.data.userId + '_' + (Math.ceil(Math.random() * 100000000)).toString())
-            // 客户环境2
+            // 东齐环境
+            // this.$store.dispatch('websocket/WEBSOCKET_INIT', 'wss://192.168.2.124/wss/web_socket/' + data.data.userId + '_' + (Math.ceil(Math.random() * 100000000)).toString())
+            // 昌柘环境
             // this.$store.dispatch('websocket/WEBSOCKET_INIT', 'wss://192.168.110.222/wss/web_socket/' + data.data.userId + '_' + (Math.ceil(Math.random() * 100000000)).toString())
           }
         })