优化

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

@@ -162,7 +162,7 @@ Page({
       onChange: 'birthdayChange',
     },
     startDate: {
-      label: '在职受雇日期',
+      label: '任职受雇日期',
       bindtype: 'startday',
       selected: '',
       placeholder: '请选择受雇日期',
@@ -616,7 +616,7 @@ Page({
     // 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 regMoney = /^[0-9]*(\.[0,10]{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]+$");
@@ -704,7 +704,7 @@ Page({
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.cardtypeData.selected,
-        "id_card_no": that.data.card_number,
+        "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
         "gender": that.data.genderData.selected,
         "birth_date": Date.parse(new Date(this.data.birthday)) / 1000,
         "profession": {

@@ -221,7 +221,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='email'  placeholder-class='text_999_28' placeholder='请输入电子邮箱'></input>
+            <input class='input_wrap float_right' name='email'  placeholder-class='text_999_28' placeholder='请输入电子邮箱' maxlength='24'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -294,7 +294,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='company_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入公司股本总额' maxlength='20'></input>
+            <input class='input_wrap float_right' name='company_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入公司股本总额' maxlength='13'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body'>
@@ -326,7 +326,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='personal_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
+            <input class='input_wrap float_right' name='personal_equity_total' type='digit'  placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='13'></input>
           </view>
           <view class="divide_line"></view>
         </view>

@@ -170,7 +170,7 @@ Page({
       onChange: 'birthdayChange',
     },
     startDate: {
-      label: '在职受雇日期',
+      label: '任职受雇日期',
       bindtype: 'startday',
       placeholder: '请选择受雇日期',
       selected: '',
@@ -758,7 +758,8 @@ Page({
     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 regMoney = /^[0-9]*(\.[0,9]{1,2})?$/;
+    var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/
     var formdata = e.detail.value;
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
@@ -837,7 +838,7 @@ Page({
         "family_ties": that.data.relativeData.selected,
         "native": "中国",
         "id_card_type": that.data.cardtypeData.selected,
-        "id_card_no": that.data.card_number,
+        "id_card_no": formdata.id_card_no ?formdata.id_card_no:that.data.card_number,
         "gender": that.data.genderData.selected,
         "birth_date": that.data.long_birth_date,
         "profession": request_profession,

@@ -294,7 +294,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='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_28' placeholder='请输入股本总额' maxlength='20'></input>
+            <input class='input_wrap float_right ' name='company_equity_total' type='digit' value='{{taxInfo.company_equity_total}}' placeholder-class='text_999_28' placeholder='请输入股本总额' maxlength='13'></input>
           </view>
           <view class="divide_line"></view>
           <!-- <view class='item_body '>
@@ -327,7 +327,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='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input>
+            <input class='input_wrap float_right ' name='personal_equity_total' type='digit' value='{{taxInfo.personal_equity_total}}' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='13'></input>
           </view>
           <view class="divide_line"></view>
         </view>

@@ -96,12 +96,13 @@ Page({
     wx.showLoading({
       title: '上传图片中...',
     })
+    console.log('key', 'imagepath_' + path.substring(path.length - 10, path.length))
     wx.uploadFile({
       url: OSSUrl,
       filePath: path,
       name: 'file',
       formData: {
-        'key': 'imagepath_' + path.substring(path.length - 10, path.length),
+        'key': 'imagepath_' + path.substring(path.length - 10, path.length)+".png",
         'OSSAccessKeyId': OSSInit.access_key_id,
         'policy': OSSInit.policy,
         'signature': OSSInit.signature,
@@ -185,23 +186,20 @@ Page({
       },
       success: function(res) {
         console.log('suc', res)
-        if (res.statusCode < 300) {
+        if (res.statusCode == 300) {
           that.setData({
             idInfo: res.data.item
           })
           console.log('suc', that.data.idInfo)
         } else {
-          wx.showToast({
-            image: "/images/error.png",
-            duration: 2000,
-            title: res.data.message ? res.data.message : "数据错误"
-          });
+          wx.showModal({
+            title: '',
+            content: res.data.message ? res.data.message : "数据错误",
+          })
         }
-        wx.hideLoading()
       },
       fail(res) {
         console.log('fail', res.data)
-        wx.hideLoading()
       },
       complete(res){
         console.log('complete', res.data)