yh

@@ -64,6 +64,9 @@ App({
             wx.reLaunch({ //重新加载
               url: '../home/home'
             })
+            // wx.redirectTo({
+            //   url: '../../getPhone/getPhone'
+            // })
           }
         }
       },

@@ -21,7 +21,7 @@ Page({
     const iv = e.detail.iv;
     const encryptedData = e.detail.encryptedData;
     console.log('getPhoneNumber' ,e)
-    if (e.detail.errMsg == 'getPhoneNumber:fail user deny') {
+    if (!iv || iv.length < 1 || !encryptedData || encryptedData.length<1) {
       wx.showModal({
         title: '提示',
         showCancel: false,
@@ -40,12 +40,13 @@ Page({
     wx.request({
       url: baseUrl + "uaa/v1/users/op/bind-mobile",
       data: {
-        "mobile": '13691224349',//必传，随便写一个
+        "mobile": '15071421900',//必传，随便写一个
         "sms_code": '1234',//必传，随便写一个
         "wx_open_id": app.globalData.wx_open_id,  //可选，如果传了，绑定到对应的微信号
         "tenant_id": app.globalData.tenant_id,
         "source": "wx_app::" + phone + ":" + iv,
-        "scope": "expert"
+        "scope": "end_user",
+        "app_id": app.globalData.appId
       },
       method: "POST",
       header: {
@@ -71,6 +72,7 @@ Page({
         } else {
           wx.showToast({
             title: '登录失败，请重新登录',
+            image: "/images/error.png"
           })
         }
       },

@@ -36,6 +36,7 @@ Page({
     console.log("mobile---", mobile);
     if (!regMobile.test(mobile)) {
       wx.showToast({
+        image: "/images/error.png",
         title: '手机号有误！'
       })
       return;
@@ -98,7 +99,8 @@ Page({
         "wx_open_id": that.data.wx_open_id,  //可选，如果传了，绑定到对应的微信号
         "tenant_id": that.data.tenant_id,
         "source": "wx_app",
-        "scope": "end_user"
+        "scope": "end_user",
+        "app_id": app.globalData.appId
       },
       method: "POST",
       header: {
@@ -121,6 +123,7 @@ Page({
           })
         } else {
           wx.showToast({
+            image: "/images/error.png",
             title: '请重新登录',
           })
         }

@@ -158,6 +158,7 @@ Page({
       placeholder: '请选择出生日期',
       mode: "date",
       fields: "day",
+      start: '1949-01-01',
       onChange: 'birthdayChange',
     },
     startDate: {
@@ -167,6 +168,7 @@ Page({
       placeholder: '请选择受雇日期',
       mode: "date",
       fields: "day",
+      start: '1990-01-01',
       onChange: 'startChange',
     },
     endDate: {
@@ -176,6 +178,7 @@ Page({
       placeholder: '请选择离职日期',
       mode: "date",
       fields: "day",
+      start: '2010-01-01',
       onChange: 'endChange',
     },
     // 地址选择器
@@ -214,10 +217,19 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    this.handleData()
     this.getproffessiondata()
     this.getbanklist()
   },
 
+  handleData:function(){
+    var curdate = format.curDateTime()
+    console.log('curdate', curdate) 
+    this.data.birthDate.end = curdate
+    this.data.startDate.end = curdate
+    this.data.endDate.end = curdate
+  },
+
   getproffessiondata: function() {
     var that = this
     var Authorization = app.globalData.Authorization;
@@ -362,11 +374,11 @@ Page({
           that.data.birthDate.selected = birth_day
           
           if (that.data.name.length > 0 && id_info.name != that.data.name){
-            that.showtoast("证照与所填姓名冲突")
+            that.showtoast("姓名冲突")
             return
           }
           if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) {
-            that.showtoast("证照与所填证照号码冲突")
+            that.showtoast("证照号码冲突")
             return
           }
           that.setData({
@@ -603,6 +615,8 @@ Page({
     // 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 regMoney = /^[0-9]*(/.[0-9]{1,2})?$/;
+    var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     var regMobile = /^1[3|4|5|7|8][0-9]{9}$/;
     var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$");
@@ -610,46 +624,61 @@ Page({
     console.log("formdata", formdata);
     console.log('idnum', this.data.card_number.length < 1&&!format.isIDCardNum(formdata.id_card_no))
     if (formdata.name.length < 1) {
-      this.showtoast('请输入姓名');
+      this.showtoast('有必填项未填写');
       return
     } else if (!regname.test(formdata.name)) {
       this.showtoast('请输入正确姓名');
       return
     } else if (this.data.relativeData.selected.length < 1) {
-      this.showtoast('请选择成员关系');
+      this.showtoast('有必填项未填写');
       return
     } else if (this.data.personstatusData.selected.length < 1) {
-      this.showtoast('请选择纳税人状态');
+      this.showtoast('有必填项未填写');
       return
     } else if (this.data.cardtypeData.selected.length < 1) {
-      this.showtoast('请选择证照类型');
+      this.showtoast('有必填项未填写');
       return
-    } else if (this.data.isIdCard && (this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))) {
-      this.showtoast('请填写有效证件号');
+    } else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
+      this.showtoast('有必填项未填写');
       return
-    } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
-      this.showtoast('请输入证件号码');
+    } else if (this.data.isIdCard &&!format.isIDCardNum(formdata.id_card_no)) {
+      this.showtoast('证件号码有误');
+      return
+    }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('请输入手机号');
+      this.showtoast('有必填项未填写');
       return
     } else if (!regMobile.test(formdata.mobile)){
       this.showtoast('请输入正确手机号');
       return
     } else if (this.data.investInfo.selected.length < 1) {
-      this.showtoast('请选择是否股东投资者');
+      this.showtoast('有必填项未填写');
       return
     } else if (this.data.specificIndustryInfo.selected.length < 1) {
-      this.showtoast('请选择是否特定行业');
+      this.showtoast('有必填项未填写');
       return
     } else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)){
-      this.showtoast('请输入正确的邮箱');
+      this.showtoast('请输入正确邮箱');
+      return
+    } else if (formdata.company_equity_total && formdata.company_equity_total.length > 0 && !regMoney.test(formdata.company_equity_total)) {
+      this.showtoast('请输入正确金额');
+      return
+    } else if (formdata.personal_equity_total && formdata.personal_equity_total.length > 0 && !regMoney.test(formdata.personal_equity_total)) {
+      this.showtoast('请输入正确金额');
       return
     }
     var new_card_num = ''
-    if (this.data.isIdCard && this.data.card_number.length > 0) {
-      new_card_num = this.data.card_number
+    if (this.data.isIdCard) {
+      if (this.data.card_number.length > 0) {
+        new_card_num = this.data.card_number
+      }
+      if (formdata.id_card_no.length > 0) {
+        new_card_num = formdata.id_card_no
+      }
     }
+    
     if (!this.data.isIdCard && formdata.id_card_no && formdata.id_card_no.length > 0) {
       new_card_num = formdata.id_card_no
     }
@@ -727,8 +756,8 @@ Page({
         "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,
+        "join_date": that.data.startDate.selected.length > 0 ? Date.parse(new Date(that.data.startDate.selected)) / 1000 : null,
+        "separate_date": that.data.endDate.selected.length > 0 ? Date.parse(new Date(that.data.endDate.selected)) / 1000 : null,
         "is_employee": that.data.employeeInfo.selected,
         "is_specific_profession": that.data.specificIndustryInfo.selected,
         "is_investor": that.data.investInfo.selected,
@@ -743,9 +772,17 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        wx.redirectTo({
-          url: '../home/home',
-        })
+        if(res.statusCode==200){
+          wx.redirectTo({
+            url: '../home/home',
+          })
+        } else {
+          wx.showModal({
+            title: res.data.message,
+            content: '',
+          })
+        }
+        
       },
       fail(res) {
         console.log(res)
@@ -756,6 +793,8 @@ Page({
   showtoast: function(title) {
     wx.showToast({
       title: title,
+      duration:2000,
+      image: '/images/error.png'
     })
   },
 

@@ -323,8 +323,8 @@
             <text class='text_333_28 float_right'></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line" hidden="{{investpersonalInfo.selected=='否'}}"></view>
-          <view class='item_body' hidden="{{investpersonalInfo.selected=='否'}}">
+          <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'  placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
           </view>

@@ -33,9 +33,8 @@ Page({
       isrequre: true,
       label: '关系',
       bindtype: 'relative',
-      placeholder: '',
+      placeholder: '请选择亲属关系',
       selected: '',
-      disabled: true,
       values: ["子女", "配偶"],
       onChange: 'onPickerSelect'
     },
@@ -255,6 +254,7 @@ Page({
         console.log('taxInfo', res)
         that.setData({
           taxInfo: res.data,
+          // isself: '魏先森' != res.data.name ? false : true
           isself: res.data.family_ties ? false : true
         })
         that.handleDatas()
@@ -277,7 +277,14 @@ Page({
 
     var tax_info = this.data.taxInfo
     this.data.name = tax_info.name
-    this.data.relativeData.placeholder = tax_info.family_ties
+    if(this.data.isself){
+      this.data.relativeData.disabled = true
+      this.data.relativeData.placeholder = tax_info.family_ties
+    }else{
+      this.data.relativeData.disabled = false
+      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
@@ -287,11 +294,20 @@ Page({
     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)
+    if (tax_info.birth_date>1000){
+      this.data.birthDate.selected = format.yearFormString(tax_info.birth_date) + '-' + format.monthFormString(tax_info.birth_date) + '-' + format.dayFormString(tax_info.birth_date)
+    }
+    if (tax_info.join_date > 1000) {
+      this.data.startDate.selected = format.yearFormString(tax_info.join_date) + '-' + format.monthFormString(tax_info.join_date) + '-' + format.dayFormString(tax_info.join_date)
+    }
+    if (tax_info.separate_date > 1000) {
+      this.data.endDate.selected = format.yearFormString(tax_info.separate_date) + '-' + format.monthFormString(tax_info.separate_date) + '-' + format.dayFormString(tax_info.separate_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.birthDate.end = curdate
     this.data.startDate.end = curdate
-    this.data.endDate.selected = format.yearFormString(tax_info.separate_date) + '-' + format.monthFormString(tax_info.separate_date) + '-' + format.dayFormString(tax_info.separate_date)
     this.data.endDate.end = curdate
     this.data.degreeData.selected = tax_info.education
     this.data.disabilityInfo.selected = tax_info.is_disability
@@ -487,12 +503,12 @@ Page({
           that.data.birthDate.selected = birth_day
 
           if (that.data.name.length > 0 && id_info.name != that.data.name) {
-            that.showtoast("证照与所填姓名冲突")
+            that.showtoast("姓名冲突")
             id_error = true
             return
           }
           if (that.data.card_number.length > 0 && id_info.card_number != that.data.id_card_no) {
-            that.showtoast("证照与所填证照号码冲突")
+            that.showtoast("证照号码冲突")
             id_error = true
             return
           }
@@ -528,7 +544,6 @@ Page({
         isshow02: !this.data.isshow02
       })
     } else if ("3" == e.target.id) {
-      console.log('isshow03', this.data.isshow03)
       this.setData({
         isshow03: !this.data.isshow03
       })
@@ -742,40 +757,54 @@ Page({
   formSubmit: function(e) {
     console.log("date", Date.parse(new Date(this.data.birthday)) / 1000)
     var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$");
+    var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/;
+    var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
     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) {
-      this.showtoast('请输入姓名');
+      this.showtoast('有必填项未填写');
+      return
+    } else if (!regname.test(formdata.name)) {
+      this.showtoast('请输入正确姓名');
       return
     } 
-    // else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) {
-    //   this.showtoast('请选择成员关系');
-    //   return
-    // }
+    else if (!this.data.isself && this.data.relativeData.placeholder.length < 1) {
+      this.showtoast('有必填项未填写');
+      return
+    }
      else if (this.data.personstatusData.selected.length < 1) {
-      this.showtoast('请选择纳税人状态');
+      this.showtoast('有必填项未填写');
       return
     } else if (this.data.cardtypeData.selected.length < 1) {
-      this.showtoast('请选择证照类型');
+      this.showtoast('有必填项未填写');
       return
-    } else if (this.data.isIdCard && this.data.card_number.length < 1) {
-      this.showtoast('请上传有效证件照片');
+    } else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
+      this.showtoast('有必填项未填写');
+      return
+    } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
+      this.showtoast('证件号码有误');
       return
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
-      this.showtoast('请输入证件号码');
+      this.showtoast('有必填项未填写');
       return
-    } else if (formdata.mobile.length < 1) {
-      this.showtoast('请输入联系电话');
+    }  else if (formdata.mobile.length < 1) {
+      this.showtoast('有必填项未填写');
       return
     } else if (this.data.investInfo.selected.length < 1) {
-      this.showtoast('请选择是否股东投资者');
+      this.showtoast('有必填项未填写');
       return
     } else if (this.data.specificIndustryInfo.selected.length < 1) {
-      this.showtoast('请选择是否特定行业');
+      this.showtoast('有必填项未填写');
       return
     } else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
-      this.showtoast('请输入正确的邮箱');
+      this.showtoast('请输入正确邮箱');
+      return
+    } else if (formdata.company_equity_total && formdata.company_equity_total.length > 0 && !regMoney.test(formdata.company_equity_total)) {
+      this.showtoast('请输入正确金额');
+      return
+    } else if (formdata.personal_equity_total && formdata.personal_equity_total.length > 0 && !regMoney.test(formdata.personal_equity_total)) {
+      this.showtoast('请输入正确金额');
       return
     }
     var new_ard_num = ''
@@ -804,7 +833,7 @@ Page({
       url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
       method: "PUT",
       data: {
-        "name": that.data.name.length > 0 ? that.data.name : form_data.name,
+        "name": formdata.name.length > 0 ? formdata.name:that.data.name ,
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.cardtypeData.selected,
@@ -848,9 +877,16 @@ Page({
       },
       success: function(res) {
         console.log(res)
-        wx.reLaunch({
-          url: '../home/home',
-        })
+        if (res.statusCode == 200) {
+          wx.reLaunch({
+            url: '../home/home',
+          })
+        } else {
+          wx.showModal({
+            title: res.data.message,
+            content: '',
+          })
+        }
       },
       fail(res) {
         console.log(res)
@@ -928,6 +964,8 @@ Page({
   showtoast: function(str) {
     wx.showToast({
       title: str,
+      duration: 2000,
+      image:'/images/error.png'
     })
   },
 

@@ -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:'请填写姓名'}}" name='name'  disabled='true'></input>
+          <input class='input_wrap float_right' placeholder='请填写姓名' name='name'  disabled='{{isself}}' value='{{name}}'></input>
         </view>
         <view class="divide_line"></view>
         <!-- <view class='item_body' bindtap='openpicker'>
@@ -46,7 +46,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="{{name?name:'请填写姓名'}}"disabled='true'></input>
+          <input class='input_wrap float_right'  placeholder-class='text_999_28' placeholder="{{name?name:'请填写姓名'}}" disabled='true' ></input>
         </view>
         <view class="divide_line"></view>
 
@@ -75,15 +75,16 @@
         <template is="picker_cell_normal" data="{{...cardtypeData}}" />
         <view class="divide_line"></view>
 
-        <view class='item_body' bindtap='getIdInfo'>
+        <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>
-          <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 wx:if="{{isIdCard}}"   >
+            <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
+            <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
+             <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}'></input>
           </view>
           <view wx:else>
-            <input class='input_wrap float_right' placeholder='请输入证件号码' value='{{card_number}}' name='id_card_no' maxlength='24'></input>
+            <input class='input_wrap float_right' placeholder='请输入证件号码'  placeholder-class='text_999_28' name='id_card_no' maxlength='24' value='{{card_number}}'></input>
           </view>
         </view>
         <view class="divide_line"></view>
@@ -323,8 +324,8 @@
             <text class='text_333_28 float_right '></text>
           </view> -->
           <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
-          <view class="divide_line" hidden="{{investpersonalInfo.selected=='否'}}"></view>
-          <view class='item_body ' hidden="{{investpersonalInfo.selected=='否'}}">
+          <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' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
           </view>

@@ -7,7 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    load_finish:false,
+    load_finish: false,
     text_tip: "去完善",
     taxlist: ['']
   },
@@ -17,7 +17,7 @@ Page({
    */
   onLoad: function(options) {
     console.log('onLoad')
-    
+
   },
 
   /**
@@ -31,7 +31,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-    
+
     console.log('onShow')
     this.getTaxList()
   },
@@ -57,35 +57,83 @@ Page({
         'all': true
       },
       success: function(res) {
-        console.log(res.data)
-        that.setData({
-          taxlist: res.data.items
-        })
-        if (res.data.items && res.data.items.length > 0) {
-          that.getStatus(res.data.items)
+        console.log('succ',res)
+        if(res.statusCode ==200){
+          that.handleData(res.data);
+        }else{
+          wx.showModal({
+            title: res.data.message,
+            content: '',
+            showCancel:false,
+            success: function (res) {
+              if (res.confirm) {
+                console.log('用户点击确定')
+                wx.redirectTo({
+                  url: '../../getPhone/getPhone',
+            })
+              } else if (res.cancel) {
+                console.log('用户点击取消')
+              }
+            }
+          })
         }
       },
       fail(res) {
         console.log(res.data)
       },
-      complete(){
+      complete() {
         wx.hideLoading()
         that.setData({
-          load_finish:true
+          load_finish: true
         })
       }
     })
   },
 
+  handleData: function(data) {
+    if (data.items && data.items.length > 0) {
+      var datalist = []
+
+      for (var i = 0; i < data.items.length; i++) {
+        data.items[i].newmobile = this.formatMobile(data.items[i].mobile)
+        data.items[i].newidnum = this.formatIdNum(data.items[i].id_card_no)
+        datalist.push(data.items[i])
+      }
+      this.setData({
+        taxlist: datalist
+      })
+      this.getStatus(datalist)
+    }
+    console.log('handleData', this.data.taxlist)
+  },
+
+  formatMobile: function(mobile) {
+    if (mobile && mobile > 7) {
+      return mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
+    } else {
+      return mobile
+    }
+  },
+
+  formatIdNum: function(idnum) {
+    if (idnum && idnum.length >= 6 && idnum.length < 10) {
+      return idnum.substring(0, 2) + '****' + idnum.substring(idnum.length - 2, idnum.length);
+    } else if (idnum.length >= 10) {
+      return idnum.substring(0, 4) + '****' + idnum.substring(idnum.length - 4, idnum.length);
+    } else {
+      return idnum
+    }
+  },
+
   getStatus: function(data) {
-    console.log('data', data )
+    console.log('data', data)
     if (data[0].family_ties.length < 1 && data[0].name.length > 0 && data[0].taxpayer_status.length > 0 && data[0].id_card_type.length > 0 && data[0].id_card_no.length > 0 && data[0].mobile.length > 0 && data[0].is_investor.length > 0 && data[0].is_specific_profession.length > 0) {
       this.setData({
         text_tip: '去查看'
       })
     } else {
       this.setData({
-        text_tip: '去完善'
+        text_tip: ' 尚未录入个人信息，立即完善'
       })
     }
   },

@@ -25,10 +25,10 @@
         </view>
         <view style='padding:0 15px'>
           <image class='phone_image_wrap' src='/images/phone.png'></image>
-          <text class='text_white_22'>{{item.mobile}}</text>
+          <text class='text_white_22'>{{item.newmobile&&item.newmobile.length>0?item.newmobile:"未录入手机号码"}}</text>
           <text style='margin:0rpx 20rpx;color:#fff;font-size: 20rpx;'>|</text>
           <image class='id_image_wrap' src='/images/id.png'></image>
-          <text class='text_white_22'>{{item.id_card_no}}</text>
+          <text class='text_white_22'>{{item.newidnum&&item.newidnum.length>0?item.newidnum:"未录入证件号码  "}}</text>
         </view>
       </view>
       <view class='rectangle_solid_bg' bindtap='goedit' id='{{item.id}}'>

@@ -110,6 +110,7 @@ Page({
         'success_action_status': '200',
       },
       success: function(res) {
+        console.log('uploadFile',res.data)
         if (res.statusCode == 200) {
           var data = JSON.parse(res.data)
           console.log('上传成功', res)
@@ -136,17 +137,20 @@ Page({
             confirmColor: '#4E8FE7'
           })
         }
+        wx.hideLoading()
       },
       fail: function(err) {
+        console.log('fail', err)
         wx.showModal({
           title: '上传失败',
           content: '图片上传失败，请重新上传',
           showCancel: false,
           confirmColor: '#4E8FE7'
         })
+        wx.hideLoading()
       },
       complete(res){
-        console.log('complete', res.data)
+        console.log('complete', res)
         wx.hideLoading()
       }
     })
@@ -188,8 +192,8 @@ Page({
           console.log('suc', that.data.idInfo)
         } else {
           wx.showToast({
-            image: "/images/warn.png",
-            duration: 1000,
+            image: "/images/error.png",
+            duration: 2000,
             title: res.data.message ? res.data.message : "数据错误"
           });
         }

@@ -24,8 +24,8 @@
       <text class='text_666_28 float_left'>身份证号码</text>
       <text class='text_333_28 float_right'>{{idInfo.id_card_number}}</text>
     </view>
-    <view class="divide_line"></view>
-    <view class='item_body'>
+    <view class="divide_line" hidden='true'></view>
+    <view class='item_body' hidden='true'>
       <text class='text_666_28 float_left'>户籍所在地</text>
       <text class='text_333_28 float_right'>{{idInfo.address}}</text>
     </view>