Merge branch 'dev_wy' into dev2.0

@@ -100,6 +100,7 @@ Page({
             inputValue:"",
             inputValue:"",
             chatlist: that.data.chatlist
             chatlist: that.data.chatlist
           })
           })
+          console.log("chatlist",that.data.chatlist)
           // that.getChatinfo()
           // that.getChatinfo()
         }
         }
       }
       }

@@ -36,7 +36,7 @@
         <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
         <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
       </view>
       </view>
       <view wx:else bindtap='goselect' id="{{idx}}">
       <view wx:else bindtap='goselect' id="{{idx}}">
-        <text class='text_item_black float_left' >{{item.name}}</text>
+        <text class='text_item_black float_left'>{{item.name}}</text>
       </view>
       </view>
       <view class='divide_line_f5f5f5'></view>
       <view class='divide_line_f5f5f5'></view>
     </block>
     </block>