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

pages/chat-list/chat-list.js

@@ -48,11 +48,11 @@ Page({
      */
     onShow() {
       var _this = this;
-
+    console.log(11);
       webSocket.sendSocketMessage({
         msg: JSON.stringify({ form_id: getApp().UserId(), type: 'Chat_list' }),
         success: function (res) {
-          console.log(res, 'dakai');
+          console.log(res, 'dakai111');
         }, fail: function (res) {
           console.log('发送消息失败')
         }

pages/chat/chat.js

@@ -31,6 +31,7 @@ Page({
       // headUrl
       // wx.startPullDownRefresh
     //请空未读消息条数
+    console.log(options);
       console.log(options,'chat');
       const friend = options;
       this.SocketSend({ to_id: friend.to_id, form_id: getApp().UserId(), type: 'get_history', page: this.data.limit_page});
@@ -62,7 +63,7 @@ Page({
     },
   onShow: function (e) {
     //获取历史消息getget
-    this.onLoad();
+    // this.onLoad();
 
   },
     initData() {

pages/index/index.js

@@ -62,6 +62,7 @@ Page({
   },
 
   onLoad: function (options) {
+   
     webSocket.connectSocket();
   },
 

pages/index_details/index_details.js

@@ -25,9 +25,20 @@ Page({
 
   onLoad: function (options) {
     var that = this;
-    
-    getApp().showLoading();   //提示加载中
 
+    app.postRequest('my/images/headurl', {}, function (res) {
+      if (res.code == 201) {
+        that.myheadurl = res.data.img
+        // console.log(res);
+        // that.setData({
+        //   myheadurl: res.data.img,
+        //   // optioninfocode: res,
+        // })
+      }
+    })
+
+    getApp().showLoading();   //提示加载中
+    that.to_id = options.uid;
     that.setData({
       options_img: options.img  //头像
     })
@@ -237,8 +248,9 @@ console.log(that.data.uploadImages)
 
   },
   toChat(e) { //跳转进入聊天页面
+  let that = this;
     wx.navigateTo({
-      url: '../chat/chat?to_id=' + e.currentTarget.dataset.item
+      url: '../chat/chat?to_id=' + that.to_id + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
     });
   }