Merge branch 'dev_wy' into dev2.0

@@ -177,7 +177,7 @@
       <view wx:if="{{datas.owner_type=='企业'}}">
         <view style='height:90rpx;width:100%;clear:both;'>
           <text class='text_left'>统一社会信用代码</text>
-          <text class='text_right_333'>{{datas.owner_id_cartd_no}}</text>
+          <text class='text_right_333'>{{datas.owner_credit_no}}</text>
         </view>
       </view>
 

@@ -20,7 +20,7 @@
       <view wx:if="{{issinglechildData.selected=='否'}}">
         <template is="picker_cell_normal" data="{{...shareMethodData}}" />
         <view class='divide_line_f5f5f5'></view>
-         <view style='height:90rpx'>
+        <view style='height:90rpx'>
           <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666'>本年度月扣除金额</text>
           <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #333;margin-left:20rpx' name='country'>/月</text>
           <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入(不超过1000)' type='digit' name='reduce_amount' bindinput='bindinput'></input>
@@ -32,7 +32,7 @@
           <text style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #666;'>本年度月扣除金额</text>
           <text class='float_right' style='line-height: 90rpx;text-align:right;font-size: 30rpx;color: #ff9f00;' name='country'>2000/月</text>
         </view>
-       
+
       </view>
     </view>
 
@@ -329,16 +329,20 @@
             </view>
             <view style='padding-right: 30rpx'>
               <view class='divide_line_f5f5f5'></view>
-              <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_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
+              <view style='display:flex;flex-direction:row'>
+                <view wx:if="{{house_type=='house_fund_rent'}}" class='text_999_28 float_left' style='line-height:70rpx;width:250rpx;'>租赁房屋坐落地址：</view>
+                <text wx:if="{{house_type=='house_fund_loan'}}" class='text_999_28 float_left' style='line-height:70rpx;width:196rpx;'>房屋坐落地址：</text>
+                <view style='display:flex;flex-direction:column'>
+                  <text class='text_333_28 text_singleline' style='line-height:70rpx;margin-left:20rpx;'>{{item.house_address_new}}多喝点收到多点收到</text>
+                  <text class='text_999_28 text_singleline' style='line-height:70rpx;margin-left:20rpx;text-align:left'>{{item.house_detail_address}}</text>
+                </view>
+
               </view>
-              <view wx:if="{{house_type=='house_fund_loan'}}">
+              <!-- <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_999_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.house_detail_address}}</text>
-              </view>
+              </view> -->
               <view style='height:70rpx'>
                 <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}度</text>
@@ -350,7 +354,7 @@
               <view class='divide_line_f5f5f5'></view>
               <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
               <view class='float_right' wx:if="{{item.status=='failed'}}">
-                <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
+                <text class='text_999_28' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
                 <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
               </view>
             </view>

@@ -11,7 +11,7 @@
   width: 40rpx;
   height: 40rpx;
   float: right;
-  margin-top:24rpx;
+  margin-top: 24rpx;
 }
 
 .text_num_wrap {
@@ -28,9 +28,9 @@
   text-align: center;
 }
 
-.btn_blue_radius{
+.btn_blue_radius {
   margin: 26rpx 30rpx;
-  background: #357AEB;
+  background: #357aeb;
   border-radius: 5px;
   height: 84rpx;
 }
@@ -86,6 +86,12 @@
   text-align: right;
 }
 
+.text_singleline {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .text_orange_28 {
   font-family: PingFangSC-Regular;
   font-size: 28rpx;
@@ -111,14 +117,14 @@
 .text_white_34 {
   font-family: PingFangSC-Regular;
   font-size: 17px;
-  color: #FFFFFF;
+  color: #fff;
   text-align: center;
   line-height: 42px;
 }
 
-.bottom_btn_wrap{
-  background: #FFFFFF;
-  box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30);
+.bottom_btn_wrap {
+  background: #fff;
+  box-shadow: 0 -2px 8px 0 rgba(208, 208, 208, 0.30);
   height: 136rpx;
   width: 100%;
   position: fixed;
@@ -136,10 +142,6 @@
   white-space: nowrap;
 }
 
-
-
-
-
 /* 遮罩层 */
 
 .mask {
@@ -199,7 +201,7 @@
   letter-spacing: 0;
   text-align: center;
   flex: 1;
-  padding: 30rpx
+  padding: 30rpx;
 }
 
 .text_confirm {
@@ -209,7 +211,7 @@
   letter-spacing: 0;
   text-align: center;
   flex: 1;
-  padding: 30rpx
+  padding: 30rpx;
 }
 
 .text_cancel01 {
@@ -219,7 +221,7 @@
   letter-spacing: 0;
   text-align: center;
   flex: 1;
-  padding: 30rpx
+  padding: 30rpx;
 }
 
 .text_confirm01 {
@@ -229,7 +231,7 @@
   letter-spacing: 0;
   text-align: center;
   flex: 1;
-  padding: 30rpx
+  padding: 30rpx;
 }
 
 .icon_choosed {
@@ -270,18 +272,17 @@
   justify-content: center;
   line-height: 48rpx;
   margin-top: 30rpx;
-  float:right;
+  float: right;
 }
 
-.orange_bg{
+.orange_bg {
   background: #f5a623;
 }
 
-.red_bg{
+.red_bg {
   background: #f56723;
 }
 
-.blue_bg{
-  background: #357AEB;
+.blue_bg {
+  background: #357aeb;
 }
-