feat(core) :迁移与新改动合并

config.js

@@ -14,8 +14,8 @@ const dev = {
 //目前没有区分正式服测试服
 const mal = {
   env: 'pro',
-  // socketHost: 'wss://shop.4dkankan.com',
-  socketHost: 'wss://rtc-zfb.4dkankan.com/',
+  //  socketHost: 'wss://rtc-zfb.4dkankan.com/',
+  socketHost: 'wss://test-socket.4dkankan.com',
   // socketHost: 'wss://192.168.0.79:3031',
   requestHost: 'https://plaza-cszfb.4dkankan.com', // 测试环境
   viewChildHost: 'https://cszfb.4dkankan.com', //测试环境

socket.js

@@ -1,4 +1,4 @@
-const io = require('./socket.io-mp')
+const { io } = require('./socket.io-v4.msgpack.js');
 var user = require('./services/user.js');
 const api = require('/config/api.js');
 const util = require('/utils/util.js');
@@ -36,10 +36,13 @@ let urlToJson = (url = window.location.href) => { // 箭头函数默认传值为
 
 
 export default {
+
   joinUrl() {
+    const url = true ? this.data.url.replace('shop.html', 'test-shop.html') : this.data.url;
+
     let options = {
       API_BASE_URL: api.API_BASE_URL,
-      "url": this.data.url,
+      "url": url,
       // "url": 'http://192.168.0.112:8080',
       "reload": this.data.reload,
       "token": wx.getStorageSync('token'),
@@ -72,7 +75,8 @@ export default {
       hostUrl = 'https://test.4dkankan.com/shop-container-zfb/'
     } else {
       // hostUrl = 'https://zfb.4dkankan.com/shop-container/'
-      hostUrl = remote.viewHost + '/shop-container/'
+      // hostUrl = remote.viewHost + '/shop-container/'
+      hostUrl = remote.viewHost + '/shop-container-v4/'
     }
     // let base = remote.viewHost + '/shop-container/fashilong.html?env=' + remote.env + '&sponsor=' + sponsor + '&many=' + this.data.many
     let base = hostUrl + 'fashilong.html?time=' + Date.now() + '&env=' + remote.env + '&sponsor=' + sponsor + '&many=' + this.data.many
@@ -293,9 +297,11 @@ export default {
     console.log('小程序参数', options)
     let socket = io(remote.socketHost, {
       path: '/fsl-node',
+      transport: ['websocket'],
       query: {
         ...options,
-        isClient: true
+        isClient: true,
+        from: 2
       }
     })