Merge branch 'dev_wy' into dev2.0

@@ -38,7 +38,7 @@ Page({
       "continuing_education": "/images/continueedu_declare.png",
       "continuing_education": "/images/continueedu_declare.png",
       "support_duty": "/images/support_older_declare.png",
       "support_duty": "/images/support_older_declare.png",
       "medical_fund": "/images/health_declare.png",
       "medical_fund": "/images/health_declare.png",
-      "house_fund": "/images/house_declare.png"
+      // "house_fund": "/images/house_declare_loan.png"
     },
     },
     showModal_img: false,
     showModal_img: false,
     showModal_reducetype: false,
     showModal_reducetype: false,

@@ -388,13 +388,12 @@
     </view>
     </view>
   </view>
   </view>
 
 
-</view>
-
-
-<view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
+  <view class="mask" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}" bindtap='closeModalImg'></view>
 <!-- 申报说明 -->
 <!-- 申报说明 -->
-<view style='top:250rpx;position:absolute;z-index:10;width:325px;right:0;left:0;margin:auto' hidden="{{!showModal_img}}">
-  <image class='modal_img' src="{{modal_images[cur_status]}}"></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> -->
   <!-- <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'>
   <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>
     <image style='width:30rpx;height:30rpx;' src='/images/close.png'></image>
@@ -472,4 +471,8 @@
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
     <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
   </view>
   </view>
-</view>
+</view>
+
+</view>
+
+

@@ -166,6 +166,13 @@ page {
   display: block;
   display: block;
 }
 }
 
 
+.modal_img02 {
+  width: 325px;
+  height: 460px;
+  margin: 0 auto;
+  display: block;
+}
+
 .modal_lg {
 .modal_lg {
   width: 72%;
   width: 72%;
   position: fixed;
   position: fixed;