Merge branch 'dev_无非居民' into dev2.0

# Conflicts:
#	images/guide_bg.png

@@ -63,7 +63,7 @@
                 <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
                 <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
               </view>
-              <view style='height:70rpx'> 
+              <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'>{{item.percent}}%</text>
               </view>
@@ -249,7 +249,7 @@
                     <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
                     <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{itemdetail.relationship}}</text>
                   </view>
-                  <view class='float_right' wx:if="{{employee_status!='inactive'}}">
+                  <view class='float_right' wx:if="{{employee_status!='inactive'&&(item.status=='failed'||item.status=='to_declare')}}">
                     <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id="{{'co_supporter'+index}}" bindtap='godelete'>删除</text>
                     <text class='text_blue_28 ' style='line-height:90rpx;' id="{{'co_supporter'+index}}" bindtap='goedit'>编辑</text>
                   </view>
@@ -278,7 +278,7 @@
           <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
           <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
         </view>
-        <view class='divide_line_f5f5f5' ></view>
+        <view class='divide_line_f5f5f5'></view>
         <view wx:for="{{additionInfo}}">
           <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
@@ -339,7 +339,7 @@
               <view wx:if="{{item.status=='success'}}" class='declare_style blue_bg'> {{declareStatus[item.status]}}</view>
               <view wx:else class='declare_style orange_bg'> {{declareStatus[item.status]}}</view>
             </view>
-            <view style='padding-right: 30rpx' >
+            <view style='padding-right: 30rpx'>
               <view class='divide_line_f5f5f5' style="margin-bottom:6rpx"></view>
               <view style='display:flex;flex-direction:row'>
                 <view wx:if="{{house_type=='house_fund_rent'}}">
@@ -382,29 +382,29 @@
   </view>
 
   <!-- <view class='bottom_btn_wrap' hidden="{{additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}"> -->
-  <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}" >
+  <view class='bottom_btn_wrap' wx:if="{{btn_show&&employee_status!='inactive'}}">
     <view class='btn_blue_radius' bindtap="goadd">
       <view class='text_white_34'>添加</view>
     </view>
   </view>
 
   <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
-<!-- 申报说明 -->
-<view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
-  <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
-  <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
-  <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
-  <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
-  <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
-    <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
+  <!-- 申报说明 -->
+  <view style='top:200rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
+    <image wx:if="{{cur_status!='house_fund'}}" class='modal_img' src="{{modal_images[cur_status]}}"></image>
+    <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_rent'}}" class='modal_img02' src="/images/house_declare_rent.png"></image>
+    <image wx:if="{{cur_status=='house_fund'&&house_type=='house_fund_loan'}}" class='modal_img' src="/images/house_declare_loan.png"></image>
+    <!-- <text style='position:absolute;font-size:20px;color:#fff;float:right;top:0;right:100rpx' bindtap='closeModalImg'>x</text> -->
+    <view style='width:80rpx;height:80rpx;position:absolute;float:right;top:0;right:0;display:flex;align-items:center;justify-content:center;' bindtap='closeModalImg'>
+      <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
+    </view>
   </view>
-</view>
 
-<!-- 扣除类型 -->
-<view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
-  <text class='text_modal_title'>请选择扣除方式</text>
-  <view class='divide_line_f5f5f5'></view>
-  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+  <!-- 扣除类型 -->
+  <view class='modal_lg' style='' wx:if="{{showModal_reducetype}}">
+    <text class='text_modal_title'>请选择扣除方式</text>
+    <view class='divide_line_f5f5f5'></view>
+    <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
     <view wx:for="{{reducetypeData}}" wx:for-index="idx">
       <view wx:if="{{selected_reduceindex==idx}}">
         <text class='text_item_blue float_left'>{{item}}</text>
@@ -416,32 +416,32 @@
       <view class='divide_line_f5f5f5'></view>
     </view>
   </view> -->
-  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
-    <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
-      <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
-        <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='display:flex'>
-        <text class='text_item_black float_left'>{{item}}</text>
+    <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
+      <view wx:for="{{reducetypeData}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+        <view wx:if="{{idx==selected_reduceindex}}" style='display:flex;flex-direction:row;'>
+          <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='display:flex'>
+          <text class='text_item_black float_left'>{{item}}</text>
+        </view>
+        <view class='divide_line_f5f5f5'></view>
       </view>
-      <view class='divide_line_f5f5f5'></view>
     </view>
-  </view>
-  <view class='divide_line_f5f5f5'></view>
+    <view class='divide_line_f5f5f5'></view>
 
-  <view style='width:100%;display: flex;'>
-    <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
-    <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
+    <view style='width:100%;display: flex;'>
+      <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
+      <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
+      <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
+    </view>
   </view>
-</view>
 
-<!--  添加子女 老人 大病-->
-<view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
-  <text class='text_modal_title'>{{modalData.title}}</text>
-  <view class='divide_line_f5f5f5'></view>
-  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
+  <!--  添加子女 老人 大病-->
+  <view class='modal_lg' style='' wx:if="{{showModal_addtype}}">
+    <text class='text_modal_title'>{{modalData.title}}</text>
+    <view class='divide_line_f5f5f5'></view>
+    <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;'>
     <block wx:for="{{modalData.datas}}" wx:for-index="idx">
       <view wx:if="{{idx==selected_addindex}}">
         <text class='text_item_blue float_left'>{{item.name}}</text>
@@ -453,26 +453,24 @@
       <view class='divide_line_f5f5f5'></view>
     </block>
   </view> -->
-  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
-    <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
-      <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
-        <text class='text_item_blue float_left'>{{item.name}}</text>
-        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
-      </view>
-      <view wx:else style='display:flex'>
-        <text class='text_item_black float_left'>{{item.name}}</text>
+    <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
+      <view wx:for="{{modalData.datas}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+        <view wx:if="{{idx==selected_addindex}}" style='display:flex;flex-direction:row;'>
+          <text class='text_item_blue float_left'>{{item.name}}</text>
+          <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+        </view>
+        <view wx:else style='display:flex'>
+          <text class='text_item_black float_left'>{{item.name}}</text>
+        </view>
+        <view class='divide_line_f5f5f5'></view>
       </view>
-      <view class='divide_line_f5f5f5'></view>
+    </view>
+    <view class='divide_line_f5f5f5'></view>
+    <view style='width:100%;display: flex;'>
+      <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
+      <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
+      <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
     </view>
   </view>
-  <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display: flex;'>
-    <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
-    <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
-  </view>
-</view>
-
-</view>
-
 
+</view>
\ No newline at end of file

@@ -60,4 +60,4 @@
   
   <image class='chat-img' bindtap='gochat' src='/images/icon_chat.png'></image>
 
-</view>
\ No newline at end of file
+</view>

@@ -33,8 +33,8 @@
 }
 
 .icon_wrap {
-  width: 112rpx;
-  height: 102rpx;
+  width: 102rpx;
+  height: 96rpx;
   align-self: center;
 }