优化编辑功能数据转换

@@ -16,6 +16,7 @@ Page({
     person_total_amount: 0,
     person_total_amount: 0,
     remaining_amount: 0,
     remaining_amount: 0,
     input_disable: false,
     input_disable: false,
+    origindata: {},
     declareStatus: {
     declareStatus: {
       "to_declare": "待申报",
       "to_declare": "待申报",
       "declaring": "申报中",
       "declaring": "申报中",
@@ -304,6 +305,7 @@ Page({
         reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
         reduce_amount: data.month_deduction_amount ? data.month_deduction_amount : 0,
         input_disable: true,
         input_disable: true,
 
 
+        origindata: data,
         handle_finished: true,
         handle_finished: true,
         person_total_amount: data.person_total_amount ? data.person_total_amount : 0,
         person_total_amount: data.person_total_amount ? data.person_total_amount : 0,
         remaining_amount: data.remaining_amount ? data.remaining_amount : 0,
         remaining_amount: data.remaining_amount ? data.remaining_amount : 0,
@@ -311,8 +313,9 @@ Page({
       })
       })
       console.log("newdata", newdata)
       console.log("newdata", newdata)
       wx.hideLoading()
       wx.hideLoading()
-    }else{
+    } else {
       this.setData({
       this.setData({
+        origindata: data,
         additionInfo: newdata
         additionInfo: newdata
       })
       })
     }
     }
@@ -320,7 +323,7 @@ Page({
 
 
   goaddSupporter: function() {
   goaddSupporter: function() {
     wx.navigateTo({
     wx.navigateTo({
-      url: '../adddupporters/adddupporters?id='+this.data.legal_entity_id,
+      url: '../adddupporters/adddupporters?id=' + this.data.legal_entity_id,
     })
     })
 
 
   },
   },
@@ -397,33 +400,32 @@ Page({
 
 
   goedit: function(e) { //编辑
   goedit: function(e) { //编辑
     console.log("goedit", e)
     console.log("goedit", e)
+    var oridata = this.data.origindata.items
     var new_info
     var new_info
     if (this.data.cur_status == "continuing_education") {
     if (this.data.cur_status == "continuing_education") {
       if (e.currentTarget.id.indexOf('title') != -1) {
       if (e.currentTarget.id.indexOf('title') != -1) {
-        new_info = this.data.additionInfo[0].title_items[e.currentTarget.id.replace('title', '')]
+        new_info = oridata[0].title_items[e.currentTarget.id.replace('title', '')]
       }
       }
       if (e.currentTarget.id.indexOf('profession') != -1) {
       if (e.currentTarget.id.indexOf('profession') != -1) {
-        new_info = this.data.additionInfo[0].profession_items[e.currentTarget.id.replace('profession', '')]
+        new_info = oridata[0].profession_items[e.currentTarget.id.replace('profession', '')]
       }
       }
     } else if (this.data.cur_status == "support_duty") {
     } else if (this.data.cur_status == "support_duty") {
       if (e.currentTarget.id.indexOf('support_duty') != -1) {
       if (e.currentTarget.id.indexOf('support_duty') != -1) {
-        new_info = this.data.additionInfo[0].support_duties[e.currentTarget.id.replace('support_duty', '')]
+        new_info = oridata[0].support_duties[e.currentTarget.id.replace('support_duty', '')]
       }
       }
       if (e.currentTarget.id.indexOf('co_supporter') != -1) {
       if (e.currentTarget.id.indexOf('co_supporter') != -1) {
-        new_info = this.data.additionInfo[0].co_supporters[e.currentTarget.id.replace('co_supporter', '')]
+        new_info = oridata[0].co_supporters[e.currentTarget.id.replace('co_supporter', '')]
         wx.navigateTo({
         wx.navigateTo({
-          url: '../adddupporters/adddupporters?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + "&id="+this.data.legal_entity_id ,
+          url: '../adddupporters/adddupporters?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + "&id=" + this.data.legal_entity_id,
         })
         })
         return;
         return;
       }
       }
     } else {
     } else {
-      new_info = this.data.additionInfo[e.currentTarget.id]
-    }
-    if (this.data.additionInfo && this.data.additionInfo.length > 0) {
-      wx.navigateTo({
-        url: '../addextrainfo/addextrainfo?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
-      })
+      new_info = oridata[e.currentTarget.id]
     }
     }
+    wx.navigateTo({
+      url: '../addextrainfo/addextrainfo?datas=' + JSON.stringify(new_info) + '&status=' + this.data.cur_status + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex] + '&isedit=true',
+    })
   },
   },
 
 
   goadd: function(e) { //添加
   goadd: function(e) { //添加

@@ -110,14 +110,14 @@ Page({
             chatlist: that.data.chatlist
             chatlist: that.data.chatlist
           })
           })
           console.log("chatlist", that.data.chatlist)
           console.log("chatlist", that.data.chatlist)
-          wx.pageScrollTo({
-            scrollTop: 20000,
-            duration: 300
-          })
+          // wx.pageScrollTo({
+          //   scrollTop: 999999,
+          //   duration: 300
+          // })
           // that.getChatinfo()
           // that.getChatinfo()
-          // setTimeout(function(){
-          //   that.bottom()
-          // },400);
+          setTimeout(function(){
+            that.bottom()
+          },400);
           
           
         }
         }
       }
       }
@@ -237,7 +237,8 @@ Page({
     wx.createSelectorQuery().select('#flag').boundingClientRect(function (rect) {
     wx.createSelectorQuery().select('#flag').boundingClientRect(function (rect) {
       // 使页面滚动到底部
       // 使页面滚动到底部
       wx.pageScrollTo({
       wx.pageScrollTo({
-        scrollTop: rect.bottom
+        scrollTop: rect.height+99999,
+        duration:100
       })
       })
     }).exec()
     }).exec()
   },
   },