代码优化

@@ -61,8 +61,8 @@ App({
         } else if (user && user.type == "1") {//注册用户
           if (relaunch) {
             wx.reLaunch({ //重新加载
-              // url: '../main/home/home'
-              url: '../../getPhone/getPhone'
+              url: '../home/home'
+              // url: '../../getPhone/getPhone'
             })
           }
         }

 {
   "pages": [
-    "pages/getPhone/getPhone",
     "pages/main/home/home",    
-    
+    "pages/getPhone/getPhone",
     "pages/main/editinfo/editinfo",
     "pages/main/addinfo/addinfo",
     "pages/main/idinfo/idinfo",

@@ -10,7 +10,6 @@ Page({
     isshow01: false,
     isshow02: false,
     isshow03: false,
-    taxInfo: {},
     proffessionlist: {},
     banklist: {},
     isself: false,
@@ -19,7 +18,7 @@ Page({
     card_number: '',
     birthday: '',
     requestBody: {},
-    disabledName: false,
+    profession_index:[0,0,0],
 
     relativeData: {
       isrequre: true,
@@ -80,6 +79,7 @@ Page({
       label: '职业',
       bindtype: 'profession',
       selected: '',
+      range_key: 'label',
       placeholder: '请选择职业',
       onChange: 'onPickerSelect'
     },
@@ -213,41 +213,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    // console.log('options.id', options.id)
-    // if (!options.id || options.id.length < 0) {
-    //   this.setData({
-    //     isself: false,
-    //   })
-    // } else {
-    //   this.getpersonalTax(options.id)
-    // }
     this.getproffessiondata()
     this.getbanklist()
   },
 
-  getpersonalTax: function(id) {
-    var that = this
-    var Authorization = app.globalData.Authorization;
-    wx.request({
-      url: baseUrl + 'persontax/v1/personal-taxes/' + id,
-      method: "GET",
-      header: {
-        'content-type': 'application/json', // 默认值
-        "Authorization": Authorization
-      },
-      success: function(res) {
-        console.log(res)
-        that.setData({
-          taxInfo: res.data,
-          isself: res.data.family_ties ? false : true
-        })
-      },
-      fail(res) {
-        console.log(res)
-      }
-    })
-  },
-
   getproffessiondata: function() {
     var that = this
     var Authorization = app.globalData.Authorization;
@@ -260,8 +229,8 @@ Page({
         "Authorization": Authorization
       },
       success: function(res) {
-        console.log('proffessiondata', res.data)
         proffession_info.values = that.handleProfession(res.data.items)
+        console.log('proffession_info------', proffession_info)
         that.setData({
           proffessionlist: res.data.items,
           professionData: proffession_info
@@ -271,60 +240,10 @@ Page({
         console.log(res)
       }
     })
-    console.log('proffessionData--', that.data.professionData)
   },
 
   handleProfession: function(items) {
-    // var newdata = []
-    // var one = []
-    // var two = []
-    // var three = []
-    // var oneObj = {},
-    //   twoObj = {},
-    //   threeObj = {}
-    // if (data && data.length > 0) {
-    //   console.log('one', one)
-    //   data.map((d, i) => {
-    //     one.push(d.one_level_code) //三级联动中 第一级所有的code
-    //     two.push(d.two_level_code) //三级联动中 第二级所有的code
-    //     three.push(d.three_level_code) //三级联动中 第三级所有的code
-    //     oneObj[d.one_level_code] = {
-    //       "value": d.one_level_code,
-    //       "label": d.one_level_name,
-    //       "children": []
-    //     } //三级联动中 第一级所有的code + name
-    //     twoObj[d.two_level_code] = {
-    //       "value": d.two_level_code,
-    //       "label": d.two_level_name,
-    //       "children": []
-    //     } //三级联动中 第一级所有的code + name
-    //     threeObj[d.three_level_code] = {
-    //       "value": d.three_level_code,
-    //       "label": d.three_level_name
-    //     } //三级联动中 第一级所有的code + name
-    //     for (let b in twoObj) { //把第三级的数据的Code和第二级数据的code做判断 相等的 放到第二级的children数组中
-    //       for (let c in threeObj) {
-    //         if (b == c.slice(0, c.length - 1)) {
-    //           twoObj[b].children.push(threeObj[c])
-    //         }
-    //       }
-    //     }
-    //     for (let a in oneObj) { //把第二级的数据的Code和第二级数据的code做判断 相等的 放到第一级的children数组中
-    //       for (let b in twoObj) {
-    //         if (a == b.slice(0, b.length - 1)) {
-    //           oneObj[a].children.push(twoObj[b])
-    //         }
-    //       }
-    //     }
-    //     one = [...new Set(one)] //一级code去重
-    //     one.map((da, ind) => { //遍历 得到最终的三级联动数据
-    //       // console.log('oneObj', newdata)
-    //       newdata.push(oneObj[da])
-    //     })
-    //   })
-    // }
-    // return newdata
-
+    var new_profession_data = []
     var list = [],
       tempTwo = {},
       tempOne = {},
@@ -371,8 +290,9 @@ Page({
     for (var key in tempOne) {
       list.push(tempOne[key]);
     }
-    console.log('newdata', list)
-    return list;
+    new_profession_data = [list, list[0].children, list[0].children[0].children]
+    console.log('new_profession_data', new_profession_data)
+    return new_profession_data;
     
   },
 
@@ -526,11 +446,14 @@ Page({
         })
         break;
       case 'profession':
-        // var profession_data = this.data.professionData
-        // profession_data.selected = profession_data.values[e.detail.value]
-        // this.setData({
-        //   professionData: profession_data
-        // })
+        var profession_data = this.data.professionData
+        console.log(profession_data.values[e.detail.value[e.detail.value[0]]][0])
+        var profession_name = profession_data.values[e.detail.value[e.detail.value[0]]][0].children[e.detail.value[1]].children[e.detail.value[2]].label
+        profession_data.selected = profession_name
+        this.setData({
+          profession_index: e.detail.value,
+          professionData: profession_data
+        })
         break;
       case 'degree':
         var degree_data = this.data.degreeData
@@ -663,6 +586,9 @@ Page({
 
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
+    // var pro_index = this.data.profession_index
+    // var profession_datas = this.data.professionData.values[pro_index[pro_index[0]]][0]
+    // console.log('profession_datas', profession_datas)
 
     var formdata = e.detail.value;
     console.log("formdata", formdata);
@@ -694,15 +620,15 @@ Page({
       this.showtoast('请选择是否特定行业');
       return
     }
-    var new_ard_num = ''
+    var new_card_num = ''
     if (this.data.isIdCard && this.data.card_number.length > 0) {
-      new_ard_num = this.data.card_number
+      new_card_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
+      new_card_num = formdata.id_card_no
     }
     this.setData({
-      card_number: new_ard_num,
+      card_number: cnew_ard_num,
     })
     this.goCommit(formdata);
   },
@@ -711,6 +637,9 @@ Page({
     var that = this
     var formdata = data
     console.log("form_data", formdata);
+    var pro_index = that.data.profession_index
+    var profession_data_info = that.data.professionData.values[pro_index[pro_index[0]]][0]
+    console.log('profession_datas', profession_data_info)
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
@@ -724,12 +653,12 @@ Page({
         "gender": that.data.genderData.selected,
         "birth_date": Date.parse(new Date(this.data.birthday)) / 1000,
         "profession": {
-          "one_level_code": "1",
-          "one_level_name": "专业技术人员",
-          "two_level_code": "11",
-          "two_level_name": "科学研究人员",
-          "three_level_code": "111",
-          "three_level_name": "哲学研究人员"
+          "one_level_code": profession_data_info.value,
+          "one_level_name": profession_data_info.label,
+          "two_level_code": profession_data_info.children[pro_index[1]].value,
+          "two_level_name": profession_data_info.children[pro_index[1]].label,
+          "three_level_code": profession_data_info.children[pro_index[1]].children[pro_index[2]].value,
+          "three_level_name": profession_data_info.children[pro_index[1]].children[pro_index[2]].label
         },
         "education": that.data.degreeData.selected,
         "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',

@@ -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}}' disabled='{{disabledName}}'  placeholder-class='text_999_28'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' value=''   placeholder-class='text_999_28'></input>
         </view>
         <view class="divide_line"></view>
 
@@ -77,7 +77,7 @@
         <view class='item_body' bindtap='getIdInfo'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>证照号码</text>
-          <view wx:if="{{isIdCard}}">
+          <view wx:if="{{isIdCard}}"  >
             <image class='image_camera float_right' src='/images/camera.png'></image>
             <text class='text_333_28 float_right'>{{card_number}}</text>
           </view>

@@ -17,6 +17,7 @@ Page({
     cur_id: '',
     isself: true,
     isIdCard:true,
+    profession_haschanges:false,
     name: '',
     mobile:'',
     card_number: '',
@@ -29,6 +30,7 @@ Page({
       bindtype: 'relative',
       placeholder: '请选择关系',
       selected: '',
+      disabled: true,
       values: ["子女", "配偶"],
       onChange: 'onPickerSelect'
     },
@@ -83,6 +85,7 @@ Page({
       multiIndex: [0, 0, 0],
       placeholder: '请选择职业',
       selected: '',
+      range_key:'label',
       onChange: 'onPickerSelect'
     },
     degreeData: {
@@ -265,6 +268,7 @@ Page({
     //非必填
     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.professionData.selected = tax_info.profession.three_level_name
     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
@@ -287,6 +291,7 @@ Page({
       specificIndustryInfo: this.data.specificIndustryInfo,
       genderData: this.data.genderData,
       
+      professionData:this.data.professionData,
       degreeData: this.data.degreeData,
       disabilityInfo: this.data.disabilityInfo,
       lieshuInfo: this.data.lieshuInfo,
@@ -308,7 +313,7 @@ Page({
     })
   },
 
-  getproffessiondata: function() {
+  getproffessiondata: function () {
     var that = this
     var Authorization = app.globalData.Authorization;
     var proffession_info = that.data.professionData
@@ -319,9 +324,9 @@ Page({
         'content-type': 'application/json', // 默认值
         "Authorization": Authorization
       },
-      success: function(res) {
-        console.log('proffessiondata', res.data)
+      success: function (res) {
         proffession_info.values = that.handleProfession(res.data.items)
+        console.log('proffession_info------', proffession_info)
         that.setData({
           proffessionlist: res.data.items,
           professionData: proffession_info
@@ -331,59 +336,60 @@ Page({
         console.log(res)
       }
     })
-    console.log('proffessionData--', that.data.professionData)
   },
 
-  handleProfession: function(data) {
-    var newdata = []
-    var one = []
-    var two = []
-    var three = []
-    var oneObj={}, twoObj={}, threeObj = {}
-    if (data && data.length > 0) {
-      console.log('one',one)
-      data.map((d, i) => {
-        one.push(d.one_level_code) //三级联动中 第一级所有的code
-        two.push(d.two_level_code) //三级联动中 第二级所有的code
-        three.push(d.three_level_code) //三级联动中 第三级所有的code
-        oneObj[d.one_level_code] = {
+  handleProfession: function (items) {
+    var new_profession_data = []
+    var list = [],
+      tempTwo = {},
+      tempOne = {},
+      tempThree = {};
+    items.map((d) => {
+      if (!tempOne[d.one_level_code]) {
+        tempOne[d.one_level_code] = {
           "value": d.one_level_code,
           "label": d.one_level_name,
           "children": []
-        } //三级联动中 第一级所有的code + name
-        twoObj[d.two_level_code] = {
+        };
+      }
+      if (!tempTwo[d.two_level_code]) {
+        var districtArray = [];
+        districtArray.push({
+          "value": d.three_level_code,
+          "label": d.three_level_name,
+          "children": []
+        });
+
+        tempTwo[d.two_level_code] = {
           "value": d.two_level_code,
           "label": d.two_level_name,
-          "children": []
-        } //三级联动中 第一级所有的code + name
-        threeObj[d.three_level_code] = {
-          "value": d.three_level_code,
-          "label": d.three_level_name
-        } //三级联动中 第一级所有的code + name
-        for (let b in twoObj) { //把第三级的数据的Code和第二级数据的code做判断 相等的 放到第二级的children数组中
-          for (let c in threeObj) {
-            if (b == c.slice(0, c.length - 1)) {
-              twoObj[b].children.push(threeObj[c])
-            }
-          }
-        }
-        for (let a in oneObj) { //把第二级的数据的Code和第二级数据的code做判断 相等的 放到第一级的children数组中
-          for (let b in twoObj) {
-            if (a == b.slice(0, b.length - 1)) {
-              oneObj[a].children.push(twoObj[b])
-            }
-          }
+          "children": districtArray
+        };
+
+      } else {
+        if (!tempThree[d.three_level_code]) {
+          tempTwo[d.two_level_code].children.push({
+            "value": d.three_level_code,
+            "label": d.three_level_name,
+            "children": []
+          });
+          tempThree[d.three_level_code] = "y"
         }
-        one = [...new Set(one)] //一级code去重
-        one.map((da, ind) => { //遍历 得到最终的三级联动数据
-          // console.log('oneObj', newdata)
-          newdata.push(oneObj[da])
-        })
-      })
+      }
+    });
+    items.map((d) => {
+      if (tempTwo[d.two_level_code]) {
+        tempOne[d.one_level_code].children.push(tempTwo[d.two_level_code]);
+        tempTwo[d.two_level_code] = null;
+      }
+    });
+    for (var key in tempOne) {
+      list.push(tempOne[key]);
     }
-    console.log('newdata', newdata)
-    
-    return newdata
+    new_profession_data = [list, list[0].children, list[0].children[0].children]
+    console.log('new_profession_data', new_profession_data)
+    return new_profession_data;
+
   },
 
   getbanklist: function() {
@@ -517,11 +523,15 @@ Page({
         })
         break;
       case 'profession':
-        // var profession_data = this.data.professionData
-        // profession_data.selected = profession_data.values[e.detail.value]
-        // this.setData({
-        //   professionData: profession_data
-        // })
+        var profession_data = this.data.professionData
+        console.log(profession_data.values[e.detail.value[e.detail.value[0]]][0])
+        var profession_name = profession_data.values[e.detail.value[e.detail.value[0]]][0].children[e.detail.value[1]].children[e.detail.value[2]].label
+        profession_data.selected = profession_name
+        this.setData({
+          profession_haschanges:true,
+          profession_index: e.detail.value,
+          professionData: profession_data
+        })
         break;
       case 'degree':
         var degree_data = this.data.degreeData
@@ -652,10 +662,12 @@ Page({
 
 
   getIdInfo: function(e) {
-    wx.navigateTo({
-      url: '../idinfo/idinfo',
-      success: function(res) {},
-    })
+    if(this.data.isIdCard){
+      wx.navigateTo({
+        url: '../idinfo/idinfo',
+        success: function (res) { },
+      })
+    }
   },
 
   formSubmit: function (e) {
@@ -667,7 +679,7 @@ Page({
     if (formdata.name.length < 1) {
       this.showtoast('请输入姓名');
       return
-    } else if (this.data.relativeData.selected.length < 1) {
+    } else if (!this.data.isself&&this.data.relativeData.selected.length < 1) {
       this.showtoast('请选择成员关系');
       return
     } else if (this.data.personstatusData.selected.length < 1) {
@@ -709,6 +721,7 @@ Page({
     var that = this
     var formdata = data
     console.log("form_data", formdata);
+    var request_profession = that.getProfessionRequest()
     var Authorization = app.globalData.Authorization;
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes/'+that.data.cur_id,
@@ -721,14 +734,7 @@ Page({
         "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": "专业技术人员",
-          "two_level_code": "11",
-          "two_level_name": "科学研究人员",
-          "three_level_code": "111",
-          "three_level_name": "哲学研究人员"
-        },
+        "profession": request_profession,
         "education": that.data.degreeData.selected,
         "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : '',
         "taxpayer_status": that.data.personstatusData.selected,
@@ -796,6 +802,25 @@ Page({
     })
   },
 
+  getProfessionRequest:function(){
+    var that = this
+    var pro_index = that.data.profession_index
+    if (that.data.profession_haschanges&&pro_index.length==3){
+      var profession_data_info = that.data.professionData.values[pro_index[pro_index[0]]][0]
+      console.log('profession_datas', profession_data_info)
+      return {
+        "one_level_code": profession_data_info.value,
+        "one_level_name": profession_data_info.label,
+        "two_level_code": profession_data_info.children[pro_index[1]].value,
+        "two_level_name": profession_data_info.children[pro_index[1]].label,
+        "three_level_code": profession_data_info.children[pro_index[1]].children[pro_index[2]].value,
+        "three_level_name": profession_data_info.children[pro_index[1]].children[pro_index[2]].label
+      }
+    }else{
+      return  that.data.taxInfo.profession
+    }
+  },
+
   showtoast: function (title) {
     wx.showToast({
       title: title,

@@ -13,7 +13,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='请填写姓名' name='name' value='{{name}}' disabled='{{disabled}}'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' name='name' value='{{name}}' disabled='true'></input>
         </view>
         <view class="divide_line"></view>
         <!-- <view class='item_body' bindtap='openpicker'>
@@ -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}}' disabled='{{disabled}}'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' value='{{taxInfo.name}}' disabled='true'></input>
         </view>
         <view class="divide_line"></view>
 
@@ -82,7 +82,7 @@
             <text class='text_333_28 float_right'>{{card_number}}</text>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{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>
@@ -117,7 +117,7 @@
             <image class='arrow_wrap' src='/images/arrow_right.png'></image>
             <text class='text_333_28 float_right'></text>
           </view> -->
-          <template is="picker_cell_muti" data="{{...professionData}}" />
+          <template is="picker_cell_normal" data="{{...professionData}}" />
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
             <text class='text_666_28 float_left'>学历</text>
@@ -326,10 +326,9 @@
 
         <view style='width:100% '>
           <text class='text_666_28 float_left '>备注</text>
-          <input class='extra_input' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注'></input>
+          <input class='extra_input' style='text-aligh: right' value='{{taxInfo.comment}}' name='comment'  placeholder-class='text_999_28' placeholder='请输入备注'></input>
         </view>
       </view>
-
     </view>
 
     <view style='background:#f8f8f8;height:150rpx '></view>

@@ -89,7 +89,6 @@
   font-size: 28rpx;
   color: #333;
   float: right;
-  text-aligh: right;
   line-height: 40rpx;
   padding: 16rpx 0;
   word-wrap: break-word;

@@ -7,7 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    taxlist:[""]
+    taxlist:['']
   },
 
   /**
@@ -34,6 +34,10 @@ Page({
   getTaxList:function(){
     var that = this;
     var Authorization = app.globalData.Authorization;
+    console.log('Authorization',Authorization)
+    if(!Authorization||Authorization.length<10){
+      return 
+    }
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
       method: "GET",