Merge remote-tracking branch 'origin/master'

src/main/webapp/static/layer-v2.3/layim/layui/lay/pc/modules/layim.js

@@ -18,7 +18,7 @@ layui.define(['jquery', 'layer', 'laytpl', 'upload'], function(exports){
 
   //回调
   var call = {};
-  
+  var friendMap = {}
   //对外API
   var LAYIM = function(){
     this.v = v;
@@ -307,8 +307,10 @@ layui.define(['jquery', 'layer', 'laytpl', 'upload'], function(exports){
       ,type: options.type || 'get'
       ,data: options.data
       ,dataType: options.dataType || 'json'
+      ,async: false
       ,cache: false
       ,success: function(res){
+        friendMap = res.data.friend;
         res.code == 0 
           ? callback && callback(res.data||{})
         : layer.msg(res.msg || ((tips||'Error') + ': LAYIM_NOT_GET_DATA'), {