Merge branch 'release/wap-im' of http://git.yoho.cn/fe/yohobuywap-node into release/wap-im

@@ -50,7 +50,7 @@ exports.fetchImHistory = (uid, endTime, pageSize, startTime) => {
         encryptedUid: encryptedUid(uid)
     };
 
-    _.forEach({startTime, endTime}, (key, val) => {
+    _.forEach({startTime, endTime}, (val, key) => {
         val && (params[key] = val);
     });
 

@@ -392,6 +392,9 @@ var chat = {
         var chatMessage = cm.chatMessage;
         var allTypes = socketConf.recType;
 
+        //设置默认用户头像
+        cm.userHead = userAvatar;
+
         switch (cm.type) {
             case allTypes.CU_SEND:
                 viewData.from = 'customer';