wangyu / naturalPersonTax · 提交

提交 2ec40be30d1f677d70bde0077c1068610d79d307

作者 wangyu
2 个父辈 34e31775 3d8c5d24
构建： 未知

Merge branch '机器人' into 机器人dev

内嵌 并排对比
正在显示 6 个修改的文件 包含 41 行增加 和 52 行删除
@@ -111,6 +111,6 @@ @@ -111,6 +111,6 @@
111 111
112 </view> 112 </view>
113 <view wx:if="{{hascompleted&&additionlist.length<1}}" style='background:#fff;'> 113 <view wx:if="{{hascompleted&&additionlist.length<1}}" style='background:#fff;'>
114 - <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/nodeclare_img.png'></image> 114 + <image style='width:55%;height:254rpx;margin:400rpx 166rpx 0 166rpx;' src='/images/noreduce_img.png'></image>
115 </view> 115 </view>
116 </view> 116 </view>
@@ -34,11 +34,11 @@ Page({ @@ -34,11 +34,11 @@ Page({
34 this.setData({ 34 this.setData({
35 onresume:true 35 onresume:true
36 }) 36 })
37 - this.checkUserInfo() 37 + this.checkUserInfo("")
38 }, 38 },
39 39
40 //判断该雇员是否有姓名和身份证号 40 //判断该雇员是否有姓名和身份证号
41 - checkUserInfo: function() { 41 + checkUserInfo: function (skip_type) {
42 var that = this; 42 var that = this;
43 Authorization = getApp().globalData.Authorization; 43 Authorization = getApp().globalData.Authorization;
44 var real_auth_status = getApp().globalData.real_auth_status 44 var real_auth_status = getApp().globalData.real_auth_status
@@ -53,47 +53,16 @@ Page({ @@ -53,47 +53,16 @@ Page({
53 has_verify: true, 53 has_verify: true,
54 onresume: false, 54 onresume: false,
55 }) 55 })
56 - that.taxconfirm(); 56 + that.taxconfirm(skip_type);
57 } else { 57 } else {
58 that.setData({ 58 that.setData({
59 has_verify: false 59 has_verify: false
60 }) 60 })
61 } 61 }
62 - // wx.request({  
63 - // url: baseUrl + 'socialwork/v1/employees/verify',  
64 - // data: {},  
65 - // header: {  
66 - // 'content-type': 'application/json',  
67 - // "Authorization": Authorization  
68 - // },  
69 - // success: function(res) {  
70 - // if (res.statusCode && res.statusCode >= 300) {  
71 - // wx.showToast({  
72 - // title: res.data.message,  
73 - // icon: 'none',  
74 - // duration: 1000  
75 - // })  
76 - // } else {  
77 - // // that.setData({  
78 - // // has_verify: false  
79 - // // })  
80 - // if (!res.data.need_verify) { //不需要再实名认证  
81 - // that.setData({  
82 - // has_verify: true  
83 - // })  
84 - // that.taxconfirm();  
85 - // } else {  
86 - // that.setData({  
87 - // has_verify: false  
88 - // })  
89 - // }  
90 - // }  
91 - // }  
92 - // })  
93 } 62 }
94 }, 63 },
95 64
96 - taxconfirm: function() { 65 + taxconfirm: function(skip_type) {
97 var that = this; 66 var that = this;
98 Authorization = getApp().globalData.Authorization; 67 Authorization = getApp().globalData.Authorization;
99 68
@@ -111,6 +80,23 @@ Page({ @@ -111,6 +80,23 @@ Page({
111 that.setData({ 80 that.setData({
112 isshow: false 81 isshow: false
113 }) 82 })
  83 + if(skip_type=="1"){
  84 + wx.navigateTo({
  85 + url: '../taxperson/home',
  86 + })
  87 + } else if (skip_type == "2") {
  88 + wx.navigateTo({
  89 + url: '../addtionalreduce/home',
  90 + })
  91 + } else if (skip_type == "3") {
  92 + wx.navigateTo({
  93 + url: '../advancepayment/adPayHome',
  94 + })
  95 + } else if (skip_type == "4") {
  96 + wx.navigateTo({
  97 + url: '../finalpayment/home',
  98 + })
  99 + }
114 } 100 }
115 } 101 }
116 }) 102 })
@@ -134,7 +120,9 @@ Page({ @@ -134,7 +120,9 @@ Page({
134 that.setData({ 120 that.setData({
135 isshow: false 121 isshow: false
136 }) 122 })
137 - that.gotaxPerson() 123 + wx.navigateTo({
  124 + url: '../taxperson/home',
  125 + })
138 } 126 }
139 } 127 }
140 }) 128 })
@@ -144,36 +132,28 @@ Page({ @@ -144,36 +132,28 @@ Page({
144 * 自然人信息采集 132 * 自然人信息采集
145 */ 133 */
146 gotaxPerson: function() { 134 gotaxPerson: function() {
147 - wx.navigateTo({  
148 - url: '../taxperson/home',  
149 - }) 135 + this.checkUserInfo("1")
150 }, 136 },
151 137
152 /** 138 /**
153 * 专项附加扣除 139 * 专项附加扣除
154 */ 140 */
155 goAdditionalDiduction: function() { 141 goAdditionalDiduction: function() {
156 - wx.navigateTo({  
157 - url: '../addtionalreduce/home',  
158 - }) 142 + this.checkUserInfo("2")
159 }, 143 },
160 144
161 /** 145 /**
162 * 预扣预缴 146 * 预扣预缴
163 */ 147 */
164 goAdvancePayment: function() { 148 goAdvancePayment: function() {
165 - wx.navigateTo({  
166 - url: '../advancepayment/adPayHome',  
167 - }) 149 + this.checkUserInfo("3")
168 }, 150 },
169 151
170 /** 152 /**
171 * 汇算清缴 153 * 汇算清缴
172 */ 154 */
173 goFinalPayment: function() { 155 goFinalPayment: function() {
174 - wx.navigateTo({  
175 - url: '../finalpayment/home',  
176 - }) 156 + this.checkUserInfo("4")
177 }, 157 },
178 158
179 gochat: function() { 159 gochat: function() {
@@ -225,6 +205,12 @@ Page({ @@ -225,6 +205,12 @@ Page({
225 }) 205 })
226 }, 206 },
227 207
  208 + close02:function(){
  209 + this.setData({
  210 + has_verify: true
  211 + })
  212 + },
  213 +
228 /** 214 /**
229 * 生命周期函数--监听页面卸载 215 * 生命周期函数--监听页面卸载
230 */ 216 */
@@ -76,5 +76,5 @@ @@ -76,5 +76,5 @@
76 <text style='font-size:26rpx;color: #357aeb;margin-top:22rpx' bindtap='go_verify'>外籍人员信息认证</text> 76 <text style='font-size:26rpx;color: #357aeb;margin-top:22rpx' bindtap='go_verify'>外籍人员信息认证</text>
77 </view> 77 </view>
78 </view> 78 </view>
79 - 79 +<image wx:if="{{!has_verify&&onresume}}" style='width:44rpx;height:44rpx;right:0;left:0;margin:auto;margin-top:60rpx;position:absolute;z-index:10;' src="/images/close02.png" bindtap='close02'></image>
80 </view> 80 </view>
@@ -54,6 +54,7 @@ Page({ @@ -54,6 +54,7 @@ Page({
54 bindtype: 'forigner', 54 bindtype: 'forigner',
55 placeholder: '是否境外人员', 55 placeholder: '是否境外人员',
56 disabled: true, 56 disabled: true,
  57 + selected:"否",
57 values: ["否", "是"], 58 values: ["否", "是"],
58 onChange: 'onPickerSelect' 59 onChange: 'onPickerSelect'
59 }, 60 },
@@ -104,6 +104,7 @@ Page({ @@ -104,6 +104,7 @@ Page({
104 label: '纳税人类型', 104 label: '纳税人类型',
105 bindtype: 'taxpayerType', 105 bindtype: 'taxpayerType',
106 placeholder: '请选择纳税人类型', 106 placeholder: '请选择纳税人类型',
  107 + selected:"居民",
107 values: ["居民", "非居民"], 108 values: ["居民", "非居民"],
108 onChange: 'onPickerSelect' 109 onChange: 'onPickerSelect'
109 }, 110 },
@@ -113,6 +114,7 @@ Page({ @@ -113,6 +114,7 @@ Page({
113 bindtype: 'forigner', 114 bindtype: 'forigner',
114 placeholder: '请选择', 115 placeholder: '请选择',
115 disabled: true, 116 disabled: true,
  117 + selected:"否",
116 values: ["否", "是"], 118 values: ["否", "是"],
117 onChange: 'onPickerSelect' 119 onChange: 'onPickerSelect'
118 }, 120 },
@@ -752,7 +754,7 @@ Page({ @@ -752,7 +754,7 @@ Page({
752 this.data.hasOtherCard = true 754 this.data.hasOtherCard = true
753 this.data.overseas = '是' 755 this.data.overseas = '是'
754 this.data.taxpayerTypeData.disabled = false 756 this.data.taxpayerTypeData.disabled = false
755 - this.data.taxpayerTypeData.selected = '' 757 + this.data.taxpayerTypeData.selected = '非居民'
756 if ('居民身份证' == new_type || '中国护照' == new_type) { 758 if ('居民身份证' == new_type || '中国护照' == new_type) {
757 this.data.overseas = '否' 759 this.data.overseas = '否'
758 this.data.countryData.selected = '中国' 760 this.data.countryData.selected = '中国'
@@ -1420,7 +1422,7 @@ Page({ @@ -1420,7 +1422,7 @@ Page({
1420 "other_name": that.data.hasOtherCard ? that.data.other_name : '', 1422 "other_name": that.data.hasOtherCard ? that.data.other_name : '',
1421 "family_ties": '本人',//that.data.relativeData.selected, 1423 "family_ties": '本人',//that.data.relativeData.selected,
1422 "native": that.data.countryData.selected, 1424 "native": that.data.countryData.selected,
1423 - "taxpayer_type": that.data.taxpayerTypeData.selected == '居民' ? 'resident' :'non-resident', 1425 + "taxpayer_type": that.data.taxpayerTypeData.selected == '非居民' ? 'non-resident' :'resident',
1424 "is_overseas_personnel": that.data.overseas, 1426 "is_overseas_personnel": that.data.overseas,
1425 'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '', 1427 'birth_native': that.data.hasOtherCard ? that.data.birthCountryData.selected : '',
1426 "id_card_type": that.data.cardtypeData.selected, //selected_code, 1428 "id_card_type": that.data.cardtypeData.selected, //selected_code,
请 注册 或 登录 后发表评论