Your Name 6 gadi atpakaļ
vecāks
revīzija
87983ab621
4 mainītis faili ar 58 papildinājumiem un 23 dzēšanām
  1. 5 1
      app.js
  2. 3 7
      pages/Landpage/Land/Land.js
  3. 38 14
      pages/chat-list/chat-list.js
  4. 12 1
      pages/chat/chat.js

+ 5 - 1
app.js

@@ -6,6 +6,7 @@ App({
6
   },
6
   },
7
 
7
 
8
 
8
 
9
+
9
   share() {   //分享
10
   share() {   //分享
10
     wx.showShareMenu();
11
     wx.showShareMenu();
11
     console.log(1);
12
     console.log(1);
@@ -41,7 +42,7 @@ App({
41
 
42
 
42
 
43
 
43
     if (wx.getStorageSync('access_token')) {   //是否注册过
44
     if (wx.getStorageSync('access_token')) {   //是否注册过
44
-
45
+      
45
       wx.reLaunch({
46
       wx.reLaunch({
46
         url: '/pages/index/index'        //注册过 进入首页
47
         url: '/pages/index/index'        //注册过 进入首页
47
       })
48
       })
@@ -223,6 +224,9 @@ App({
223
   },
224
   },
224
   UserId: function () {
225
   UserId: function () {
225
     return wx.getStorageSync('access_token');
226
     return wx.getStorageSync('access_token');
227
+  },
228
+  UserToken: function () {
229
+      return wx.getStorageSync('access_user');
226
   }
230
   }
227
 
231
 
228
 })
232
 })

+ 3 - 7
pages/Landpage/Land/Land.js

@@ -73,8 +73,9 @@ Page({
73
       password: this.data.password,    // 密码
73
       password: this.data.password,    // 密码
74
     };
74
     };
75
     app.postRequest(Land_url, Land_data, function (res) {
75
     app.postRequest(Land_url, Land_data, function (res) {
76
+
76
       if (res.code == 201) {
77
       if (res.code == 201) {
77
-        //  console.log(res.data);
78
+         console.log(res.data);
78
         // console.log(res.data.access_key);
79
         // console.log(res.data.access_key);
79
         // console.log(res.data.access_token);
80
         // console.log(res.data.access_token);
80
 
81
 
@@ -85,13 +86,8 @@ Page({
85
                   // 全局同步传参
86
                   // 全局同步传参
86
                   try {
87
                   try {
87
                     wx.setStorageSync('access_key', res.data.access_key)
88
                     wx.setStorageSync('access_key', res.data.access_key)
88
-                  } catch (e) {
89
-
90
-                  }
91
-
92
-                  // 全局同步传参
93
-                  try {
94
                     wx.setStorageSync('access_token', res.data.access_token)
89
                     wx.setStorageSync('access_token', res.data.access_token)
90
+                    wx.setStorageSync('access_user', res.data.access_user)
95
                   } catch (e) {
91
                   } catch (e) {
96
 
92
 
97
                   }
93
                   }

+ 38 - 14
pages/chat-list/chat-list.js

@@ -22,15 +22,6 @@ Page({
22
       let that = this;
22
       let that = this;
23
       // emojiChar: "☺-😋-😌-😍-😏-😜-😝-😞-😔-😪-😭-😁-😂-😃-😅-😆-👿-😒-😓-😔-😏-😖-😘-😚-😒-😡-😢-😣-😤-😢-😨-😳-😵-😷-😸-😻-😼-😽-😾-😿-🙊-🙋-🙏-✈-🚇-🚃-🚌-🍄-🍅-🍆-🍇-🍈-🍉-🍑-🍒-🍓-🐔-🐶-🐷-👦-👧-👱-👩-👰-👨-👲-👳-💃-💄-💅-💆-💇-🌹-💑-💓-💘-🚲",
23
       // emojiChar: "☺-😋-😌-😍-😏-😜-😝-😞-😔-😪-😭-😁-😂-😃-😅-😆-👿-😒-😓-😔-😏-😖-😘-😚-😒-😡-😢-😣-😤-😢-😨-😳-😵-😷-😸-😻-😼-😽-😾-😿-🙊-🙋-🙏-✈-🚇-🚃-🚌-🍄-🍅-🍆-🍇-🍈-🍉-🍑-🍒-🍓-🐔-🐶-🐷-👦-👧-👱-👩-👰-👨-👲-👳-💃-💄-💅-💆-💇-🌹-💑-💓-💘-🚲",
24
 
24
 
25
-      app.postRequest('my/images/headurl', {}, function (res){
26
-        if (res.code == 201) {
27
-          console.log(res);
28
-          that.setData({
29
-            myheadurl: res.data.img,
30
-            // optioninfocode: res,
31
-          })
32
-        } 
33
-      })
34
 
25
 
35
 
26
 
36
 
27
 
@@ -39,6 +30,13 @@ Page({
39
     // console.log(e);
30
     // console.log(e);
40
     // return ;
31
     // return ;
41
     let _that = this;
32
     let _that = this;
33
+    for (var index in _that.data.conversations){
34
+      if (_that.data.conversations[index].to_id == e.currentTarget.dataset.item.to_id){
35
+        _that.data.conversations[index].count = 0;
36
+      }
37
+    }
38
+    // wx.setStorageSync('','');
39
+    wx.setStorageSync('chat_to_id', e.currentTarget.dataset.item.to_id)
42
     wx.navigateTo({
40
     wx.navigateTo({
43
       url: '../chat/chat?to_id=' + e.currentTarget.dataset.item.to_id + '&headUrl=' + e.currentTarget.dataset.item.img + '&myheadurl='+_that.data.myheadurl
41
       url: '../chat/chat?to_id=' + e.currentTarget.dataset.item.to_id + '&headUrl=' + e.currentTarget.dataset.item.img + '&myheadurl='+_that.data.myheadurl
44
     });
42
     });
@@ -46,9 +44,35 @@ Page({
46
     /**
44
     /**
47
      * 生命周期函数--监听页面显示
45
      * 生命周期函数--监听页面显示
48
      */
46
      */
49
-    onShow() {
47
+    onShow(e) {
50
       var _this = this;
48
       var _this = this;
49
+      try {
50
+          let value = wx.getStorageSync('chat_to_id')
51
+      if (value) {
52
+        for (var index in _this.data.conversations) {
53
+          if (_this.data.conversations[index].to_id == value) {
54
+            _this.data.conversations[index].count = 0;
55
+          }
56
+        }  
57
+      }
58
+    } catch (e) {
59
+
60
+    }
61
+      console.log(e,111111222222);
62
+   
51
     console.log(11);
63
     console.log(11);
64
+
65
+      app.postRequest('my/images/headurl', {}, function (res) {
66
+        if (res.code == 201) {
67
+          console.log(res);
68
+          _this.setData({
69
+            myheadurl: res.data.img,
70
+            // optioninfocode: res,
71
+          })
72
+        }
73
+      })
74
+
75
+      console.log(getApp().UserId());
52
       webSocket.sendSocketMessage({
76
       webSocket.sendSocketMessage({
53
         msg: JSON.stringify({ form_id: getApp().UserId(), type: 'Chat_list' }),
77
         msg: JSON.stringify({ form_id: getApp().UserId(), type: 'Chat_list' }),
54
         success: function (res) {
78
         success: function (res) {
@@ -101,12 +125,12 @@ Page({
101
       case 'chat_list_message':
125
       case 'chat_list_message':
102
         let dataArr = _this.data.conversations;
126
         let dataArr = _this.data.conversations;
103
         let idData = [];
127
         let idData = [];
104
-        console.log(data.data);
128
+        console.log(data.data,'chat_list_message');
105
     
129
     
106
         for (var index in dataArr){
130
         for (var index in dataArr){
107
           // idData.push(String(dataArr[index].to_id));
131
           // idData.push(String(dataArr[index].to_id));
108
-          idData.push(String(dataArr[index].to_id)); //统一转换成string
109
-            if (dataArr[index].to_id == data.data.to_id)
132
+          idData.push(String(dataArr[index].to_str)); //统一转换成string
133
+          if (dataArr[index].to_str == data.data.to_str)
110
             {
134
             {
111
               dataArr[index].count = data.data.count;
135
               dataArr[index].count = data.data.count;
112
               dataArr[index].content = data.data.content;
136
               dataArr[index].content = data.data.content;
@@ -120,7 +144,7 @@ Page({
120
          } 
144
          } 
121
      
145
      
122
         //新增一列
146
         //新增一列
123
-        if (idData.indexOf(String(data.data.to_id)) == '-1'){
147
+        if (idData.indexOf(String(data.data.to_str)) == '-1'){
124
           dataArr.push(data.data); 
148
           dataArr.push(data.data); 
125
         }
149
         }
126
          _this.setData({
150
          _this.setData({

+ 12 - 1
pages/chat/chat.js

@@ -233,6 +233,7 @@ Page({
233
         case 'get_history':
233
         case 'get_history':
234
        
234
        
235
           console.log(data, '分页消息');
235
           console.log(data, '分页消息');
236
+          console.log(getApp().UserId(),'UserId');
236
           for (var index in data.data) {
237
           for (var index in data.data) {
237
             switch(data.data[index].type){
238
             switch(data.data[index].type){
238
                 case 1:
239
                 case 1:
@@ -246,7 +247,8 @@ Page({
246
             // data.data[index].time = data.data[index].create_at;
247
             // data.data[index].time = data.data[index].create_at;
247
             data.data[index].showTime = true;
248
             data.data[index].showTime = true;
248
             //自己 
249
             //自己 
249
-            if (data.data[index].form_id == getApp().UserId()) {
250
+            console.log(getApp().UserToken());
251
+            if (data.data[index].form_id == getApp().UserToken()) {
250
               data.data[index].isMy = true;
252
               data.data[index].isMy = true;
251
               data.data[index].userId = data.data[index].form_id;
253
               data.data[index].userId = data.data[index].form_id;
252
               data.data[index].headUrl = _that.data.myheadurl
254
               data.data[index].headUrl = _that.data.myheadurl
@@ -295,6 +297,15 @@ Page({
295
   },
297
   },
296
 
298
 
297
   onUnload:function(e){
299
   onUnload:function(e){
300
+
301
+      let url = 'imsocket/imchatmessage/clearunreadmsg';
302
+      let datas  = {
303
+        to_id: this.data.friendId, form_id: getApp().UserId()
304
+      };
305
+    //清除未读信息
306
+    getApp().postRequest(url, datas, function (res) {
307
+          console.log(res,11111);
308
+    })
298
     console.log('销毁页面');
309
     console.log('销毁页面');
299
   },
310
   },
300
   SocketSend:function(msg){
311
   SocketSend:function(msg){