正在显示
6 个修改的文件
包含
21 行增加
和
21 行删除
| @@ -162,7 +162,7 @@ Page({ | @@ -162,7 +162,7 @@ Page({ | ||
| 162 | onChange: 'birthdayChange', | 162 | onChange: 'birthdayChange', |
| 163 | }, | 163 | }, |
| 164 | startDate: { | 164 | startDate: { |
| 165 | - label: '在职受雇日期', | 165 | + label: '任职受雇日期', |
| 166 | bindtype: 'startday', | 166 | bindtype: 'startday', |
| 167 | selected: '', | 167 | selected: '', |
| 168 | placeholder: '请选择受雇日期', | 168 | placeholder: '请选择受雇日期', |
| @@ -616,7 +616,7 @@ Page({ | @@ -616,7 +616,7 @@ Page({ | ||
| 616 | // var profession_datas = this.data.professionData.values[pro_index[pro_index[0]]][0] | 616 | // var profession_datas = this.data.professionData.values[pro_index[pro_index[0]]][0] |
| 617 | // console.log('profession_datas', profession_datas) | 617 | // console.log('profession_datas', profession_datas) |
| 618 | // var regMoney = /^[0-9]*(/.[0-9]{1,2})?$/; | 618 | // var regMoney = /^[0-9]*(/.[0-9]{1,2})?$/; |
| 619 | - var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/; | 619 | + var regMoney = /^[0-9]*(\.[0,10]{1,2})?$/; |
| 620 | var regMobile = /^1[3|4|5|7|8][0-9]{9}$/; | 620 | var regMobile = /^1[3|4|5|7|8][0-9]{9}$/; |
| 621 | var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/; | 621 | var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/; |
| 622 | var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); | 622 | 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({ | @@ -704,7 +704,7 @@ Page({ | ||
| 704 | "family_ties": that.data.relativeData.selected, | 704 | "family_ties": that.data.relativeData.selected, |
| 705 | "native": "中国", | 705 | "native": "中国", |
| 706 | "id_card_type": that.data.cardtypeData.selected, | 706 | "id_card_type": that.data.cardtypeData.selected, |
| 707 | - "id_card_no": that.data.card_number, | 707 | + "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number, |
| 708 | "gender": that.data.genderData.selected, | 708 | "gender": that.data.genderData.selected, |
| 709 | "birth_date": Date.parse(new Date(this.data.birthday)) / 1000, | 709 | "birth_date": Date.parse(new Date(this.data.birthday)) / 1000, |
| 710 | "profession": { | 710 | "profession": { |
| @@ -221,7 +221,7 @@ | @@ -221,7 +221,7 @@ | ||
| 221 | <view class="divide_line"></view> | 221 | <view class="divide_line"></view> |
| 222 | <view class='item_body'> | 222 | <view class='item_body'> |
| 223 | <text class='text_666_28 float_left'>电子邮箱</text> | 223 | <text class='text_666_28 float_left'>电子邮箱</text> |
| 224 | - <input class='input_wrap float_right' name='email' placeholder-class='text_999_28' placeholder='请输入电子邮箱'></input> | 224 | + <input class='input_wrap float_right' name='email' placeholder-class='text_999_28' placeholder='请输入电子邮箱' maxlength='24'></input> |
| 225 | </view> | 225 | </view> |
| 226 | <view class="divide_line"></view> | 226 | <view class="divide_line"></view> |
| 227 | <!-- <view class='item_body'> | 227 | <!-- <view class='item_body'> |
| @@ -294,7 +294,7 @@ | @@ -294,7 +294,7 @@ | ||
| 294 | <view class="divide_line"></view> | 294 | <view class="divide_line"></view> |
| 295 | <view class='item_body'> | 295 | <view class='item_body'> |
| 296 | <text class='text_666_28 float_left'>公司股本总额</text> | 296 | <text class='text_666_28 float_left'>公司股本总额</text> |
| 297 | - <input class='input_wrap float_right' name='company_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入公司股本总额' maxlength='20'></input> | 297 | + <input class='input_wrap float_right' name='company_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入公司股本总额' maxlength='13'></input> |
| 298 | </view> | 298 | </view> |
| 299 | <view class="divide_line"></view> | 299 | <view class="divide_line"></view> |
| 300 | <!-- <view class='item_body'> | 300 | <!-- <view class='item_body'> |
| @@ -326,7 +326,7 @@ | @@ -326,7 +326,7 @@ | ||
| 326 | <view class="divide_line" ></view> | 326 | <view class="divide_line" ></view> |
| 327 | <view class='item_body' > | 327 | <view class='item_body' > |
| 328 | <text class='text_666_28 float_left'>个人投资总额</text> | 328 | <text class='text_666_28 float_left'>个人投资总额</text> |
| 329 | - <input class='input_wrap float_right' name='personal_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='20'></input> | 329 | + <input class='input_wrap float_right' name='personal_equity_total' type='digit' placeholder-class='text_999_28' placeholder='请输入个人投资总额' maxlength='13'></input> |
| 330 | </view> | 330 | </view> |
| 331 | <view class="divide_line"></view> | 331 | <view class="divide_line"></view> |
| 332 | </view> | 332 | </view> |
| @@ -170,7 +170,7 @@ Page({ | @@ -170,7 +170,7 @@ Page({ | ||
| 170 | onChange: 'birthdayChange', | 170 | onChange: 'birthdayChange', |
| 171 | }, | 171 | }, |
| 172 | startDate: { | 172 | startDate: { |
| 173 | - label: '在职受雇日期', | 173 | + label: '任职受雇日期', |
| 174 | bindtype: 'startday', | 174 | bindtype: 'startday', |
| 175 | placeholder: '请选择受雇日期', | 175 | placeholder: '请选择受雇日期', |
| 176 | selected: '', | 176 | selected: '', |
| @@ -758,7 +758,8 @@ Page({ | @@ -758,7 +758,8 @@ Page({ | ||
| 758 | console.log("date", Date.parse(new Date(this.data.birthday)) / 1000) | 758 | console.log("date", Date.parse(new Date(this.data.birthday)) / 1000) |
| 759 | var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); | 759 | var regEmail = new RegExp("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"); |
| 760 | var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/; | 760 | var regname = /^[\u4E00-\u9FA5\uf900-\ufa2d·s]{2,20}$/; |
| 761 | - var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/; | 761 | + // var regMoney = /^[0-9]*(\.[0,9]{1,2})?$/; |
| 762 | + var regMoney = /^([1-9][\d]{0,10}|0)(\.[\d]{1,2})?$/ | ||
| 762 | var formdata = e.detail.value; | 763 | var formdata = e.detail.value; |
| 763 | console.log("formdata", formdata) | 764 | console.log("formdata", formdata) |
| 764 | console.log("card_number", this.data.card_number) | 765 | console.log("card_number", this.data.card_number) |
| @@ -837,7 +838,7 @@ Page({ | @@ -837,7 +838,7 @@ Page({ | ||
| 837 | "family_ties": that.data.relativeData.selected, | 838 | "family_ties": that.data.relativeData.selected, |
| 838 | "native": "中国", | 839 | "native": "中国", |
| 839 | "id_card_type": that.data.cardtypeData.selected, | 840 | "id_card_type": that.data.cardtypeData.selected, |
| 840 | - "id_card_no": that.data.card_number, | 841 | + "id_card_no": formdata.id_card_no ?formdata.id_card_no:that.data.card_number, |
| 841 | "gender": that.data.genderData.selected, | 842 | "gender": that.data.genderData.selected, |
| 842 | "birth_date": that.data.long_birth_date, | 843 | "birth_date": that.data.long_birth_date, |
| 843 | "profession": request_profession, | 844 | "profession": request_profession, |
| @@ -294,7 +294,7 @@ | @@ -294,7 +294,7 @@ | ||
| 294 | <view class="divide_line"></view> | 294 | <view class="divide_line"></view> |
| 295 | <view class='item_body '> | 295 | <view class='item_body '> |
| 296 | <text class='text_666_28 float_left'>公司股本总额</text> | 296 | <text class='text_666_28 float_left'>公司股本总额</text> |
| 297 | - <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> | 297 | + <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> |
| 298 | </view> | 298 | </view> |
| 299 | <view class="divide_line"></view> | 299 | <view class="divide_line"></view> |
| 300 | <!-- <view class='item_body '> | 300 | <!-- <view class='item_body '> |
| @@ -327,7 +327,7 @@ | @@ -327,7 +327,7 @@ | ||
| 327 | <view class="divide_line" ></view> | 327 | <view class="divide_line" ></view> |
| 328 | <view class='item_body' > | 328 | <view class='item_body' > |
| 329 | <text class='text_666_28 float_left '>个人投资总额</text> | 329 | <text class='text_666_28 float_left '>个人投资总额</text> |
| 330 | - <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> | 330 | + <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> |
| 331 | </view> | 331 | </view> |
| 332 | <view class="divide_line"></view> | 332 | <view class="divide_line"></view> |
| 333 | </view> | 333 | </view> |
| @@ -96,12 +96,13 @@ Page({ | @@ -96,12 +96,13 @@ Page({ | ||
| 96 | wx.showLoading({ | 96 | wx.showLoading({ |
| 97 | title: '上传图片中...', | 97 | title: '上传图片中...', |
| 98 | }) | 98 | }) |
| 99 | + console.log('key', 'imagepath_' + path.substring(path.length - 10, path.length)) | ||
| 99 | wx.uploadFile({ | 100 | wx.uploadFile({ |
| 100 | url: OSSUrl, | 101 | url: OSSUrl, |
| 101 | filePath: path, | 102 | filePath: path, |
| 102 | name: 'file', | 103 | name: 'file', |
| 103 | formData: { | 104 | formData: { |
| 104 | - 'key': 'imagepath_' + path.substring(path.length - 10, path.length), | 105 | + 'key': 'imagepath_' + path.substring(path.length - 10, path.length)+".png", |
| 105 | 'OSSAccessKeyId': OSSInit.access_key_id, | 106 | 'OSSAccessKeyId': OSSInit.access_key_id, |
| 106 | 'policy': OSSInit.policy, | 107 | 'policy': OSSInit.policy, |
| 107 | 'signature': OSSInit.signature, | 108 | 'signature': OSSInit.signature, |
| @@ -185,23 +186,20 @@ Page({ | @@ -185,23 +186,20 @@ Page({ | ||
| 185 | }, | 186 | }, |
| 186 | success: function(res) { | 187 | success: function(res) { |
| 187 | console.log('suc', res) | 188 | console.log('suc', res) |
| 188 | - if (res.statusCode < 300) { | 189 | + if (res.statusCode == 300) { |
| 189 | that.setData({ | 190 | that.setData({ |
| 190 | idInfo: res.data.item | 191 | idInfo: res.data.item |
| 191 | }) | 192 | }) |
| 192 | console.log('suc', that.data.idInfo) | 193 | console.log('suc', that.data.idInfo) |
| 193 | } else { | 194 | } else { |
| 194 | - wx.showToast({ | ||
| 195 | - image: "/images/error.png", | ||
| 196 | - duration: 2000, | ||
| 197 | - title: res.data.message ? res.data.message : "数据错误" | ||
| 198 | - }); | 195 | + wx.showModal({ |
| 196 | + title: '', | ||
| 197 | + content: res.data.message ? res.data.message : "数据错误", | ||
| 198 | + }) | ||
| 199 | } | 199 | } |
| 200 | - wx.hideLoading() | ||
| 201 | }, | 200 | }, |
| 202 | fail(res) { | 201 | fail(res) { |
| 203 | console.log('fail', res.data) | 202 | console.log('fail', res.data) |
| 204 | - wx.hideLoading() | ||
| 205 | }, | 203 | }, |
| 206 | complete(res){ | 204 | complete(res){ |
| 207 | console.log('complete', res.data) | 205 | console.log('complete', res.data) |
请
注册
或
登录
后发表评论