辛苦

@@ -62,6 +62,7 @@ App({
           if (relaunch) {
           if (relaunch) {
             wx.reLaunch({ //重新加载
             wx.reLaunch({ //重新加载
               url: '../home/home'
               url: '../home/home'
+              // url: '../../getPhone/getPhone'
             })
             })
           }
           }
         }
         }

@@ -3,6 +3,7 @@
     "pages/main/home/home",    
     "pages/main/home/home",    
     "pages/getPhone/getPhone",
     "pages/getPhone/getPhone",
     "pages/main/editinfo/editinfo",
     "pages/main/editinfo/editinfo",
+    "pages/main/addinfo/addinfo",
     "pages/main/idinfo/idinfo",
     "pages/main/idinfo/idinfo",
     "pages/login/login"
     "pages/login/login"
   ],
   ],

@@ -20,7 +20,7 @@
   </view>
   </view>
 </template>
 </template>
 
 
-<template name="picker_cell_mutiple">
+<template name="picker_cell_muti">
   <view class='item_body'>
   <view class='item_body'>
     <text hidden='{{!isrequre}}' style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
     <text hidden='{{!isrequre}}' style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
     <view wx:if='{{isrequre}}'>
     <view wx:if='{{isrequre}}'>
@@ -32,12 +32,11 @@
     <image class='arrow_wrap' src='/images/arrow_right.png'></image>
     <image class='arrow_wrap' src='/images/arrow_right.png'></image>
 
 
     <view class="weui-cell__bd">
     <view class="weui-cell__bd">
-      <picker mode='picker_cell_mutiple' range-key="{{range_key}}"value="{{multiIndex}}" range="{{values}}"   bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}">
-        <view wx:if="{{selected}}" class="text_333_28 float_right">{{selected}}</view>
+      <picker mode="{{mode?mode:'multiSelector'}}" range-key="{{range_key}}" range="{{values}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
+        <view wx:if="{{true}}" class="text_333_28 float_right">{{selected}}</view>
         <view wx:elif="{{placeholder}}" class="text_333_28 float_right">{{placeholder}}</view>
         <view wx:elif="{{placeholder}}" class="text_333_28 float_right">{{placeholder}}</view>
       </picker>
       </picker>
     </view>
     </view>
 
 
-    <!-- <text class='text_333_28 float_right'>请选择关系</text> -->
   </view>
   </view>
 </template>
 </template>

@@ -23,7 +23,7 @@
   color: #fff;
   color: #fff;
   text-align: center;
   text-align: center;
   background-color: #659CF7;
   background-color: #659CF7;
-  background-image: linear-gradient(-90deg, #659CF7 0%, #357AEB 100%);
+  background-image: linear-gradient(-90deg, #357AEB 0%, #659CF7 100%);
   /* background:gradient(linear, 0 0, 0 bottom, from(#659CF7), to(#357AEB) */
   /* background:gradient(linear, 0 0, 0 bottom, from(#659CF7), to(#357AEB) */
 }
 }
 
 

+// pages/main/addinfo/addinfo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

+{}

+<!--pages/main/addinfo/addinfo.wxml-->
+<text>pages/main/addinfo/addinfo.wxml</text>

+/* pages/main/addinfo/addinfo.wxss */

