Merge branch 'dev_wy' into dev2.0

@@ -9,7 +9,7 @@ Page({
   data: {
     showModal: false,
     inputValue: "",
-    comlist: "",
+    comlist: ["DDD","SSS","AAA","QQQ","ZZZ"],
     com_id: "",
     choosed_index: 0,
     chatlist: []
@@ -54,7 +54,7 @@ Page({
           if (res.data.items && res.data.items.length > 0) {
             that.setData({
               showModal: true,
-              comlist: res.data.items
+              // comlist: res.data.items
             })
           }
         }
@@ -101,7 +101,7 @@ Page({
             chatlist: that.data.chatlist
           })
           console.log("chatlist", that.data.chatlist)
-          // that.getChatinfo()
+          that.getChatinfo()
         }
       }
     })
@@ -182,17 +182,14 @@ Page({
 
   bindChange: function(e) {
     console.log("goselect", e)
+    var s = e.currentTarget.id
+    // var s = e.detail.value
     this.setData({
-      com_id: this.data.comlist[e.detail.value].id,
-      choosed_index: e.detail.value
+      com_id: this.data.comlist[s].id,
+      choosed_index: s
     })
   },
 
-  bindChange:function(e){
-    console.log("bindChange", e.detail.value)
-
-  },
-
   /**
    * Lifecycle function--Called when page hide
    */

@@ -31,14 +31,14 @@
 <view class='modal_lg' hidden="{{!showModal}}">
   <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
   <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display:flex;flex-direction:column;max-height:486rpx;'>
+  <view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'>
     <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='bindChange' id="{{idx}}">
       <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;' >
-        <view class='text_item_blue float_left' >{{item.name}}</view>
+        <view class='text_item_blue float_left' >{{item}}</view>
         <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
       </view>
       <view wx:else style='padding:30rpx;display:flex;' >
-        <text class='text_item_black float_left' >{{item.name}}</text>
+        <text class='text_item_black float_left' >{{item}}</text>
       </view>
       <view class='divide_line_f5f5f5'></view>
     </view>

@@ -15,7 +15,7 @@
 .modal_lg {
   width: 72%;
   position: fixed;
-  top: 120px;
+  /* top: 120px; */
   left: 0;
   right: 0;
   margin: 0 auto;