wangyu / naturalPersonTax · 提交

提交 a4d46706dbd0a6f2ca0f08ea5c7706d52f167603

作者 wangyu
2 个父辈 6b67b292 a3070a0d
构建： 未知

Merge branch 'dev_wy' into dev_无非居民

内嵌 并排对比
正在显示 4 个修改的文件 包含 7 行增加 和 7 行删除
@@ -146,8 +146,8 @@ App({ @@ -146,8 +146,8 @@ App({
146 // baseUrl: "http://47.96.75.229:20000/", 146 // baseUrl: "http://47.96.75.229:20000/",
147 // baseUrl: "http://192.144.144.220:20000/", 147 // baseUrl: "http://192.144.144.220:20000/",
148 // baseUrl: "http://154.8.229.55:20000/", 148 // baseUrl: "http://154.8.229.55:20000/",
149 - // baseUrl: "http://47.110.250.177:20000/",  
150 - baseUrl: "http://47.110.158.110:20000/", 149 + baseUrl: "http://47.110.250.177:20000/",
  150 + // baseUrl: "http://47.110.158.110:20000/",
151 // baseUrl: "https://api.workai.com.cn/", 151 // baseUrl: "https://api.workai.com.cn/",
152 OSSUrl: "", //"https://oss.workai.com.cn/", 152 OSSUrl: "", //"https://oss.workai.com.cn/",
153 userInfo: null, 153 userInfo: null,
@@ -37,7 +37,7 @@ Page({ @@ -37,7 +37,7 @@ Page({
37 name: curdata.co_supporter, 37 name: curdata.co_supporter,
38 id_card_no: curdata.id_card_no, 38 id_card_no: curdata.id_card_no,
39 birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "", 39 birthday: curdata.birthday ? this.formatDate(curdata.birthday) : "",
40 - birthday_datelong: Date.parse(new Date(curdata.birthday)) / 1000 40 + birthday_datelong: curdata.birthday
41 }) 41 })
42 } 42 }
43 43
@@ -32,10 +32,10 @@ @@ -32,10 +32,10 @@
32 <text class='text_left'>分配比例</text> 32 <text class='text_left'>分配比例</text>
33 <text class='text_right_333'>{{datas.percent}}%</text> 33 <text class='text_right_333'>{{datas.percent}}%</text>
34 </view> 34 </view>
35 - <view style='height:90rpx;width:100%;clear:both;'> 35 + <!-- <view style='height:90rpx;width:100%;clear:both;'>
36 <text class='text_left'>子女学籍号</text> 36 <text class='text_left'>子女学籍号</text>
37 <text class='text_right_333'>{{datas.student_no}}</text> 37 <text class='text_right_333'>{{datas.student_no}}</text>
38 - </view> 38 + </view> -->
39 <view style='height:90rpx;width:100%;clear:both;'> 39 <view style='height:90rpx;width:100%;clear:both;'>
40 <text class='text_left'>子女受教育阶段</text> 40 <text class='text_left'>子女受教育阶段</text>
41 <text class='text_right_333'>{{datas.education_period}}</text> 41 <text class='text_right_333'>{{datas.education_period}}</text>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text> 20 <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
21 </view> --> 21 </view> -->
22 <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'> 22 <view wx:if="{{cur_status=='support_duty'}}" style='padding-right:30rpx;background:#FFF'>
23 - <template is="picker_cell_normal" data="{{...issinglechildData}}" /> 23 + <template wx:if="{{employee_status!='inactive'}}" is="picker_cell_normal" data="{{...issinglechildData}}" />
24 <view wx:if="{{issinglechildData.selected=='否'}}"> 24 <view wx:if="{{issinglechildData.selected=='否'}}">
25 <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view> 25 <view style='background:#f5f5f5;height:2rpx;margin-left:30rpx;'></view>
26 <template is="picker_cell_normal" data="{{...shareMethodData}}" /> 26 <template is="picker_cell_normal" data="{{...shareMethodData}}" />
@@ -376,7 +376,7 @@ @@ -376,7 +376,7 @@
376 </view> 376 </view>
377 </view> 377 </view>
378 </view> 378 </view>
379 - <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)}}"> 379 + <view wx:if="{{!additionInfo||additionInfo.length<1||(additionInfo[0].profession_items.length<1&&additionInfo[0].title_items.length<1)||(!additionInfo[0].support_duties||additionInfo[0].support_duties.length<1)}}">
380 <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image> 380 <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
381 </view> 381 </view>
382 </view> 382 </view>
请 注册 或 登录 后发表评论