Merge branch 'master' of gitpfg.pinfangw.com:gaofangming/yhb

app.js

@@ -7,7 +7,7 @@ App({
   },
 
   judge_Land() {
-
+    
     try {
       console.log(wx.getStorageSync('access_token'), '注册');
       console.log(wx.getStorageSync('wx_id'), '授权');

pages/index/index.js

@@ -78,8 +78,7 @@ Page({
     } 
     app.globalData.trigger = false;
 
-    
-    
+
   },
  
  

pages/information/chat/chat.js

@@ -591,14 +591,19 @@ Page({
     }
   }, 
   onUnload: function (e) {
-    let url = 'imsocket/imchatmessage/clearunreadmsg';
-    let datas = {
-      to_id: this.data.to_id, form_id: getApp().UserId()
-    };
-    //清除未读信息
-    getApp().postRequest(url, datas, function (res) {
-      console.log(res, 11111);
-    })
+    let _that = this;
+    _that.SocketSend({
+      type: 'clearChatTotal'
+      });
+
+    // let url = 'imsocket/imchatmessage/clearunreadmsg';
+    // let datas = {
+    //   to_id: this.data.to_id, form_id: getApp().UserId()
+    // };
+    // //清除未读信息
+    // getApp().postRequest(url, datas, function (res) {
+    //   console.log(res, 11111);
+    // })
     console.log('销毁页面');
   },
   // ceshi: function (e) {

pages/personal_core/home_list/home_list.js

@@ -98,8 +98,8 @@ Page({
       },
       // 验证成功后触发
       success: function (data) {
-        console.log('收到验证成功的回调')
-        console.log(data);
+        // console.log('收到验证成功的回调')
+        // console.log(data);
         let optioninfo_url = 'my/faceid/biztokenresult';
         let optioninfo_data = {biz_token:data.BizToken};
         app.postRequest(optioninfo_url, optioninfo_data, function (res) {

utils/websocket.js

@@ -145,6 +145,12 @@ var webSocket = {
     if (!heart) {
       return;
     }
+
+    self.sendSocketMessage({
+      msg: JSON.stringify({
+        form_id: getApp().UserId(),
+        type: 'resetChatTotal'})})
+
     self.sendSocketMessage({
       msg: JSON.stringify({
         form_id: getApp().UserId(),
@@ -209,7 +215,27 @@ wx.onSocketError(function (res) {
 
 // 监听WebSocket接受到服务器的消息事件。
 wx.onSocketMessage(function (res) {
-  //  console.log('没有回调之前的方法：' + res.data)
+   
+  let data = JSON.parse(res.data);
+  console.log(data);
+  switch(data.type){
+    case 'resetChatTotal':
+      if (data.data.message_exists == true){
+        wx.setTabBarBadge({
+          index: 0,
+          text: '1'
+        })  
+      }else{
+        wx.removeTabBarBadge({
+          index: 0,
+        });
+        // wx.setTabBarBadge({
+        //   index: 0
+        // })  
+      }
+    break;
+  }
+   console.log('没有回调之前的方法：' + res.data)
   webSocket.onSocketMessageCallback(res.data);
 })