修改详情相关逻辑

@@ -10,7 +10,7 @@ Page({
   data: {
   data: {
     cur_status: "",
     cur_status: "",
     legal_entity_id: "",
     legal_entity_id: "",
-    legal_entity:"",
+    legal_entity: "",
     declareStatus: {
     declareStatus: {
       "to_declare ": "待申报",
       "to_declare ": "待申报",
       "declaring": "申报中",
       "declaring": "申报中",
@@ -54,20 +54,20 @@ Page({
     children_modalData: {
     children_modalData: {
       title: "请选择子女进行申报",
       title: "请选择子女进行申报",
       datas: [],
       datas: [],
-      canceltext: "添加新子女并申报",
-      confirmtext: "确定为该子女申报",
+      lefttext: "添加新子女并申报",
+      righttext: "确定为该子女申报",
     },
     },
     support_older_modalData: {
     support_older_modalData: {
       title: "请选择父母或祖父母进行申报",
       title: "请选择父母或祖父母进行申报",
       datas: [],
       datas: [],
-      canceltext: "添加被赡养人并申报",
-      confirmtext: "确定为该被赡养人申报",
+      lefttext: "添加被赡养人并申报",
+      righttext: "确定为该被赡养人申报",
     },
     },
     medical_modalData: {
     medical_modalData: {
       title: "请选择本人、配偶或子女进行大病支出申报",
       title: "请选择本人、配偶或子女进行大病支出申报",
       datas: [],
       datas: [],
-      canceltext: "添加家庭成员并申报",
-      confirmtext: "确定为该选择的人申报",
+      lefttext: "添加家庭成员并申报",
+      righttext: "确定为该选择的人申报",
     },
     },
     selected_reduceindex: 0,
     selected_reduceindex: 0,
     selected_addindex: 0
     selected_addindex: 0
@@ -205,12 +205,12 @@ Page({
       }
       }
       senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id])
       senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id])
       console.log("modalinfo", modalinfo)
       console.log("modalinfo", modalinfo)
-      if (modalinfo.datas.length < 2) {
+      if (modalinfo.datas.length > 0) {
+        this.showAddtionmodal(modalinfo)
+      } else {
         wx.navigateTo({
         wx.navigateTo({
           url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
           url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
         })
         })
-      } else {
-        this.showAddtionmodal(modalinfo)
       }
       }
     }
     }
   },
   },
@@ -311,25 +311,28 @@ Page({
     })
     })
   },
   },
 
 
-  reduce_modalCancel: function() { //modal取消(扣除类型)
+  reduce_modalLeft: function() { //modal取消(扣除类型)
     this.setData({
     this.setData({
       showModal_reducetype: false
       showModal_reducetype: false
     })
     })
   },
   },
 
 
-  reduce_modalConfirm: function() { //modal确认(扣除类型)
+  reduce_modalRight: function() { //modal确认(扣除类型)
     this.setData({
     this.setData({
       showModal_reducetype: false
       showModal_reducetype: false
     })
     })
   },
   },
 
 
-  modalCancel: function() { //modal取消(添加)
+  modalLeft: function() { //modal取消(添加)
     this.setData({
     this.setData({
       showModal_addtype: false
       showModal_addtype: false
     })
     })
+    wx.navigateTo({
+      url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + "" + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
+    })
   },
   },
 
 
-  modalConfirm: function(e) { //modal确认(添加)
+  modalRight: function(e) { //modal确认(添加)
     console.log("modalConfirm", e)
     console.log("modalConfirm", e)
     this.setData({
     this.setData({
       showModal_addtype: false
       showModal_addtype: false
@@ -337,9 +340,9 @@ Page({
     var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex])
     var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex])
     console.log("senddata", senddata)
     console.log("senddata", senddata)
     wx.navigateTo({
     wx.navigateTo({
-      url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata  + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
+      url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
     })
     })
-  
+
   },
   },
 
 
   goselect: function(e) {
   goselect: function(e) {

@@ -298,9 +298,9 @@
   <view class='divide_line_f5f5f5'></view>
   <view class='divide_line_f5f5f5'></view>
 
 
   <view style='width:100%;display: flex;'>
   <view style='width:100%;display: flex;'>
-    <text class='text_cancel' bindtap='reduce_modalCancel'>取消</text>
+    <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm' bindtap='reduce_modalConfirm'>确认</text>
+    <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
   </view>
   </view>
 </view>
 </view>
 
 
@@ -322,8 +322,8 @@
   </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
   <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display: flex;'>
   <view style='width:100%;display: flex;'>
-    <text class='text_cancel01' bindtap='modalCancel'>{{modalData.canceltext}}</text>
+    <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm01' bindtap='modalConfirm'>{{modalData.confirmtext}}</text>
+    <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
   </view>
   </view>
 </view>
 </view>