提交 bca1b80604a3121b944ee138634a30d259481b1b

作者 wangyu
1 个父辈 c6838b47

修改详情相关逻辑

... ... @@ -10,7 +10,7 @@ Page({
10 10 data: {
11 11 cur_status: "",
12 12 legal_entity_id: "",
13   - legal_entity:"",
  13 + legal_entity: "",
14 14 declareStatus: {
15 15 "to_declare ": "待申报",
16 16 "declaring": "申报中",
... ... @@ -54,20 +54,20 @@ Page({
54 54 children_modalData: {
55 55 title: "请选择子女进行申报",
56 56 datas: [],
57   - canceltext: "添加新子女并申报",
58   - confirmtext: "确定为该子女申报",
  57 + lefttext: "添加新子女并申报",
  58 + righttext: "确定为该子女申报",
59 59 },
60 60 support_older_modalData: {
61 61 title: "请选择父母或祖父母进行申报",
62 62 datas: [],
63   - canceltext: "添加被赡养人并申报",
64   - confirmtext: "确定为该被赡养人申报",
  63 + lefttext: "添加被赡养人并申报",
  64 + righttext: "确定为该被赡养人申报",
65 65 },
66 66 medical_modalData: {
67 67 title: "请选择本人、配偶或子女进行大病支出申报",
68 68 datas: [],
69   - canceltext: "添加家庭成员并申报",
70   - confirmtext: "确定为该选择的人申报",
  69 + lefttext: "添加家庭成员并申报",
  70 + righttext: "确定为该选择的人申报",
71 71 },
72 72 selected_reduceindex: 0,
73 73 selected_addindex: 0
... ... @@ -205,12 +205,12 @@ Page({
205 205 }
206 206 senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id])
207 207 console.log("modalinfo", modalinfo)
208   - if (modalinfo.datas.length < 2) {
  208 + if (modalinfo.datas.length > 0) {
  209 + this.showAddtionmodal(modalinfo)
  210 + } else {
209 211 wx.navigateTo({
210 212 url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
211 213 })
212   - } else {
213   - this.showAddtionmodal(modalinfo)
214 214 }
215 215 }
216 216 },
... ... @@ -311,25 +311,28 @@ Page({
311 311 })
312 312 },
313 313
314   - reduce_modalCancel: function() { //modal取消(扣除类型)
  314 + reduce_modalLeft: function() { //modal取消(扣除类型)
315 315 this.setData({
316 316 showModal_reducetype: false
317 317 })
318 318 },
319 319
320   - reduce_modalConfirm: function() { //modal确认(扣除类型)
  320 + reduce_modalRight: function() { //modal确认(扣除类型)
321 321 this.setData({
322 322 showModal_reducetype: false
323 323 })
324 324 },
325 325
326   - modalCancel: function() { //modal取消(添加)
  326 + modalLeft: function() { //modal取消(添加)
327 327 this.setData({
328 328 showModal_addtype: false
329 329 })
  330 + wx.navigateTo({
  331 + url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + "" + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
  332 + })
330 333 },
331 334
332   - modalConfirm: function(e) { //modal确认(添加)
  335 + modalRight: function(e) { //modal确认(添加)
333 336 console.log("modalConfirm", e)
334 337 this.setData({
335 338 showModal_addtype: false
... ... @@ -337,9 +340,9 @@ Page({
337 340 var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex])
338 341 console.log("senddata", senddata)
339 342 wx.navigateTo({
340   - url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
  343 + url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
341 344 })
342   -
  345 +
343 346 },
344 347
345 348 goselect: function(e) {
... ...
... ... @@ -298,9 +298,9 @@
298 298 <view class='divide_line_f5f5f5'></view>
299 299
300 300 <view style='width:100%;display: flex;'>
301   - <text class='text_cancel' bindtap='reduce_modalCancel'>取消</text>
  301 + <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
302 302 <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
303   - <text class='text_confirm' bindtap='reduce_modalConfirm'>确认</text>
  303 + <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
304 304 </view>
305 305 </view>
306 306
... ... @@ -322,8 +322,8 @@
322 322 </view>
323 323 <view class='divide_line_f5f5f5'></view>
324 324 <view style='width:100%;display: flex;'>
325   - <text class='text_cancel01' bindtap='modalCancel'>{{modalData.canceltext}}</text>
  325 + <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
326 326 <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
327   - <text class='text_confirm01' bindtap='modalConfirm'>{{modalData.confirmtext}}</text>
  327 + <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
328 328 </view>
329 329 </view>
\ No newline at end of file
... ...
注册登录 后发表评论