Merge branch 'dev2.0' into dev_py

@@ -391,7 +391,7 @@ Page({
         if (data.items[i].family_ties == '子' || data.items[i].family_ties == '女') {
           childRelativelist.push(data.items[i])
         }
-        if (data.items[i].family_ties == '父母' || data.items[i].family_ties == '祖父母' || data.items[i].family_ties == '外祖父母') {
+        if (data.items[i].family_ties == '父母' || data.items[i].family_ties == '祖父母、外祖父母') {
           olderRelativelist.push(data.items[i])
         } else {
           medicalRelativelist.push(data.items[i])

@@ -328,12 +328,12 @@
               <view wx:if="{{house_type=='house_fund_rent'}}">
                 <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
+                <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
               </view>
               <view wx:if="{{house_type=='house_fund_loan'}}">
                 <text class='text_999_28 ' style='line-height:70rpx'>房屋坐落地址：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_address_new}}</text>
-                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
+                <text class='text_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
               </view>
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>

@@ -32,7 +32,7 @@
 }
 
 .icon_wrap{
-  width: 104rpx;
+  width: 112rpx;
   height: 102rpx;
   align-self: center
 }

@@ -9,7 +9,7 @@ Page({
   data: {
     showModal: false,
     inputValue: "",
-    comlist: "",
+    comlist: ["DDD","SSS","AAA","QQQ","ZZZ"],
     com_id: "",
     choosed_index: 0,
     chatlist: []
@@ -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,13 +31,13 @@
 <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>
         <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
       </view>
-      <view wx:else style='padding:30rpx;display:flex;' >
+      <view wx:else style='padding:30rpx ;display:flex;' >
         <text class='text_item_black float_left' >{{item.name}}</text>
       </view>
       <view class='divide_line_f5f5f5'></view>

@@ -15,7 +15,7 @@
 .modal_lg {
   width: 72%;
   position: fixed;
-  top: 120px;
+  /* top: 120px; */
   left: 0;
   right: 0;
   margin: 0 auto;
@@ -51,13 +51,10 @@
   letter-spacing: 0;
   line-height: 18px;
   width: 500rpx;
-
-  text-align:center;
-  overflow:hidden;
-text-overflow:ellipsis;
-white-space:nowrap;
-
-
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .text_item_black {
@@ -67,11 +64,10 @@ white-space:nowrap;
   letter-spacing: 0;
   line-height: 18px;
   width: 500rpx;
-
-    text-align:center;
-  overflow:hidden;
-text-overflow:ellipsis;
-white-space:nowrap;
+  text-align: center;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .text_cancel {
@@ -94,10 +90,10 @@ white-space:nowrap;
   flex: 1;
 }
 
-.picker_wrap{
-position: fixed;
+.picker_wrap {
+  position: fixed;
   bottom: 0rpx;
-  background:#fff;
+  background: #fff;
 }
 
 /* 聊天页面 */
@@ -121,7 +117,7 @@ position: fixed;
   margin-top: 20rpx;
   margin-bottom: 20rpx;
   margin-right: 30rpx;
-    color: #fff;
+  color: #fff;
   font-size: 32rpx;
   text-align: center;
   line-height: 80rpx;
@@ -152,7 +148,7 @@ position: fixed;
   font-size: 14px;
   color: #4a4a4a;
   letter-spacing: 0;
-  word-break:break-all;
+  word-break: break-all;
 }
 
 .send_bg {
@@ -166,9 +162,9 @@ position: fixed;
 .text_send_wrap {
   font-family: PingFangSC-Regular;
   font-size: 14px;
-  color: #4a4a4a;
+  color: #fff;
   letter-spacing: 0;
-  word-break:break-all;
+  word-break: break-all;
 }
 
 .input_placeholder_wrap {