yh

@@ -642,7 +642,7 @@ Page({
       new_card_num = formdata.id_card_no
     }
     this.setData({
-      card_number: cnew_ard_num,
+      card_number: new_card_num,
     })
     this.goCommit(formdata);
   },

@@ -3,7 +3,7 @@ var format = require('../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
-
+  
   /**
    * 页面的初始数据
    */
@@ -21,7 +21,10 @@ Page({
     name: '',
     mobile: '',
     birthday: '',
-    id_error:false,
+    id_error: false,
+    curAddress_haschanged:false,
+    birthAddress_haschanged: false,
+    contactAddress_haschanged: false,
     card_number: '',
     long_birth_date: 0,
     long_start_date: 0,
@@ -164,6 +167,7 @@ Page({
       selected: '',
       mode: "date",
       fields: "day",
+      start:'1949-01-01',
       onChange: 'birthdayChange',
     },
     startDate: {
@@ -173,6 +177,7 @@ Page({
       selected: '',
       mode: "date",
       fields: "day",
+      start: '1990-01-01',
       onChange: 'startChange',
     },
     endDate: {
@@ -182,6 +187,7 @@ Page({
       selected: '',
       mode: "date",
       fields: "day",
+      start: '2010-01-01',
       onChange: 'endChange',
     },
     // 地址选择器
@@ -233,6 +239,9 @@ Page({
 
   getpersonalTax: function(id) {
     var that = this
+    wx.showLoading({
+      title: '',
+    })
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes/' + id,
@@ -251,12 +260,19 @@ Page({
       },
       fail(res) {
         console.log(res)
+        wx.hideLoading()
+      },
+      complete() {
+        wx.hideLoading()
       }
     })
   },
 
   //对各参数初始赋值
   handleDatas: function() {
+    //todo
+    // var curdate = format.getNowFormatDate()
+    console.log('curdate', curdate)    
     var tax_info = this.data.taxInfo
     this.data.name = tax_info.name
     this.data.relativeData.selected = tax_info.family_ties
@@ -292,6 +308,7 @@ Page({
       investInfo: this.data.investInfo,
       specificIndustryInfo: this.data.specificIndustryInfo,
       genderData: this.data.genderData,
+      bankInfo: this.data.bankInfo,
 
       professionData: this.data.professionData,
       degreeData: this.data.degreeData,
@@ -310,10 +327,11 @@ Page({
       startDate: this.data.startDate,
       long_end_date: tax_info.separate_date,
       endDate: this.data.endDate,
-      isIdCard: '居民身份证' == tax_info.id_card_type?true:false,
+      isIdCard: '居民身份证' == tax_info.id_card_type ? true : false,
       card_number: this.data.card_number
 
     })
+
   },
 
   getproffessiondata: function() {
@@ -337,6 +355,9 @@ Page({
       },
       fail(res) {
         console.log(res)
+      },
+      complete() {
+        wx.hideLoading()
       }
     })
   },
@@ -418,6 +439,9 @@ Page({
       },
       fail(res) {
         console.log(res)
+      },
+      complete() {
+        wx.hideLoading()
       }
     })
   },
@@ -440,12 +464,12 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: function() {
     var that = this
     var id_error = this.data.id_error
     wx.getStorage({
       key: 'id_info',
-      success: function (res) {
+      success: function(res) {
         console.log('id_info', res.data)
         if (res.data && res.data.length > 0) {
           var id_info = JSON.parse(res.data)
@@ -483,7 +507,7 @@ Page({
     })
     wx.removeStorage({
       key: 'id_info',
-      success: function (res) {
+      success: function(res) {
         console.log('remove_idinfo', res)
       },
     })
@@ -668,18 +692,20 @@ Page({
     contact_address.address_value = e.detail.value
     contact_address.address_code = e.detail.code
     this.setData({
+      contactAddress_haschanged:true,
       contactaddressInfo: contact_address
     })
     console.log('contactaddressInfo', this.data.contactaddressInfo)
   },
 
   currentAddressSelect: function(e) {
-    // console.log('currentAddressSelect', e)
+    console.log('currentAddressSelect', e)
     var current_address = this.data.currentaddressInfo;
     current_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
     current_address.address_value = e.detail.value
     current_address.address_code = e.detail.code
     this.setData({
+      curAddress_haschanged:true,
       currentaddressInfo: current_address
     })
   },
@@ -691,6 +717,7 @@ Page({
     birth_address.address_value = e.detail.value
     birth_address.address_code = e.detail.code
     this.setData({
+      birthAddress_haschanged: true,
       birthaddressInfo: birth_address
     })
     console.log('birthaddressInfo', this.data.birthaddressInfo)
@@ -714,7 +741,7 @@ Page({
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
-    if (this.data.name&&this.data.name.length < 1 && formdata.name.length < 1) {
+    if (this.data.name && this.data.name.length < 1 && formdata.name.length < 1) {
       this.showtoast('请输入姓名');
       return
     } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
@@ -760,6 +787,9 @@ Page({
     var formdata = data
     console.log("form_data", formdata);
     var request_profession = that.getProfessionRequest()
+    var request_contact_address = that.getContactAddressRequest()
+    var request_current_address = that.getCurrentAddressRequest()
+    var request_birth_address = that.getBirthAddressRequest()
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
@@ -774,7 +804,7 @@ Page({
         "birth_date": that.data.long_birth_date,
         "profession": request_profession,
         "education": that.data.degreeData.selected,
-        "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
+        "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
         "taxpayer_status": that.data.personstatusData.selected,
         "is_martyr_family": that.data.lieshuInfo.selected,
         "martyr_family_no": formdata.martyr_family_no,
@@ -783,33 +813,12 @@ Page({
         "is_lonely_man": that.data.lonelyolderInfo.selected,
         "is_overseas_personnel": "否",
         "comment": formdata.comment,
-        "current_address": {
-          "province_code": that.data.currentaddressInfo.address_code[0],
-          "province": that.data.currentaddressInfo.address_value[0],
-          "city_code": that.data.currentaddressInfo.address_code[1],
-          "city": that.data.currentaddressInfo.address_value[1],
-          "district_code": that.data.currentaddressInfo.address_code[2],
-          "district": that.data.currentaddressInfo.address_value[2]
-        },
-        "current_address_detail": formdata.current_address_detail,
-        "huji_address": {
-          "province_code": that.data.birthaddressInfo.address_code[0],
-          "province": that.data.birthaddressInfo.address_value[0],
-          "city_code": that.data.birthaddressInfo.address_code[1],
-          "city": that.data.birthaddressInfo.address_value[1],
-          "district_code": that.data.birthaddressInfo.address_code[2],
-          "district": that.data.birthaddressInfo.address_value[2]
-        },
-        "huji_address_detail": formdata.huji_address_detail,
+        "current_address": request_current_address,
+        "current_address_detail": formdata.current_address_detail ? formdata.current_address_detail : that.data.taxInfo.current_address_detail,
+        "huji_address": request_birth_address,
+        "huji_address_detail": formdata.huji_address_detail ? formdata.huji_address_detail : that.data.taxInfo.huji_address_detail,
         "mobile": formdata.mobile,
-        "contact_address": {
-          "province_code": that.data.contactaddressInfo.address_code[0],
-          "province": that.data.contactaddressInfo.address_value[0],
-          "city_code": that.data.contactaddressInfo.address_code[1],
-          "city": that.data.contactaddressInfo.address_value[1],
-          "district_code": that.data.contactaddressInfo.address_code[2],
-          "district": that.data.contactaddressInfo.address_value[2]
-        },
+        "contact_address": request_contact_address ? request_contact_address : that.data.taxInfo.contact_address_detail,
         "contact_address_detail": formdata.contact_address_detail,
         "email": formdata.email,
         "bank": that.data.bankInfo.selected,
@@ -830,7 +839,7 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        wx.redirectTo({
+        wx.reLaunch({
           url: '../home/home',
         })
       },
@@ -859,6 +868,54 @@ Page({
     }
   },
 
+  getContactAddressRequest: function() {
+    var that = this
+    if (that.data.contactAddress_haschanged) {
+      return {
+        "province_code": that.data.contactaddressInfo.address_code[0],
+        "province": that.data.contactaddressInfo.address_value[0],
+        "city_code": that.data.contactaddressInfo.address_code[1],
+        "city": that.data.contactaddressInfo.address_value[1],
+        "district_code": that.data.contactaddressInfo.address_code[2],
+        "district": that.data.contactaddressInfo.address_value[2]
+      }
+    } else {
+      return that.data.taxInfo.contact_address
+    }
+  },
+
+  getCurrentAddressRequest: function() {
+    var that = this
+    if (that.data.curAddress_haschanged) {
+      return {
+        "province_code": that.data.currentaddressInfo.address_code[0],
+        "province": that.data.currentaddressInfo.address_value[0],
+        "city_code": that.data.currentaddressInfo.address_code[1],
+        "city": that.data.currentaddressInfo.address_value[1],
+        "district_code": that.data.currentaddressInfo.address_code[2],
+        "district": that.data.currentaddressInfo.address_value[2]
+      }
+    } else {
+      return that.data.taxInfo.current_address
+    }
+  },
+
+  getBirthAddressRequest: function() {
+    var that = this
+    if (that.data.birthAddress_haschanged) {
+      return {
+        "province_code": that.data.birthaddressInfo.address_code[0],
+        "province": that.data.birthaddressInfo.address_value[0],
+        "city_code": that.data.birthaddressInfo.address_code[1],
+        "city": that.data.birthaddressInfo.address_value[1],
+        "district_code": that.data.birthaddressInfo.address_code[2],
+        "district": that.data.birthaddressInfo.address_value[2]
+      }
+    } else {
+      return that.data.taxInfo.huji_address
+    }
+  },
+
   showtoast: function(str) {
     wx.showToast({
       title: str,

@@ -232,7 +232,7 @@
           <view class="divide_line"></view>
           <view class='item_body '>
             <text class='text_666_28 float_left '>详细地址</text>
-            <input class='input_wrap float_right ' name='current_address_detail ' value='{{taxInfo.current_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
+            <input class='input_wrap float_right ' name='current_address_detail' value='{{taxInfo.current_address_detail}}' placeholder-class='text_999_28' placeholder='请输入详细居住地址'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body '>
@@ -244,7 +244,7 @@
           <view class="divide_line"></view>
           <view class='item_body '>
             <text class='text_666_28 float_left '>详细地址</text>
-            <input class='input_wrap float_right ' name='huji_address_detail ' value='{{taxInfo.huji_address_detail}} ' placeholder-class='text_999_28' placeholder='请输入详细户籍地址'></input>
+            <input class='input_wrap float_right ' name='huji_address_detail' value='{{taxInfo.huji_address_detail}} ' placeholder-class='text_999_28' placeholder='请输入详细户籍地址'></input>
           </view>
           <view class="divide_line"></view>
         </view>

@@ -7,6 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    load_finish:false,
     text_tip: "去完善",
     taxlist: ['']
   },
@@ -15,7 +16,8 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    console.log('onLoad')
+    
   },
 
   /**
@@ -29,11 +31,16 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
+    
+    console.log('onShow')
     this.getTaxList()
   },
 
   getTaxList: function() {
     var that = this;
+    wx.showLoading({
+      title: '加载中',
+    })
     var Authorization = app.globalData.Authorization;
     console.log('Authorization', Authorization)
     if (!Authorization || Authorization.length < 10) {
@@ -60,6 +67,12 @@ Page({
       },
       fail(res) {
         console.log(res.data)
+      },
+      complete(){
+        wx.hideLoading()
+        that.setData({
+          load_finish:true
+        })
       }
     })
   },

-<view class='page'>
+<view class='page' >
 
-  <view wx:if="{{taxlist.length>0}}">
+  <view wx:if="{{taxlist.length>0}}" hidden='{{!load_finish}}'>
     <block wx:for="{{taxlist}}" wx:key="" indx='index'>
       <!-- <view class='rectangle_solid_bg' bindtap='goadd' id='{{item.id}}' >
         <view style='padding:12rpx 22rpx'>

@@ -40,6 +40,23 @@ function dayFormString(dateStr) {
   return day
 }
 
+//获取当前时间，格式YYYY-MM-DD
+function getNowFormatDate() {
+  var date = new Date();
+  var seperator1 = "-";
+  var year = date.getFullYear();
+  var month = date.getMonth() + 1;
+  var strDate = date.getDate();
+  if (month >= 1 && month <= 9) {
+    month = "0" + month;
+  }
+  if (strDate >= 0 && strDate <= 9) {
+    strDate = "0" + strDate;
+  }
+  var currentdate = year + seperator1 + month + seperator1 + strDate;
+  return currentdate;
+}
+
 /** 
   * 检验18位身份证号码（15位号码可以只检测生日是否正确即可） 
   * @author wolfchen