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

pages/chat-list/chat-list.js

@@ -143,9 +143,10 @@ Page({
         for (var index in dataArr){
           // idData.push(String(dataArr[index].to_id));
           idData.push(String(dataArr[index].to_str)); //统一转换成string
-          dataArr[index].timeStr = timefunc.TimeFormatting(data.data.create_at); 
+         
           if (dataArr[index].to_str == data.data.to_str)
             {
+              dataArr[index].timeStr = timefunc.TimeFormatting(data.data.create_at); 
               dataArr[index].count = data.data.count;
               dataArr[index].content = data.data.content;
               dataArr[index].create_at = data.data.create_at;

pages/index_details/index_details.js

@@ -3,25 +3,18 @@ Page({
 
   data: {
     information: '',   //个人信息
-
     optioninfo: '',    //择偶信息
-
     adopticon: '',  //认证信息
-
     geifabulous:'',  //获取点赞
-
     Fabulous:'',  // 点赞
-
     optionsuid: '', //用户uid
-
     collection: '',  //收藏
-
     options_img: '',  //头像
-
     uploadImages:[], //相册放大图集
     albumimg:'', // 相册
     albumimgurl: '',// 相册url
     watermark: '',
+    to_id:'',
   },
 
 
@@ -44,7 +37,8 @@ Page({
 
     that.to_id = options.uid;
     that.setData({
-      options_img: options.img  //头像
+      options_img: options.img,  //头像
+      to_id: options.uid
     })
 
     // 同步传参
@@ -256,13 +250,20 @@ console.log(that.data.uploadImages)
   toChat(e) { //跳转进入聊天页面
   let that = this;
 
-    app.postRequest('circle/dialogue/validate', {}, function (res) {
-        console.log(res);
+    app.postRequest('circle/dialogue/validate', {to_id:that.data.to_id}, function (res) {
+        // console.log(res);
+
+        // return ;
       if (res.code == 201) {
+
         wx.navigateTo({
-          url: '../chat/chat?to_id=' + that.to_id + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
+          url: '../information/chat/chat?to_id=' + that.data.to_id + '&headUrl=' + that.data.options_img + '&myheadurl=' + res.data.myHeadImg
         });
-        return ;
+
+        // wx.navigateTo({
+        //   url: '../chat/chat?to_id=' +  + '&myheadurl=' + that.myheadurl + '&headUrl=' + that.data.options_img
+        // });
+       
       } 
 
       if (res.data.location == 'shiming') {