完善自然人相关优化

wangyu
app.js
app.json
pages/main/addinfo/addinfo.js
pages/main/addinfo/addinfo.wxml
pages/main/editinfo/editinfo.js
pages/main/editinfo/editinfo.wxml
pages/main/home/home.js
pages/main/idinfo/idinfo.js
utils/util.js
--- a/app.js
查看文件 @4cb22f5
+++ b/app.js
查看文件 @4cb22f5
@@ -61,7 +61,7 @@ App({
         } else if (user && user.type == "1") {//注册用户
           if (relaunch) {
             wx.reLaunch({ //重新加载
-              url: '../home/home'
+              url: '../main/home/home'
               // url: '../../getPhone/getPhone'
             })
           }
--- a/app.json
查看文件 @4cb22f5
+++ b/app.json
查看文件 @4cb22f5
 {
   "pages": [
-    "pages/main/home/home",    
     "pages/getPhone/getPhone",
+    "pages/main/home/home",    
+    
     "pages/main/editinfo/editinfo",
     "pages/main/addinfo/addinfo",
     "pages/main/idinfo/idinfo",
--- a/pages/main/addinfo/addinfo.js
查看文件 @4cb22f5
+++ b/pages/main/addinfo/addinfo.js
查看文件 @4cb22f5
@@ -17,15 +17,16 @@ Page({
     isIdCard: true,
     name: '',
     card_number: '',
-    birthday:'',
-    formData:{},
-    requestBody:{},
+    birthday: '',
+    requestBody: {},
+    disabledName:false,
     relativeData: {
       isrequre: true,
       label: '关系',
       bindtype: 'relative',
-      selected:'',
+      selected: '',
+      disabled: false,
       placeholder: '请选择关系',
       values: ["子女", "配偶"],
       onChange: 'onPickerSelect'
@@ -55,7 +56,7 @@ Page({
       label: '是否境外人员',
       bindtype: 'forigner',
       selected: '否',
-      disabled:true,
+      disabled: true,
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -181,6 +182,8 @@ Page({
     contactaddressInfo: {
       label: '联系地址',
       mode: 'region',
+      address_code: ['', '', ''],
+      address_value: ['', '', ''],
       selected: '',
       placeholder: '请选择联系地址',
       onChange: 'contactAddressSelect'
@@ -188,6 +191,8 @@ Page({
     currentaddressInfo: {
       label: '居住地',
       mode: 'region',
+      address_code:['','',''],
+      address_value:['','',''],
       selected: '',
       placeholder: '请选择居住地',
       onChange: 'currentAddressSelect'
@@ -195,6 +200,8 @@ Page({
     birthaddressInfo: {
       label: '户籍所在地',
       mode: 'region',
+      address_code: ['', '', ''],
+      address_value: ['', '', ''],
       selected: '',
       placeholder: '请选择户籍所在地',
       onChange: 'birthAddressSelect'
@@ -206,7 +213,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function(options) {
     // console.log('options.id', options.id)
     // if (!options.id || options.id.length < 0) {
     //   this.setData({
@@ -219,7 +226,7 @@ Page({
     this.getbanklist()
   },
-  getpersonalTax: function (id) {
+  getpersonalTax: function(id) {
     var that = this
     var Authorization = app.globalData.Authorization;
     wx.request({
@@ -229,7 +236,7 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         console.log(res)
         that.setData({
           taxInfo: res.data,
@@ -242,7 +249,7 @@ Page({
     })
   },
-  getproffessiondata: function () {
+  getproffessiondata: function() {
     var that = this
     var Authorization = app.globalData.Authorization;
     var proffession_info = that.data.professionData
@@ -253,7 +260,7 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         console.log('proffessiondata', res.data)
         proffession_info.values = that.handleProfession(res.data.items)
         that.setData({
@@ -268,12 +275,14 @@ Page({
     console.log('proffessionData--', that.data.professionData)
   },
-  handleProfession: function (data) {
+  handleProfession: function(data) {
     var newdata = []
     var one = []
     var two = []
     var three = []
-    var oneObj = {}, twoObj = {}, threeObj = {}
+    var oneObj = {},
+      twoObj = {},
+      threeObj = {}
     if (data && data.length > 0) {
       console.log('one', one)
       data.map((d, i) => {
@@ -320,7 +329,7 @@ Page({
     return newdata
   },
-  getbanklist: function () {
+  getbanklist: function() {
     var that = this
     var Authorization = app.globalData.Authorization;
     var bank_info = that.data.bankInfo
@@ -331,14 +340,16 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         console.log(res)
-        bank_info.values = that.handleBankinfo(res.data.items)
+        if (res.data&&res.data.items&&res.data.items.length>0){
+          bank_info.values = that.handleBankinfo(res.data.items)
-        that.setData({
-          banklist: res.data.items,
-          bankInfo: bank_info
-        })
+          that.setData({
+            banklist: res.data.items,
+            bankInfo: bank_info
+          })
+        }
         console.log("bankInfo", that.data.bankInfo)
       },
       fail(res) {
@@ -347,7 +358,7 @@ Page({
     })
   },
-  handleBankinfo: function (data) {
+  handleBankinfo: function(data) {
     var bank_name = []
     for (var i = 0; i < data.length; i++) {
       bank_name.push(data[i].bank_name)
@@ -358,33 +369,46 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady: function() {
   },
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow: function() {
     var that = this
     wx.getStorage({
       key: 'id_info',
-      success: function (res) {
-        console.log(res.data)
-        var birth_day = res.data.birthday.year + '-' + res.data.birthday.month + '-' + res.data.birthday.day,
-        var cardtype_Data = that.data.cardtypeData
-        cardtype_Data.selected = res.data.id_card_number
-        that.setData({
-          name: res.data.name,
-          birthday: birth_day,
-          cardtypeData: cardtype_Data,
-          card_number: res.data.id_card_number
-        })
+      success: function(res) {
+        console.log('id_info', res.data)
+        if (res.data && res.data.id_card_number){
+          var id_info = JSON.parse(res.data)
+
+          var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day;
+          var cardtype_Data = that.data.cardtypeData
+          cardtype_Data.selected = '居民身份证'
+          var gender_Data = that.data.genderData
+          gender_Data.selected = id_info.gender
+          that.setData({
+            name: id_info.name,
+            birthday: birth_day,
+            cardtypeData: cardtype_Data,
+            genderData: gender_Data,
+            card_number: id_info.id_card_number
+          })
+        }
+      },
+    })
+    wx.removeStorage({
+      key: 'id_info',
+      success: function(res) {
+        console.log('remove_idinfo',res)
       },
     })
   },
-  span: function (e) {
+  span: function(e) {
     console.log(e)
     if ("1" == e.target.id) {
       this.setData({
@@ -401,8 +425,8 @@ Page({
     }
   },
- // =============普通单列picker选中处理==============
-  onPickerSelect: function (e) {
+  // =============普通单列picker选中处理==============
+  onPickerSelect: function(e) {
     console.log('picker发送选择改变，携带值为', e)
     switch (e.currentTarget.id) {
       case 'relative':
@@ -514,8 +538,8 @@ Page({
   },
-    // =============日期picker选中处理==============
-  birthdayChange:function(e){
+  // =============日期picker选中处理==============
+  birthdayChange: function(e) {
     var birth_date = this.data.birthDate;
     birth_date.selected = e.detail.value
     this.setData({
@@ -524,7 +548,7 @@ Page({
     })
   },
-  startChange:function(e){
+  startChange: function(e) {
     var start_date = this.data.startDate;
     start_date.selected = e.detail.value
     this.setData({
@@ -532,7 +556,7 @@ Page({
     })
   },
-  endChange: function (e) {
+  endChange: function(e) {
     var end_date = this.data.endDate;
     end_date.selected = e.detail.value
     this.setData({
@@ -542,8 +566,8 @@ Page({
   // =============地区picker选中处理==============
-  contactAddressSelect:function(e){
-    console.log('contactAddressSelect',e)
+  contactAddressSelect: function(e) {
+    console.log('contactAddressSelect', e)
     var contact_address = this.data.contactaddressInfo;
     contact_address.address_value = e.detail.value
     contact_address.address_code = e.detail.code
@@ -552,7 +576,7 @@ Page({
     })
   },
-  currentAddressSelect: function (e) {
+  currentAddressSelect: function(e) {
     console.log('currentAddressSelect', e)
     var current_address = this.data.currentaddressInfo;
     current_address.address_value = e.detail.value
@@ -562,7 +586,7 @@ Page({
     })
   },
-  birthAddressSelect: function (e) {
+  birthAddressSelect: function(e) {
     console.log('birthAddressSelect', e)
     var birth_address = this.data.birthaddressInfo;
     birth_address.address_value = e.detail.value
@@ -574,20 +598,19 @@ Page({
   // =============其他数据选中处理==============
-  getIdInfo: function (e) {
-    if (this.data.isIdCard){
+  getIdInfo: function(e) {
+    if (this.data.isIdCard) {
       wx.navigateTo({
         url: '../idinfo/idinfo',
-        success: function (res) { },
+        success: function(res) {},
       })
     }
   },
-  formSubmit: function (e) {
-    console.log("date", Date.parse(new Date(this.data.birthday))/1000)
-    
+  formSubmit: function(e) {
+    console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
+
     var formdata = e.detail.value;
-    var toast_title = ''
     console.log("formdata", formdata);
     if (formdata.name.length < 1) {
       this.showtoast('请输入姓名');
@@ -601,60 +624,45 @@ Page({
     } else if (this.data.cardtypeData.selected.length < 1) {
       this.showtoast('请选择证照类型');
       return
-    } else if (this.data.card_number.length<1||formdata.id_card_no.length < 1) {
+    } else if (this.data.isIdCard && this.data.card_number.length < 1 ) {
+      this.showtoast('请上传有效证件照片');
+      return
+    } else if (!this.data.isIdCard&&(!formdata.id_card_no || formdata.id_card_no.length < 1)) {
       this.showtoast('请输入证件号码');
       return
-    // } else if (formdata.taxpayer_no.length < 1) {
-    //   this.showtoast('请输入纳税人识别号');
-    //   return
-    // } else if (formdata.disability_no.length < 1) {
-    //   this.showtoast('请输入残疾证号');
-    //   return
-    // } else if (formdata.martyr_family_no.length < 1) {
-    //   this.showtoast('请输入烈属证号');
-    //   return
     } else if (formdata.mobile.length < 1) {
       this.showtoast('请输入联系电话');
       return
-    } else if (formdata.investInfo.selected.length < 1) {
-      this.showtoast('请输入是否股东投资者');
+    } else if (this.data.investInfo.selected.length < 1) {
+      this.showtoast('请选择是否股东投资者');
       return
-    } else if (formdata.specificIndustryInfo.selected.length < 1) {
-      this.showtoast('请输入是否特定行业');
+    } else if (this.data.specificIndustryInfo.selected.length < 1) {
+      this.showtoast('请选择是否特定行业');
       return
-    } 
+    }
+    var new_ard_num = ''
+    if (this.data.isIdCard && this.data.card_number.length > 0) {
+      new_ard_num = this.data.card_number
+    }
+    if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length >0) {
+      new_ard_num = formdata.id_card_no
+    }
     this.setData({
-      card_number: this.data.card_number.length > 0 ? this.data.card_number : formdata.id_card_no,
-      formData:formdata
+      card_number: new_ard_num,
     })
-    // else if (formdata.contact_address_detail
-    //   .length < 1) {
-    //   this.showtoast('请输入联系详细地址');
-    //   return
-    // } else if (formdata.bank_account.length < 1) {
-    //   this.showtoast('请输入银行卡号');
-    //   return
-    // } else if (formdata.email.length < 1) {
-    //   this.showtoast('请输入邮箱');
-    //   return
-    // } else if (formdata.current_address_detail.length < 1) {
-    //   this.showtoast('请输入居住详细地址');
-    //   return
-    // } else if (formdata.huji_address_detail.length < 1) {
-    //   this.showtoast('请输入户籍详细地址');
-    //   return
-    // }
-    this.goCommit();
+    this.goCommit(formdata);
   },
-  goCommit: function () {
+  goCommit: function(data) {
     var that = this
+    var formdata = data
+    console.log("form_data", formdata);
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
-      method: "GET",
+      method: "POST",
       data: {
-        "name": that.data.formdata.name,
+        "name": that.data.name.length > 0 ? that.data.name : form_data.name,
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.relativeData.selected,
@@ -670,7 +678,7 @@ Page({
           "three_level_name": "哲学研究人员"
         },
         "education": that.data.degreeData.selected,
-        "taxpayer_no": formdata.taxpayer_no,
+        "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no:'',
         "taxpayer_status": that.data.personstatusData.selected,
         "is_martyr_family": that.data.lieshuInfo.selected,
         "martyr_family_no": formdata.martyr_family_no,
@@ -710,22 +718,25 @@ Page({
         "email": formdata.email,
         "bank": that.data.bankInfo.selected,
         "bank_account": formdata.bank_account,
-        "join_date": Date.parse(new Date(that.data.startDate.selected)) / 1000,
-        "separate_date": Date.parse(new Date(that.data.endDate.selected)) / 1000,
+        "join_date": that.data.startDate.selected.length>0? Date.parse(new Date(that.data.startDate.selected)) / 1000:0,
+        "separate_date": that.data.endDate.selected.length>0?Date.parse(new Date(that.data.endDate.selected)) / 1000:0,
         "is_employee": that.data.employeeInfo.selected,
         "is_specific_profession": that.data.specificIndustryInfo.selected,
         "is_investor": that.data.investInfo.selected,
         "is_business_angel": that.data.investpersonalInfo.selected,
-        "company_equity_total": formdata.company_equity_total,
-        "personal_equity_total": formdata.personal_equity_total,
+        "company_equity_total": parseFloat(formdata.company_equity_total),
+        "personal_equity_total": parseFloat(formdata.personal_equity_total),
         "employee_no": formdata.employee_no
       },
       header: {
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function (res) {
+      success: function(res) {
         console.log(res)
+        wx.redirectTo({
+          url: '../home/home',
+        })
       },
       fail(res) {
         console.log(res)
@@ -733,7 +744,7 @@ Page({
     })
   },
-  showtoast: function (title) {
+  showtoast: function(title) {
     wx.showToast({
       title: title,
     })
@@ -742,35 +753,35 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide: function() {
   },
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload: function() {
   },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
   },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
   },
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
   }
 })
--- a/pages/main/addinfo/addinfo.wxml
查看文件 @4cb22f5
+++ b/pages/main/addinfo/addinfo.wxml
查看文件 @4cb22f5
@@ -45,7 +45,7 @@
         <view class='item_body' hidden="{{!isself}}">
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>姓名</text>
-          <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}' disabled='{{disabledName}}'></input>
         </view>
         <view class="divide_line"></view>
@@ -79,7 +79,7 @@
           <text class='text_black_28 float_left'>证照号码</text>
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png'></image>
-            <text class='text_333_28 float_right'>{{id_card_number}}</text>
+            <text class='text_333_28 float_right'>{{card_number}}</text>
           </view>
           <view wx:else>
             <input class='input_wrap float_right' placeholder='请输入证件号码' name='id_card_no'></input>
--- a/pages/main/editinfo/editinfo.js
查看文件 @4cb22f5
+++ b/pages/main/editinfo/editinfo.js
查看文件 @4cb22f5
 // pages/main//editinfo/editinfo.js
+var format = require('../../../utils/util.js');
 var app = getApp();
 var baseUrl = app.globalData.baseUrl;
 Page({
@@ -17,13 +18,17 @@ Page({
     isself: true,
     isIdCard:true,
     name: '',
-    id_card_number: '',
-
+    mobile:'',
+    card_number: '',
+    long_birth_date:0,
+    long_start_date: 0,
+    long_end_date: 0,
     relativeData: {
       isrequre: true,
       label: '关系',
       bindtype: 'relative',
       placeholder: '请选择关系',
+      selected: '',
       values: ["子女", "配偶"],
       onChange: 'onPickerSelect'
     },
@@ -32,6 +37,7 @@ Page({
       label: '纳税人状态',
       bindtype: 'personstatus',
       placeholder: '请选择纳税人状态',
+      selected: '',
       values: ["正常(在职)", "非正常"],
       onChange: 'onPickerSelect'
     },
@@ -40,6 +46,7 @@ Page({
       label: '证照类型',
       bindtype: 'cardtype',
       placeholder: '居民身份证',
+      selected: '',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往大陆通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '外国人永久居留证'
       ],
@@ -58,6 +65,7 @@ Page({
       label: '开户银行',
       bindtype: 'bank',
       placeholder: '请选择开户银行',
+      selected: '',
       onChange: 'onPickerSelect'
     },
     genderData: {
@@ -65,6 +73,7 @@ Page({
       bindtype: 'gender',
       placeholder: '请选择性别',
       values: ["男", "女"],
+      selected: '',
       onChange: 'onPickerSelect'
     },
     professionData: {
@@ -73,12 +82,14 @@ Page({
       bindtype: 'profession',
       multiIndex: [0, 0, 0],
       placeholder: '请选择职业',
+      selected: '',
       onChange: 'onPickerSelect'
     },
     degreeData: {
       label: '学历',
       bindtype: 'degree',
       placeholder: '请选择学历',
+      selected: '',
       values: ["研究生", "大学本科", '大学本科以下'],
       onChange: 'onPickerSelect'
     },
@@ -86,6 +97,7 @@ Page({
       label: '是否残疾',
       bindtype: 'disable',
       placeholder: '请选择是否残疾',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -93,6 +105,7 @@ Page({
       label: '是否烈属',
       bindtype: 'lieshu',
       placeholder: '请选择是否烈属',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -100,6 +113,7 @@ Page({
       label: '是否孤老',
       bindtype: 'lonelyolder',
       placeholder: '请选择是否孤老',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -108,6 +122,7 @@ Page({
       label: '是否股东、投资者',
       bindtype: 'invest',
       placeholder: '请选择是否股东、投资者',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -116,6 +131,7 @@ Page({
       label: '是否特定行业',
       bindtype: 'specificIndustry',
       placeholder: '请选择是否特定行业',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -123,6 +139,7 @@ Page({
       label: '是否雇员',
       bindtype: 'employee',
       placeholder: '请选择是否雇员',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -130,6 +147,7 @@ Page({
       label: '是否天使投资个人',
       bindtype: 'investpersonal',
       placeholder: '请选择是否天使投资个人',
+      selected: '',
       values: ["否", "是"],
       onChange: 'onPickerSelect'
     },
@@ -138,6 +156,7 @@ Page({
       label: '出生年月',
       bindtype: 'birthday',
       placeholder: '请选择出生日期',
+      selected: '',
       mode: "date",
       fields: "day",
       onChange: 'birthdayChange',
@@ -146,6 +165,7 @@ Page({
       label: '在职受雇日期',
       bindtype: 'startday',
       placeholder: '请选择受雇日期',
+      selected: '',
       mode: "date",
       fields: "day",
       onChange: 'startChange',
@@ -154,6 +174,7 @@ Page({
       label: '离职日期',
       bindtype: 'endday',
       placeholder: '请选择离职日期',
+      selected: '',
       mode: "date",
       fields: "day",
       onChange: 'endChange',
@@ -162,20 +183,29 @@ Page({
     contactaddressInfo: {
       label: '联系地址',
       mode: 'region',
+      address_code: ['', '', ''],
+      address_value: ['', '', ''],
+      selected: '',
       placeholder: '请选择联系地址',
-      onChange: 'onPickerSelect'
+      onChange: 'contactAddressSelect'
     },
     currentaddressInfo: {
       label: '居住地',
       mode: 'region',
+      address_code: ['', '', ''],
+      address_value: ['', '', ''],
+      selected: '',
       placeholder: '请选择居住地',
-      onChange: 'onPickerSelect'
+      onChange: 'currentAddressSelect'
     },
     birthaddressInfo: {
       label: '户籍所在地',
       mode: 'region',
+      address_code: ['', '', ''],
+      address_value: ['', '', ''],
+      selected: '',
       placeholder: '请选择户籍所在地',
-      onChange: 'onPickerSelect'
+      onChange: 'birthAddressSelect'
     },
     title:'',
     condition: false
@@ -186,17 +216,12 @@ Page({
    */
   onLoad: function(options) {
     console.log('options.id', options.id)
-    if (!options.id || options.id.length < 0) {
+    if (options.id && options.id.length > 0) {
       this.setData({
-        isself: false,
-        cur_id: ''
-      })
-    } else {
-      this.setData({
-        cur_id: options.id,
+        cur_id: options.id
       })
       this.getpersonalTax(options.id)
-    }
+    } 
     this.getproffessiondata()
     this.getbanklist()
   },
@@ -212,17 +237,76 @@ Page({
         "Authorization": Authorization
       },
       success: function(res) {
-        console.log(res)
+        console.log('taxInfo',res)
         that.setData({
           taxInfo: res.data,
           isself: res.data.family_ties ? false : true
         })
+        that.handleDatas()
       },
       fail(res) {
         console.log(res)
       }
     })
   },
+  
+  //对各参数初始赋值
+  handleDatas:function(){
+    var tax_info = this.data.taxInfo
+    this.data.name = tax_info.name
+    this.data.relativeData.selected = tax_info.family_ties
+    this.data.personstatusData.selected = tax_info.taxpayer_status
+
+    this.data.cardtypeData.selected = tax_info.id_card_type
+    this.data.card_number = tax_info.id_card_no
+    this.data.mobile = tax_info.mobile
+    this.data.investInfo.selected = tax_info.is_investor
+    this.data.specificIndustryInfo.selected = tax_info.is_specific_profession
+    //非必填
+    this.data.genderData.selected = tax_info.gender
+    this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
+    this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
+    this.data.endDate.selected = format.yearFormString(tax_info.separate_date) + '-' + format.monthFormString(tax_info.separate_date) + '-' + format.dayFormString(tax_info.separate_date)
+    this.data.degreeData.selected = tax_info.education
+    this.data.disabilityInfo.selected = tax_info.is_disability
+    this.data.lieshuInfo.selected = tax_info.is_martyr_family
+    this.data.lonelyolderInfo.selected = tax_info.is_lonely_man
+    this.data.bankInfo.selected = tax_info.bank
+    this.data.contactaddressInfo.selected = tax_info.contact_address.province + tax_info.contact_address.city + tax_info.contact_address.district 
+    this.data.currentaddressInfo.selected = tax_info.current_address.province + tax_info.current_address.city +  tax_info.current_address.district 
+    this.data.birthaddressInfo.selected = tax_info.huji_address.province  + tax_info.huji_address.city  + tax_info.huji_address.district 
+    this.data.employeeInfo.selected = tax_info.is_employee
+    this.data.investpersonalInfo.selected = tax_info.is_business_angel
+    this.setData({
+      relativeData: this.data.relativeData,
+      name:this.data.name,
+      personstatusData: this.data.personstatusData,
+      cardtypeData: this.data.cardtypeData,
+      mobile: this.data.mobile,
+      investInfo: this.data.investInfo,
+      specificIndustryInfo: this.data.specificIndustryInfo,
+      genderData: this.data.genderData,
+      
+      degreeData: this.data.degreeData,
+      disabilityInfo: this.data.disabilityInfo,
+      lieshuInfo: this.data.lieshuInfo,
+      lonelyolderInfo: this.data.lonelyolderInfo,
+      contactaddressInfo: this.data.contactaddressInfo,
+      contactaddressInfo: this.data.contactaddressInfo,
+      contactaddressInfo: this.data.contactaddressInfo,
+      employeeInfo:this.data.employeeInfo,
+      investpersonalInfo: this.data.investpersonalInfo,
+
+      long_birth_date: tax_info.birth_date,
+      birthDate: this.data.birthDate,
+      long_start_date: tax_info.join_date,
+      startDate: this.data.startDate,
+      long_end_date: tax_info.separate_date,
+      endDate: this.data.endDate,
+      card_number: this.data.card_number
+
+    })
+  },
   getproffessiondata: function() {
     var that = this
@@ -355,7 +439,7 @@ Page({
         console.log(res.data)
         that.setData({
           name: res.data.name,
-          id_card_number: res.data.id_card_number
+          card_number: res.data.card_number
         })
       },
     })
@@ -372,6 +456,7 @@ Page({
         isshow02: !this.data.isshow02
       })
     } else if ("3" == e.target.id) {
+      console.log('isshow03', this.data.isshow03)
       this.setData({
         isshow03: !this.data.isshow03
       })
@@ -487,10 +572,81 @@ Page({
           employeeInfo: employee_data
         })
         break;
+      case 'investpersonal':
+        var investpersonal_data = this.data.investpersonalInfo
+        investpersonal_data.selected = investpersonal_data.values[e.detail.value]
+        this.setData({
+          investpersonalInfo: investpersonal_data
+        })
+        break;
     }
   },
+  // =============日期picker选中处理==============
+  birthdayChange: function (e) {
+    var birth_date = this.data.birthDate;
+    birth_date.selected = e.detail.value
+    console.log('birthdayChange', Date.parse(new Date(e.detail.value)))
+    this.setData({
+      birthday: e.detail.value,
+      long_birth_date: Date.parse(new Date(e.detail.value)) / 1000,
+      birthDate: birth_date
+    })
+  },
+
+  startChange: function (e) {
+    var start_date = this.data.startDate;
+    start_date.selected = e.detail.value
+    this.setData({
+      startDate: start_date
+    })
+  },
+
+  endChange: function (e) {
+    var end_date = this.data.endDate;
+    end_date.selected = e.detail.value
+    this.setData({
+      endDate: end_date
+    })
+  },
+
+  // =============地区picker选中处理==============
+
+  contactAddressSelect: function (e) {
+    console.log('contactAddressSelect', e)
+    var contact_address = this.data.contactaddressInfo;
+    contact_address.address_value = e.detail.value
+    contact_address.address_code = e.detail.code
+    this.setData({
+      contactaddressInfo: contact_address
+    })
+  },
+
+  currentAddressSelect: function (e) {
+    console.log('currentAddressSelect', e)
+    var current_address = this.data.currentaddressInfo;
+    current_address.address_value = e.detail.value
+    current_address.address_code = e.detail.code
+    this.setData({
+      currentaddressInfo: current_address
+    })
+  },
+
+  birthAddressSelect: function (e) {
+    console.log('birthAddressSelect', e)
+    var birth_address = this.data.birthaddressInfo;
+    birth_address.address_value = e.detail.value
+    birth_address.address_code = e.detail.code
+    this.setData({
+      birthaddressInfo: birth_address
+    })
+    console.log('birthaddressInfo', this.data.birthaddressInfo)
+  },
+
+  // =============其他数据选中处理==============
+
+
   getIdInfo: function(e) {
     wx.navigateTo({
       url: '../idinfo/idinfo',
@@ -498,62 +654,69 @@ Page({
     })
   },
-  formSubmit: function(e) {
+  formSubmit: function (e) {
+    console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
+
     var formdata = e.detail.value;
-    var toast_title= ''
-    console.log("formdata", formdata);
-    if (formdata.name.length<1){
+    console.log("formdata", formdata)
+    console.log("card_number", this.data.card_number)
+    if (formdata.name.length < 1) {
       this.showtoast('请输入姓名');
       return
-    } else if (formdata.id_card_no.length < 1) {
-      this.showtoast('请输入证件号码');
+    } else if (this.data.relativeData.selected.length < 1) {
+      this.showtoast('请选择成员关系');
+      return
+    } else if (this.data.personstatusData.selected.length < 1) {
+      this.showtoast('请选择纳税人状态');
       return
-    } else if (formdata.taxpayer_no.length < 1) {
-      this.showtoast('请输入纳税人识别号');
+    } else if (this.data.cardtypeData.selected.length < 1) {
+      this.showtoast('请选择证照类型');
       return
-    } else if (formdata.disability_no.length < 1) {
-      this.showtoast('请输入残疾证号');
+    } else if (this.data.isIdCard && this.data.card_number.length < 1) {
+      this.showtoast('请上传有效证件照片');
       return
-    } else if (formdata.martyr_family_no.length < 1) {
-      this.showtoast('请输入烈属证号');
+    } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
+      this.showtoast('请输入证件号码');
       return
     } else if (formdata.mobile.length < 1) {
       this.showtoast('请输入联系电话');
       return
-    } else if (formdata.contact_address_detail
-.length < 1) {
-      this.showtoast('请输入联系详细地址');
-      return
-    } else if (formdata.bank_account.length < 1) {
-      this.showtoast('请输入银行卡号');
-      return
-    } else if (formdata.email.length < 1) {
-      this.showtoast('请输入邮箱');
-      return
-    } else if (formdata.current_address_detail.length < 1) {
-      this.showtoast('请输入居住详细地址');
+    } else if (this.data.investInfo.selected.length < 1) {
+      this.showtoast('请选择是否股东投资者');
       return
-    } else if (formdata.huji_address_detail.length < 1) {
-      this.showtoast('请输入户籍详细地址');
+    } else if (this.data.specificIndustryInfo.selected.length < 1) {
+      this.showtoast('请选择是否特定行业');
       return
     }
-    // this.goCommit();
+    var new_ard_num = ''
+    if (this.data.isIdCard && this.data.card_number.length > 0) {
+      new_ard_num = this.data.card_number
+    }
+    if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
+      new_ard_num = formdata.id_card_no
+    }
+    this.setData({
+      card_number: new_ard_num,
+    })
+    this.goCommit(formdata);
   },
-  goCommit: function() {
+  goCommit: function (data) {
     var that = this
+    var formdata = data
+    console.log("form_data", formdata);
     var Authorization = app.globalData.Authorization;
     wx.request({
-      url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
-      method: "GET",
+      url: baseUrl + 'persontax/v1/personal-taxes/'+that.data.cur_id,
+      method: "PUT",
       data: {
-        "name": "张美嘉",
-        "family_ties": "子女",
+        "name": that.data.name.length > 0 ? that.data.name : form_data.name,
+        "family_ties": that.data.relativeData.selected,
         "native": "中国",
-        "id_card_type": "身份证",
-        "id_card_no": "320302199010220011",
-        "gender": "男",
-        "birth_date": "1990_10_22",
+        "id_card_type": that.data.cardtypeData.selected,
+        "id_card_no": that.data.card_number,
+        "gender": that.data.genderData.selected,
+        "birth_date": that.data.long_birth_date,
         "profession": {
           "one_level_code": "1",
           "one_level_name": "专业技术人员",
@@ -562,63 +725,66 @@ Page({
           "three_level_code": "111",
           "three_level_name": "哲学研究人员"
         },
-        "education": "高中",
-        "taxpayer_no": "3209023812121232",
-        "taxpayer_status": "正常",
-        "is_martyr_family": "是",
-        "martyr_family_no": "无",
-        "is_disability": "是",
-        "disability_no": "无",
-        "is_lonely_man": "是",
+        "education": that.data.degreeData.selected,
+        "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
+        "taxpayer_status": that.data.personstatusData.selected,
+        "is_martyr_family": that.data.lieshuInfo.selected,
+        "martyr_family_no": formdata.martyr_family_no,
+        "is_disability": that.data.disabilityInfo.selected,
+        "disability_no": formdata.disability_no,
+        "is_lonely_man": that.data.lonelyolderInfo.selected,
         "is_overseas_personnel": "否",
-        "comment": "",
+        "comment": formdata.comment,
         "current_address": {
-          "province_code": "xxx",
-          "province": "北京市",
-          "city_code": "xxx",
-          "city": "直辖区",
-          "district_code": "xxx",
-          "district": "朝阳区"
+          "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": "望京东路8号",
+        "current_address_detail": formdata.current_address_detail,
         "huji_address": {
-          "province_code": "xxx",
-          "province": "北京市",
-          "city_code": "xxx",
-          "city": "直辖区",
-          "district_code": "xxx",
-          "district": "朝阳区"
+          "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": "望京东路8号",
-        "mobile": "13888888888",
+        "huji_address_detail": formdata.huji_address_detail,
+        "mobile": formdata.mobile,
         "contact_address": {
-          "province_code": "xxx",
-          "province": "浙江省",
-          "city_code": "xxx",
-          "city": "杭州市",
-          "district_code": "xxx",
-          "district": "滨江区"
+          "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_detail": "",
-        "email": "xxxxxx@xx",
-        "bank": "中国建设银行",
-        "bank_account": "666222111121122111",
-        "join_date": "2018年8月1日",
-        "separate_date": "2018年8月1日",
-        "is_employee": "是",
-        "is_specific_profession": "是",
-        "is_investor": "否",
-        "is_business_angel": "否",
-        "company_equity_total": "0.00",
-        "personal_equity_total": "0.00",
-        "employee_no": "XA20180801"
+        "contact_address_detail": formdata.contact_address_detail,
+        "email": formdata.email,
+        "bank": that.data.bankInfo.selected,
+        "bank_account": formdata.bank_account,
+        "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : 0,
+        "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : 0,
+        "is_employee": that.data.employeeInfo.selected,
+        "is_specific_profession": that.data.specificIndustryInfo.selected,
+        "is_investor": that.data.investInfo.selected,
+        "is_business_angel": that.data.investpersonalInfo.selected,
+        "company_equity_total": parseFloat(formdata.company_equity_total),
+        "personal_equity_total": parseFloat(formdata.personal_equity_total),
+        "employee_no": formdata.employee_no
       },
       header: {
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function(res) {
+      success: function (res) {
         console.log(res)
+        wx.redirectTo({
+          url: '../home/home',
+        })
       },
       fail(res) {
         console.log(res)
@@ -626,7 +792,7 @@ Page({
     })
   },
-  showtoast:function(title){
+  showtoast: function (title) {
     wx.showToast({
       title: title,
     })
--- a/pages/main/editinfo/editinfo.wxml
查看文件 @4cb22f5
+++ b/pages/main/editinfo/editinfo.wxml
查看文件 @4cb22f5
@@ -79,10 +79,10 @@
           <text class='text_black_28 float_left'>证照号码</text>
           <view wx:if="{{isIdCard}}">
             <image class='image_camera float_right' src='/images/camera.png'></image>
-            <text class='text_333_28 float_right'>{{id_card_number}}</text>
+            <text class='text_333_28 float_right'>{{card_number}}</text>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{id_card_number}}' name='id_card_no'></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{card_number}}' name='id_card_no'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -128,7 +128,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='taxpayer_no' type='number'></input>
+            <input class='input_wrap float_right' name='taxpayer_no' type='number' value='{{taxInfo.taxpayer_no}}'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -140,7 +140,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='disability_no' type='number'></input>
+            <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -152,7 +152,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='martyr_family_no' type='number'></input>
+            <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -182,7 +182,7 @@
         <view class='item_body'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>联系电话</text>
-          <input class='input_wrap float_right' placeholder='请填写电话' value='{{taxInfo.mobile}}' name='mobile' type='number'></input>
+          <input class='input_wrap float_right' placeholder='请填写电话' value='{{mobile}}' name='mobile' type='number'></input>
         </view>
         <!-- 非必填部分02 -->
         <view hidden='{{!isshow02}}'>
@@ -196,7 +196,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='contact_address_detail'></input>
+            <input class='input_wrap float_right' name='contact_address_detail' value='{{taxInfo.contact_address_detail}}'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -208,36 +208,36 @@
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>银行账号</text>
-            <input class='input_wrap float_right' name='bank_account'></input>
+            <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}'></input>
           </view>
           <view class="divide_line"></view>
           <view class='item_body'>
             <text class='text_666_28 float_left'>电子邮箱</text>
-            <input class='input_wrap float_right' name='email'></input>
+            <input class='input_wrap float_right' name='email' value='{{taxInfo.email}}'></input>
           </view>
           <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>居住地</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
+          <!-- <view class=' item_body '>
+            <text class='text_666_28 float_left '>居住地</text>
+            <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+            <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...currentaddressInfo}}" />
           <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'></input>
+          <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}} '></input>
           </view>
           <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>户籍所在地</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
+          <!-- <view class='item_body '>
+            <text class='text_666_28 float_left '>户籍所在地</text>
+            <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+            <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...birthaddressInfo}}" />
           <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'></input>
+          <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}} '></input>
           </view>
           <view class="divide_line"></view>
         </view>
@@ -246,92 +246,94 @@
     </view>
     <!-- 任职雇佣信息 -->
-    <view class='head_wrap' style='margin-top:20rpx' bindtap='span' id='3'>
-      <text class='head_text_wrap1'>任职雇佣信息</text>
-      <text class='head_text_wrap2'>（点击收起非必填选项）</text>
-      <view style='float:right' wx:if='{{isshow03}}'>
-        <image class='head_image_wrap_up' src='/images/arrow_up.png'></image>
+    <view class='head_wrap ' style='margin-top:20rpx ' bindtap='span' id='3'>
+      <text class='head_text_wrap1 '>任职雇佣信息</text>
+      <text class='head_text_wrap2 '>（点击收起非必填选项）</text>
+      <view style='float:right ' hidden='{{!isshow03}}'>
+        <image class='head_image_wrap_up ' src='/images/arrow_up.png '></image>
       </view>
-      <view wx:else style='float:right'>
-        <image class='head_image_wrap_down' src='/images/arrow_down.png'></image>
+      <view hidden='{{isshow03}}' style='float:right '>
+        <image class='head_image_wrap_down ' src='/images/arrow_down.png '></image>
       </view>
     </view>
-    <view class='data_list'>
-      <view class='data_item'>
-        <!-- <view class='item_body'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>是否股东、投资者</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'>是</text>
+    <view class='data_list '>
+      <view class='data_item '>
+        <!-- <view class='item_body '>
+          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left '>*</text>
+          <text class='text_black_28 float_left '>是否股东、投资者</text>
+          <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+          <text class='text_333_28 float_right '>是</text>
         </view> -->
         <template is="picker_cell_normal" data="{{...investInfo}}" />
         <view class="divide_line"></view>
-        <!-- <view class='item_body'>
-          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
-          <text class='text_black_28 float_left'>是否特定行业</text>
-          <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-          <text class='text_333_28 float_right'></text>
+        <!-- <view class='item_body '>
+          <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left '>*</text>
+          <text class='text_black_28 float_left '>是否特定行业</text>
+          <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+          <text class='text_333_28 float_right '></text>
         </view> -->
         <template is="picker_cell_normal" data="{{...specificIndustryInfo}}" />
+        <view class="divide_line"></view>
         <view hidden='{{!isshow03}}'>
           <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否雇员</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
+          <!-- <view class='item_body '>
+            <text class='text_666_28 float_left '>是否雇员</text>
+            <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+            <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...employeeInfo}}" />
           <view class="divide_line"></view>
-          <view class='item_body'>
+          <view class='item_body '>
             <text class='text_666_28 float_left'>公司股本总额</text>
-            <input class='input_wrap float_right' name='company_equity_total' type='digit'></input>
+            <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}'></input>
           </view>
           <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>在职受雇日期</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
+          <!-- <view class='item_body '>
+            <text class='text_666_28 float_left '>在职受雇日期</text>
+            <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+            <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...startDate}}" />
           <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>离职日期</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
+          <!-- <view class='item_body '>
+            <text class='text_666_28 float_left '>离职日期</text>
+            <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+            <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...endDate}}" />
+
           <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_28 float_left'>工号</text>
-            <input class='input_wrap float_right' name='employee_no' type='number'></input>
+          <view class='item_body '>
+            <text class='text_666_28 float_left '>工号</text>
+            <input class='input_wrap float_right ' name='employee_no' type='number' value='{{taxInfo.employee_no}}'></input>
           </view>
           <view class="divide_line"></view>
-          <!-- <view class='item_body'>
-            <text class='text_666_28 float_left'>是否天使投资个人</text>
-            <image class='arrow_wrap' src='/images/arrow_right.png'></image>
-            <text class='text_333_28 float_right'></text>
+          <!-- <view class='item_body '>
+            <text class='text_666_28 float_left '>是否天使投资个人</text>
+            <image class='arrow_wrap ' src='/images/arrow_right.png '></image>
+            <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
           <view class="divide_line"></view>
-          <view class='item_body'>
-            <text class='text_666_28 float_left'>个人投资总额</text>
-            <input class='input_wrap float_right' name='personal_equity_total' type='digit'></input>
+          <view class='item_body '>
+            <text class='text_666_28 float_left '>个人投资总额</text>
+            <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}'></input>
           </view>
           <view class="divide_line"></view>
         </view>
-        <view style='width:100%'>
-          <text class='text_666_28 float_left'>备注</text>
-          <input class='extra_input' value='' name='comment'></input>
+        <view style='width:100% '>
+          <text class='text_666_28 float_left '>备注</text>
+          <input class='extra_input ' value='{{taxInfo.comment}}' name='comment '></input>
         </view>
       </view>
     </view>
-    <view style='background:#e8e8e8;height:150rpx'></view>
+    <view style='background:#e8e8e8;height:150rpx '></view>
     <button class="btn_bottom" formType="submit"> 保存</button>
   </form>
--- a/pages/main/home/home.js
查看文件 @4cb22f5
+++ b/pages/main/home/home.js
查看文件 @4cb22f5
@@ -41,6 +41,9 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
+      data:{
+        'all':true
+      },
       success: function (res) {
         console.log(res.data)
         that.setData({
--- a/pages/main/idinfo/idinfo.js
查看文件 @4cb22f5
+++ b/pages/main/idinfo/idinfo.js
查看文件 @4cb22f5
@@ -187,7 +187,7 @@ Page({
           wx.showToast({
             image: "/images/warn.png",
             duration: 1000,
-            title: res.data.message?res.data.message:"数据错误"
+            title: res.data.message ? res.data.message : "数据错误"
           });
         }
         wx.hideLoading()
@@ -199,14 +199,14 @@ Page({
     })
   },
-  savedata:function(){
+  savedata: function() {
     wx.setStorage({
       key: 'id_info',
       data: JSON.stringify(this.data.idInfo),
     })
-      wx.navigateBack({
-        delta:1
-      })
+    wx.navigateBack({
+      delta: 1
+    })
   },
   /**
@@ -220,10 +220,10 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function() {
-      wx.showModal({
-        title: '',
-        content: '\n您的信息还未保存是否确认返回？\n',
-      })
+    // wx.showModal({
+    //   title: '',
+    //   content: '\n您的信息还未保存是否确认返回？\n',
+    // })
   },
   /**
--- a/utils/util.js
查看文件 @4cb22f5
+++ b/utils/util.js
查看文件 @4cb22f5
@@ -74,6 +74,5 @@ module.exports = {
   yearFormString: yearFormString,
   monthFormString: monthFormString,
   dayFormString: dayFormString,
-  udekapi: udekapi,
   isIDCardNum: isIDCardNum
 }