1

pages/information/chat/chat.js

@@ -1,4 +1,5 @@
 const app = getApp();
+const time = require('../../../utils/time.js');
 const ImageType = 'images';
 const TextType = 'text';
 Page({
@@ -7,6 +8,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+    codedata: true,  //用来判断code
+    frequency:true, //多次加载次数限制
     hiddenName:true, // 加载更多显示隐藏
     toView:'Stop',   //锚点
     scrollTopVal: 1,    //滚动条
@@ -72,6 +75,8 @@ Page({
 
 
 
+
+    
   },
 
 
@@ -127,7 +132,7 @@ Page({
   //input输入框
   Telephone: function (e) {
     var that = this;
-    console.log(e.detail.value);
+    // console.log(e.detail.value);
     that.setData({
       news: e.detail.value,     //获取输入文字
     })
@@ -166,7 +171,7 @@ Page({
               console.log(con, 1);
 
               // console.log(ImgRes.tempFilePaths[0], 1222222);
-              that.SocketSend({ type: ImageType, content: con });
+              that.SocketSend({ type: ImageType, content: con.img_name });
 
               // that.msgManager.sendMsg({ type: IMOperator.ImageType, content: con })
 
@@ -224,16 +229,24 @@ Page({
 
       success: function (res) {   //发送成功
 
+        var current_time = Date.now();
+        var _time = time.TimeFormatting(current_time);   // 时间格式化
+        // console.log(_time);
+
         // 我跟他人说话
         switch (msg.type) {
 
           case "alone":     //  发送文本
 
+
+
+
+            
             console.log(' 发送文本');
             var obj = {     //创建对象，用来合并历史消息对象
               content: that.data.news,     //发送消息内容  
               type: 1,                            //类型 1 : 文字类型     类型 2 : 图片
-              time: Date.now(),         //时间
+              time: _time,         //时间
               isMy: true,   //自己
               send: true,   //    发送成功  为true   失败false 
             };
@@ -252,12 +265,13 @@ Page({
 
           case "images":   //  发送图片
 
+
             console.log(' 发送图片');
 
             var obj = {     //创建对象，用来合并历史消息对象
               content: that.data.photo,     //发送消息内容  
               type: 2,                            //类型 1 : 文字类型     类型 2 : 图片
-              time: Date.now(),         //时间
+              time: _time,         //时间
               isMy: true,   //自己
               send: true,   //    发送成功  为true   失败false 
             };
@@ -293,27 +307,48 @@ Page({
   // 接收消息
   onSocketMessageCallback: function (e) {
     var that = this;
-    let data = JSON.parse(e);
+    let data  = JSON.parse(e);
   
-    //  console.log(data,'接受消息成功');
+     console.log(data,'接受消息成功');
 
-    var arrData = data.data;
+    var arrData = data.data.data;
 
+   
     switch (data.type) {
       // 接收历史消息
       case "get_history":
         // console.log(arrData,111112222);
 
+        var _code = data.code;
+
+        if (_code == 201){
+       
         // let total = arrData.length - 1;
         // console.log(total);
+
+          // var vasd = time.TimeFormatting(1561186210);
+          // console.log(vasd)
+
+          console.log(arrData);
+
         for (var index in arrData) {     //二次赋值  
           if (arrData[index].form_id == getApp().UserToken()) {   //判断  如果等于自己 true  ，等于他人  false。
             arrData[index].isMy = true;    //自己
           } else {
             arrData[index].isMy = false;   //他人
           }
-      
-          that.ArrMsg.push(arrData[index]);   //每次接到的数据拼接
+
+          if (arrData[index].type == 2){
+               arrData[index].content = data.data.url + arrData[index].content + data.data.stylename;
+          }
+
+          if (arrData[index].create_at){
+            var _time = time.TimeFormatting(arrData[index].create_at);   // 时间格式化
+            arrData[index].time = _time;  //时间从新赋值
+          }
+        
+          that.ArrMsg.push(arrData[index]);
+
         }
 
         for (var index in that.ArrMsg) {     //二次赋值   把所有的数据 hooks参数 清空
@@ -329,10 +364,6 @@ Page({
     
         console.log(Arrs1, 111112222);
         
-        that.setData({   
-          hiddenName: true,
-        });
-
 
         if (that.data.limit_page == 1) {   //判断  分页 1 的时候 
           that.setData({
@@ -347,22 +378,38 @@ Page({
             toView: 'Stop'      //开启锚点 赋值
           });
         }
-
-
+    
         that.setData({     //最后关闭锚点   方便每次进来  在开启 修复 描点会闪动
           toView: false,
+          frequency: true,
+          hiddenName: true,    //隐藏加载更多图片  
         });
-    
+
+
+        }else{
+          that.setData({ 
+            hiddenName: true,    //隐藏加载更多图片  
+            codedata: false     //code 301  
+          });
+
+        }
         break;
 
 
       case "alone":       // 接收他人文本
-        console.log(arrData, "aaasd");
+
+        var arrDatatext = data.data;
+        console.log(arrDatatext, "aaasd");
+
+
+        var current_time = Date.now();
+        var _time = time.TimeFormatting(current_time);   // 时间格式化
+        // console.log(_time);
 
         var obj = {     //创建对象，用来合并历史消息对象
-          content: arrData.content,   //发送消息内容
+          content: arrDatatext.content,   //发送消息内容
           type: 1,          //类型 1 : 文字类型     类型 2 : 图片
-          time: Date.now(),    //时间
+          time: _time,    //时间
           isMy: false,   //他人
         };
 
@@ -378,13 +425,20 @@ Page({
         break;
 
       case "images":   // 接收他人图片
-        console.log(arrData, "接收图片");
+        var arrDataimg = data.data;
+
+        console.log(arrDataimg, "接收图片");
+
+        var current_time = Date.now();
+        var _time = time.TimeFormatting(current_time);   // 时间格式化
+        // console.log(_time);
 
         var obj = {     //创建对象，用来合并历史消息对象
-          content: arrData.content,   //发送消息内容
+          content: arrDataimg.content,   //发送消息内容
           type: 2,          //类型 1 : 文字类型     类型 2 : 图片
-          time: Date.now(),    //时间
+          time: _time,    //时间
           isMy: false,   //他人
+          
         };
 
         let _Receive_img = that.data.Receive_news;
@@ -472,18 +526,24 @@ Page({
     var that = this;
     // console.log(e,'加载')
 
-    that.setData({   //  显示加载更多图片
-          hiddenName:false,    
-    })
+    if (that.data.codedata == true){
+      that.setData({   //  显示加载更多图片
+        hiddenName: false,
+      })
+    }
+
+  
+ if (that.data.frequency == true){
 
-   setTimeout(function () {
+  //  setTimeout(function () {
         that.setData({
-          limit_page: that.data.limit_page * 1 + 1
+          limit_page: that.data.limit_page * 1 + 1,
+          frequency:false
         })
         console.log(that.data.limit_page * 1 + 1)
         that.SocketSend({ type: 'get_history', page: that.data.limit_page,limit:10})
-    }, 3000);
-
+    // }, 1000);
+    }
     // console.log('执行')
   },
 
@@ -515,7 +575,7 @@ Page({
       menu: false,
       KeyboardHeight: e.detail.height,
     })
-    console.log(e.detail.height);
+    // console.log(e.detail.height);
   },
 
   // 发送键切换

pages/information/chat/chat.wxml

@@ -4,11 +4,13 @@
     bindscrolltolower="lower"
     bindscroll="scroll" -->
    <!-- bindscroll="ceshi" -->
-<scroll-view class="history"     scroll-top="{{scrollTopVal}}"    scroll-y="true"  bindtap="resetInputStatus"  bindscrolltoupper="upper"   scroll-into-view="{{toView}}">
+   <!-- bindtouchend="cheshi" -->
 
-          <view class='Load_img_box' hidden="{{hiddenName}}">
-               <view class='Load_img'><image src='/image/jz.png' mode="aspectFill"></image></view>
-           </view>
+<view class='Load_img_box' hidden="{{hiddenName}}">
+    <view class='Load_img'><image src='/image/jz.png' mode="aspectFill"></image></view>
+</view>
+
+<scroll-view class="history"     scroll-top="{{scrollTopVal}}"    scroll-y="true"  bindtap="resetInputStatus"  bindscrolltoupper="upper"   scroll-into-view="{{toView}}" >
           <!-- 自己 -->
            <block  wx:for='{{Receive_news}}' wx:key="item">
                 <view class='my_right c' wx:if="{{item.isMy === true}}" id="{{item.hooks}}">

pages/information/chat/chat.wxss

@@ -7,16 +7,16 @@ page {background-color: #EDEDED; height: 100%;}
 
 .history { 
   /* border:1px solid; */
-  height: 88%;  
+  height: 89.5%;  
   font-size: 30rpx;  
   word-break: break-all;  
   margin: auto;
 }  
 /* 自己 */
-.my_right{padding:20rpx;}
-.my_right .time{text-align:center;display:block;}
+.my_right{padding:0 20rpx;margin-top:50rpx;}
+.my_right .time{text-align:center;display:block;font-size:24rpx;}
 /* 文字 */
-.my_right .information{margin-top:30rpx;float:right;}
+.my_right .information{margin-top:50rpx;float:right;}
 .my_right .information text{max-width:474rpx;display:block;float:left;margin-right:20rpx;background:#8FCBF7;border-radius:10rpx;overflow:hidden;padding:18rpx 18rpx;}
 .my_right  .m_tx{width:80rpx;height:80rpx;border-radius:6rpx;overflow:hidden;}
 
@@ -24,20 +24,20 @@ page {background-color: #EDEDED; height: 100%;}
 .my_right .m_state  .m_jz{width:30rpx;height:30rpx;position:relative;top:22rpx;}
 
 /* 图片*/
-.my_right .m_img{margin-top:30rpx;float:right;}
+.my_right .m_img{margin-top:50rpx;float:right;}
 .my_right .m_img .m_picture{max-width:260rpx;float:left;margin-right:24rpx;border-radius:6rpx;max-height:260rpx;}
 
 /* 他人 */
-.my_left{padding:20rpx;}
-.my_left .l_time{text-align:center;display:block;}
+.my_left{padding:0 20rpx;margin-top:50rpx;}
+.my_left .l_time{text-align:center;display:block;font-size:24rpx;}
 /* 文字 */
-.my_left .l_information{margin-top:30rpx;float:left;}
+.my_left .l_information{margin-top:50rpx;float:left;}
 .my_left  .l_tx{width:80rpx;height:80rpx;border-radius:6rpx;overflow:hidden;float:left;}
 .my_left .l_information text{max-width:474rpx;display:block;float:left;margin-left:20rpx;background:#FFF;border-radius:10rpx;overflow:hidden;padding:18rpx 18rpx;}
 .my_right  .l_tx{width:80rpx;height:80rpx;border-radius:6rpx;overflow:hidden;float:left;}
 
 /* 图片*/
-.my_left .l_img{margin-top:30rpx;float:left;}
+.my_left .l_img{margin-top:50rpx;float:left;}
 .my_left .l_img .l_picture{width:260rpx;float:left;margin-left:24rpx;border-radius:6rpx;max-height:260rpx;}
 
 

pages/personal_core/home/home.wxss

@@ -6,7 +6,7 @@
 .core_l_id{font-size:28rpx;margin-top:5rpx;}
 .core_style{margin-top:10rpx;}
 .core_style text{font-size:18rpx;color:#FFF;background:#F55858;margin-right:12rpx;padding:4rpx 10rpx;float:left;border-radius:6rpx;}
-.core_style  image{width:40rpx;display:block;float:left;margin-right:20rpx;}
+.core_style  image{width:40rpx;height:0;display:block;float:left;margin-right:20rpx;}
 
 .core_data{width:180rpx;height:180rpx;float:right;position:relative;border-radius:100rpx;overflow: hidden;background:#FFF;}
 

project.config.json

@@ -9,8 +9,16 @@
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
+		"coverView": true,
 		"autoAudits": false,
-		"checkInvalidKey": true
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		}
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.0",

utils/time.js

@@ -1,39 +1,141 @@
-let now = new Date();
-let year = now.getFullYear();
-let month = now.getMonth();//真实的月份需要再加上1
-let day = now.getDate();
-let currentTime = new Date();
-
-function dealChatTime(currentItemTimeStamp, frontItemTimeStamp) {
-    let ifShowTime = timeDivide(currentItemTimeStamp, frontItemTimeStamp);
-    return justSimpleDealTime(currentItemTimeStamp, ifShowTime);
-}
 
-function timeDivide(currentItemTimeStamp, frontItemTimeStamp) {
-    // console.log('时间戳显示时间', currentItemTimeStamp, frontItemTimeStamp);
-    return Math.abs(currentItemTimeStamp - frontItemTimeStamp) / 1000 > 300
-}
 
-function justSimpleDealTime(currentItemTimeStamp, ifShowTime) {
-    currentTime.setTime(currentItemTimeStamp);
-    let hoursAndMinutes = currentTime.getHours() + ':' + (currentTime.getMinutes() >= 10 ? currentTime.getMinutes() : ('0' + currentTime.getMinutes()));
-    let currentTimeDay = currentTime.getDate();
-    if (currentTime.getFullYear() === year && currentTime.getMonth() === month) {
-        if (currentTimeDay === day) {//当天显示时分
-            return {//5分钟内发送多条消息时不重复显示时间标签,大于5分钟显示时间标签
-                ifShowTime: ifShowTime,
-                timeStr: hoursAndMinutes
-            };
-        } else if (currentTimeDay === day - 1) {//昨天：昨天+时分（24小时制）
-            return {ifShowTime: ifShowTime, timeStr: '昨天 ' + hoursAndMinutes}
-        }
+function TimeFormatting(dateTimeStamp) {
+  var result;
+  var minute = 1000 * 60;
+  var hour = minute * 60;
+  var day = hour * 24;
+  var halfamonth = day * 15;
+  var month = day * 30;
+  var now = new Date();  //当前时间
+  // console.log('now', now);
+
+  var digit = String(dateTimeStamp).length;
+  if (digit == '10') {
+    var curTime = new Date(parseInt(dateTimeStamp) * 1000); //后端返回的是秒数      过去时间
+  } else {
+    var curTime = new Date(parseInt(dateTimeStamp)); //后端返回的是秒数      过去时间
+  }
+
+
+  // console.log('curTime',curTime);
+
+
+  var _year = now.getFullYear();   // 年
+  var _month = now.getMonth() + 1;  //月
+  var _day = now.getDate();   //日
+
+  var shitime = _year + '-' + _month + '-' + _day + ' 23:59:59';
+  // console.log(shitime);
+
+  var time_start = new Date(shitime.replace(/-/g, '/'));
+
+  time_start.getTime();
+
+  var diffValue = time_start.getTime() - curTime;
+
+  // 过去时间和现在时间对比  相差多少天
+  var CutOffDays = parseInt(diffValue / day);
+
+
+  var Now_hour = now.getHours();      //当前 小时数
+  var Now_mm = now.getMinutes();   //当前 分  
+  var Current_hour = curTime.getHours();       //过去 小时数
+  var Current_mm = curTime.getMinutes();     //过去 分  
+
+  var Differhour = Now_hour - Current_hour     //过去时间和现在时间相差小时
+  var DifferMinute = Now_mm - Current_mm     //过去时间和现在时间相差分钟
+
+  // console.log(Differhour)
+  // console.log(DifferMinute)
+
+
+  var timestr = '';
+  if (Current_hour < 11) {
+    timestr = " 早上 ";
+  }
+  else if (Current_hour < 13) {
+    timestr = " 中午 ";
+  }
+  else if (Current_hour < 17) {
+    timestr = " 下午 ";
+  }
+  else if (Current_hour < 19) {
+    timestr = " 晚上 ";
+  }
+  else {
+    timestr = " 晚上 ";
+  }
+
+  // 日
+  var currentTimeDay = curTime.getDate();
+
+  //历史记录年月日
+  var SpecificDate = curTime.getFullYear() + '年' + (curTime.getMonth() + 1) + '月' + currentTimeDay + '日 ';
+  //  console.log(SpecificDate);
+
+  //历史记录时间
+  var Historicaltime = curTime.getHours() + ':' + (curTime.getMinutes() >= 10 ? curTime.getMinutes() : ('0' + curTime.getMinutes()));
+  // console.log(Historicaltime);
+
+  var weekTime = (new Date(curTime)).getDay();    //星期   工作日
+  // console.log(weekTime);
+  var week = "";
+
+
+  // console.log(CutOffDays, '2222');
+
+  if (CutOffDays > 7) {   // 消息超过 7天    显示日期
+
+    result = SpecificDate + timestr + Historicaltime;
+
+  } else if (CutOffDays < 1) {    // 消息小于 1天   
+   
+      result = timestr + Historicaltime;
+
+  } else if (CutOffDays >= 1 && CutOffDays < 2) {   // 消息大于 1天   并且   小于 2天  显示昨天  
+
+    result = '昨天' + timestr + Historicaltime;
+
+  } else if (CutOffDays >= 2 && CutOffDays <= 7) {  // 消息大于 2天   并且   小于 7天  显示星期
+    // console.log(weekTime);
+    switch (weekTime) {
+      case 0:
+        week = '星期日'
+        break;
+      case 1:
+        week = '星期一'
+        break;
+      case 2:
+        week = '星期二'
+        break;
+      case 3:
+        week = '星期三'
+        break;
+      case 4:
+        week = '星期四'
+        break;
+      case 5:
+        week = '星期五'
+        break;
+      case 6:
+        week = '星期六'
+        break;
     }
-    return {
-        ifShowTime: ifShowTime,
-        timeStr: currentTime.getFullYear() + '年' + (currentTime.getMonth() + 1) + '月' + currentTimeDay + '日 ' + hoursAndMinutes
-    };
+
+    result = week + timestr + Historicaltime;
+
+  }
+
+
+
+
+  // console.log(result);
+  return result;
 }
 
+
+//最下面一定要加上你自定义的方法（作用：将模块接口暴露出来），否则会报错：util.trim is not a function;
 module.exports = {
-    dealChatTime
-};
+  TimeFormatting: TimeFormatting,
+}