Browse Source

修改SOCKET位置

chenxiaofeng 6 years ago
parent
commit
ce5cbd6df7
3 changed files with 29 additions and 19 deletions
  1. 1 1
      app.js
  2. 19 9
      pages/Landpage/Land/Land.js
  3. 9 9
      utils/websocket.js

+ 1 - 1
app.js

@@ -55,7 +55,7 @@ App({
55
 
55
 
56
   onLoad: function (options) {
56
   onLoad: function (options) {
57
 
57
 
58
-   
58
+    webSocket.connectSocket();
59
   
59
   
60
   },
60
   },
61
 
61
 

+ 19 - 9
pages/Landpage/Land/Land.js

@@ -1,4 +1,5 @@
1
 const app = getApp();
1
 const app = getApp();
2
+const webSocket = require('../../../utils/websocket.js');
2
 Page({
3
 Page({
3
 
4
 
4
 
5
 
@@ -90,20 +91,29 @@ Page({
90
         console.log(res.data);
91
         console.log(res.data);
91
         // console.log(res.data.access_key);
92
         // console.log(res.data.access_key);
92
         // console.log(res.data.access_token);
93
         // console.log(res.data.access_token);
94
+        webSocket.sendSocketMessage({
95
+          msg: JSON.stringify({
96
+            form_id: res.data.access_token,
97
+            type: 'login'
98
+          }),
99
+          success: function (e) {
100
+            console.log('socket登录成功');
101
+          }
102
+        })
103
+        // 全局同步传参
104
+        try {
105
+          wx.setStorageSync('access_key', res.data.access_key)
106
+          wx.setStorageSync('access_token', res.data.access_token)
107
+          wx.setStorageSync('access_user', res.data.access_user)
108
+          wx.setStorageSync('user', that.data.user)
109
+        } catch (e) {
93
 
110
 
111
+        }
94
                   wx.switchTab({ // 跳转首页
112
                   wx.switchTab({ // 跳转首页
95
                     url: '/pages/index/index'
113
                     url: '/pages/index/index'
96
                   })
114
                   })
97
 
115
 
98
-                  // 全局同步传参
116
+               
99
-                  try {
100
-                    wx.setStorageSync('access_key', res.data.access_key)
101
-                    wx.setStorageSync('access_token', res.data.access_token)
102
-                    wx.setStorageSync('access_user', res.data.access_user)
103
-                    wx.setStorageSync('user', that.data.user)
104
-                  } catch (e) {
105
-
106
-                  }
107
  
117
  
108
          return;
118
          return;
109
                  
119
                  

+ 9 - 9
utils/websocket.js

@@ -180,15 +180,15 @@ wx.onSocketOpen(function (res) {
180
   } else {
180
   } else {
181
     socketOpen = true
181
     socketOpen = true
182
 
182
 
183
-    webSocket.sendSocketMessage({
183
+    // webSocket.sendSocketMessage({
184
-      msg: JSON.stringify({
184
+    //   msg: JSON.stringify({
185
-        form_id: getApp().UserId(),
185
+    //     form_id: getApp().UserId(),
186
-        type: 'login'
186
+    //     type: 'login'
187
-      }),
187
+    //   }),
188
-      success: function (e) {
188
+    //   success: function (e) {
189
-        console.log('socket登录成功');
189
+    //     console.log('socket登录成功');
190
-      }
190
+    //   }
191
-    })
191
+    // })
192
     for (var i = 0; i < socketMsgQueue.length; i++) {
192
     for (var i = 0; i < socketMsgQueue.length; i++) {
193
       webSocket.sendSocketMessage(socketMsgQueue[i])
193
       webSocket.sendSocketMessage(socketMsgQueue[i])
194
     }
194
     }