@@ -15,6 +15,7 @@ Page({
     banklist: {},
     banklist: {},
     cur_id: '',
     cur_id: '',
     isself: true,
     isself: true,
+    isIdCard:true,
     name: '',
     name: '',
     id_card_number: '',
     id_card_number: '',
 
 
@@ -38,7 +39,7 @@ Page({
       isrequre: true,
       isrequre: true,
       label: '证照类型',
       label: '证照类型',
       bindtype: 'cardtype',
       bindtype: 'cardtype',
-      selected: '居民身份证',
+      placeholder: '居民身份证',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往大陆通行证', '外交官证', '中国护照',
       values: ["居民身份证", "军官证", '士兵证', '武警警官证', '港澳居民来往大陆通行证', '外交官证', '中国护照',
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '外国人永久居留证'
         '外国护照', '香港永久性居民身份证', '澳门特别行政区永久性居民身份证', '台湾身份证', '外国人永久居留证'
       ],
       ],
@@ -175,6 +176,7 @@ Page({
       placeholder: '请选择户籍所在地',
       placeholder: '请选择户籍所在地',
       onChange: 'onPickerSelect'
       onChange: 'onPickerSelect'
     },
     },
+    title:'',
     condition: false
     condition: false
   },
   },
 
 
@@ -234,7 +236,7 @@ Page({
       },
       },
       success: function(res) {
       success: function(res) {
         console.log('proffessiondata', res.data)
         console.log('proffessiondata', res.data)
-        proffession_info.values = res.data.items
+        proffession_info.values = that.handleProfession(res.data.items)
         that.setData({
         that.setData({
           proffessionlist: res.data.items,
           proffessionlist: res.data.items,
           professionData: proffession_info
           professionData: proffession_info
@@ -247,6 +249,58 @@ Page({
     console.log('proffessionData--', that.data.professionData)
     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] = {
+          "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])
+        })
+      })
+    }
+    console.log('newdata', newdata)
+    
+    return newdata
+  },
+
   getbanklist: function() {
   getbanklist: function() {
     var that = this
     var that = this
     var Authorization = app.globalData.Authorization;
     var Authorization = app.globalData.Authorization;
@@ -342,9 +396,16 @@ Page({
         })
         })
         break;
         break;
       case 'cardtype':
       case 'cardtype':
+        var is_idcard = this.data.isIdCard
         var cardtype_data = this.data.cardtypeData
         var cardtype_data = this.data.cardtypeData
         cardtype_data.selected = cardtype_data.values[e.detail.value]
         cardtype_data.selected = cardtype_data.values[e.detail.value]
+        if (0 == e.detail.value){
+          is_idcard = true
+        }else{
+          is_idcard = false
+        }
         this.setData({
         this.setData({
+          isIdCard:is_idcard,
           cardtypeData: cardtype_data
           cardtypeData: cardtype_data
         })
         })
         break;
         break;
@@ -438,8 +499,43 @@ Page({
 
 
   formBindSubmit: function(e) {
   formBindSubmit: function(e) {
     var formdata = e.detail.value;
     var formdata = e.detail.value;
+    var toast_title= ''
     console.log("formdata", formdata);
     console.log("formdata", formdata);
-
+    if (formdata.name.length<1){
+      this.showtoast('请输入姓名');
+      return
+    } else if (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.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();
   },
   },
 
 
@@ -447,7 +543,7 @@ Page({
     var that = this
     var that = this
     var Authorization = app.globalData.Authorization;
     var Authorization = app.globalData.Authorization;
     wx.request({
     wx.request({
-      url: baseUrl + 'persontax/v1/personal-taxes/'+that.data.cur_id,
+      url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "GET",
       method: "GET",
       data: {
       data: {
         "name": "张美嘉",
         "name": "张美嘉",
@@ -529,6 +625,12 @@ Page({
     })
     })
   },
   },
 
 
+  showtoast:function(title){
+    wx.showToast({
+      title: title,
+    })
+  },
+
   /**
   /**
    * 生命周期函数--监听页面隐藏
    * 生命周期函数--监听页面隐藏
    */
    */

@@ -77,9 +77,13 @@
         <view class='item_body' bindtap='getIdInfo'>
         <view class='item_body' bindtap='getIdInfo'>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
           <text class='text_black_28 float_left'>证照号码</text>
           <text class='text_black_28 float_left'>证照号码</text>
-          <image class='image_camera float_right' src='/images/camera.png'></image>
-          <!-- <input class='input_wrap float_right'placeholder='请输入证件号码' value='{{id_card_number}}' name=''></input> -->
-          <text class='text_333_28 float_right'>{{id_card_number}}</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>
+          </view>
+          <view wx:else>
+            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{id_card_number}}' name='id_card_no'></input>
+          </view>
         </view>
         </view>
         <view class="divide_line"></view>
         <view class="divide_line"></view>
 
 
@@ -113,7 +117,7 @@
             <image class='arrow_wrap' src='/images/arrow_right.png'></image>
             <image class='arrow_wrap' src='/images/arrow_right.png'></image>
             <text class='text_333_28 float_right'></text>
             <text class='text_333_28 float_right'></text>
           </view> -->
           </view> -->
-          <template is="picker_cell_mutiple" data="{{...professionData}}" />
+          <template is="picker_cell_muti" data="{{...professionData}}" />
           <view class="divide_line"></view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
           <!-- <view class='item_body'>
             <text class='text_666_28 float_left'>学历</text>
             <text class='text_666_28 float_left'>学历</text>

@@ -56,6 +56,13 @@ Page({
   goadd:function(e){
   goadd:function(e){
     console.log(e)
     console.log(e)
     wx.navigateTo({
     wx.navigateTo({
+      url: '../addinfo/addinfo',
+    })
+  },
+
+  goedit: function (e) {
+    console.log(e)
+    wx.navigateTo({
       url: '../editinfo/editinfo?id=' + e.currentTarget.id,
       url: '../editinfo/editinfo?id=' + e.currentTarget.id,
     })
     })
   },
   },

@@ -21,7 +21,7 @@
       <view class='rectangle_solid_blue_bg'>
       <view class='rectangle_solid_blue_bg'>
         <view style='padding:11px 15px'>
         <view style='padding:11px 15px'>
           <text class='text_white_32'>{{item.name}}</text>
           <text class='text_white_32'>{{item.name}}</text>
-          <text class='text_gray_bg text_blue_20'>{{item.family_ties}}</text>
+          <text class='text_gray_bg text_blue_20' hidden="{{item.family_ties?false:true}}">{{item.family_ties}}</text>
         </view>
         </view>
         <view style='padding:0 15px'>
         <view style='padding:0 15px'>
           <image class='phone_image_wrap' src='/images/phone.png'></image>
           <image class='phone_image_wrap' src='/images/phone.png'></image>
@@ -31,7 +31,7 @@
           <text class='text_white_22'>{{item.id_card_no}}</text>
           <text class='text_white_22'>{{item.id_card_no}}</text>
         </view>
         </view>
       </view>
       </view>
-      <view class='rectangle_solid_bg' bindtap='goadd' id='{{item.id}}'>
+      <view class='rectangle_solid_bg' bindtap='goedit' id='{{item.id}}'>
         <view style='padding: 0 15px '>
         <view style='padding: 0 15px '>
           <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
           <image class='arrow_wrap' src='/images/arrow_right.png'> </image>
           <text class='text_999_28'>去完善</text>
           <text class='text_999_28'>去完善</text>
@@ -42,7 +42,7 @@
     </block>
     </block>
   </view>
   </view>
 
 
-  <view class='rectangle_dashed_bg' bindtap="goadd" id=''>
+  <view class='rectangle_dashed_bg' bindtap="goadd" >
     <view class='text_blue_28' style='text-align:center'>
     <view class='text_blue_28' style='text-align:center'>
       十 添加家庭成员
       十 添加家庭成员
     </view>
     </view>