Merge branch 'dev_wy' into dev2.0

@@ -12,6 +12,8 @@ Page({
     legal_entity_id: "",
     legal_entity: "",
     house_type: "",
+    person_total_amount:0,
+    remaining_amount: 0,
     declareStatus: {
       "to_declare": "待申报",
       "declaring": "申报中",
@@ -222,6 +224,8 @@ Page({
     console.log("housetype_new", housetype_new)
     this.setData({
       house_type: housetype_new,
+      person_total_amount: data.person_total_amount ? data.person_total_amount:0,
+      remaining_amount: data.remaining_amount ? data.remaining_amount : 0,
       additionInfo: newdata
     })
   },

@@ -255,12 +255,12 @@
         <view class='divide_line_f5f5f5'></view>
         <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
           <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'>￥10</text>
+          <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{person_total_amount}}</text>
         </view>
         <view class='divide_line_f5f5f5'></view>
         <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
           <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'>￥0</text>
+          <text class='text_orange_28 float_right' style='line-height:100rpx'>￥{{remaining_amount}}</text>
         </view>
         <view class='divide_line_f5f5f5'></view>
         <view wx:for="{{additionInfo}}">