提交 eec03cd1ddc41311433c1d744206b610021d9ecf

作者 wangyu
2 个父辈 ed2f5b1f 521fcb02

Merge branch 'dev_wy' into dev2.0

@@ -12,6 +12,8 @@ Page({ @@ -12,6 +12,8 @@ Page({
12 legal_entity_id: "", 12 legal_entity_id: "",
13 legal_entity: "", 13 legal_entity: "",
14 house_type: "", 14 house_type: "",
  15 + person_total_amount:0,
  16 + remaining_amount: 0,
15 declareStatus: { 17 declareStatus: {
16 "to_declare": "待申报", 18 "to_declare": "待申报",
17 "declaring": "申报中", 19 "declaring": "申报中",
@@ -222,6 +224,8 @@ Page({ @@ -222,6 +224,8 @@ Page({
222 console.log("housetype_new", housetype_new) 224 console.log("housetype_new", housetype_new)
223 this.setData({ 225 this.setData({
224 house_type: housetype_new, 226 house_type: housetype_new,
  227 + person_total_amount: data.person_total_amount ? data.person_total_amount:0,
  228 + remaining_amount: data.remaining_amount ? data.remaining_amount : 0,
225 additionInfo: newdata 229 additionInfo: newdata
226 }) 230 })
227 }, 231 },
@@ -255,12 +255,12 @@ @@ -255,12 +255,12 @@
255 <view class='divide_line_f5f5f5'></view> 255 <view class='divide_line_f5f5f5'></view>
256 <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'> 256 <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
257 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text> 257 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
258 - <text class='text_orange_28 float_right' style='line-height:100rpx'>¥10</text> 258 + <text class='text_orange_28 float_right' style='line-height:100rpx'>¥{{person_total_amount}}</text>
259 </view> 259 </view>
260 <view class='divide_line_f5f5f5'></view> 260 <view class='divide_line_f5f5f5'></view>
261 <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'> 261 <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
262 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text> 262 <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
263 - <text class='text_orange_28 float_right' style='line-height:100rpx'>¥0</text> 263 + <text class='text_orange_28 float_right' style='line-height:100rpx'>¥{{remaining_amount}}</text>
264 </view> 264 </view>
265 <view class='divide_line_f5f5f5'></view> 265 <view class='divide_line_f5f5f5'></view>
266 <view wx:for="{{additionInfo}}"> 266 <view wx:for="{{additionInfo}}">
注册登录 后发表评论