wangyu / naturalPersonTax · 提交

提交 48948b5837801062a1cffac228a5280ae36dcfcd

作者 wangyu
1 个父辈 d49966f6

优化。更新首页ui

内嵌 并排对比
正在显示 9 个修改的文件 包含 134 行增加 和 24 行删除
@@ -11,9 +11,10 @@ @@ -11,9 +11,10 @@
11 11
12 <view class="weui-cell__bd"> 12 <view class="weui-cell__bd">
13 <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'> 13 <picker mode="{{mode?mode:'selector'}}" range-key="{{range_key}}" range="{{values}}" fields="{{fields}}" start="{{start}}" end="{{end}}" bindchange="{{onChange}}" bindcolumnchange="{{onColumnChange}}" disabled="{{disabled}}" id='{{bindtype}}'>
14 - <view wx:if="{{selected&&!disabled}}" class="text_333_28 float_right">{{selected}}</view>  
15 - <view wx:else class="text_999_28 float_right">{{selected?selected:placeholder}}</view> 14 + <view wx:if="{{selected&&disabled&&disabled=='true'}}" class="text_999_28 float_right">{{selected}}</view>
  15 + <view wx:elif="{{selected}}" class="text_333_28 float_right">{{selected}}</view>
  16 + <view wx:else class="text_999_28 float_right">{{placeholder}}</view>
16 </picker> 17 </picker>
17 </view> 18 </view>
18 </view> 19 </view>
19 -</template> 20 +</template>
@@ -19,6 +19,8 @@ Page({ @@ -19,6 +19,8 @@ Page({
19 card_number: '', 19 card_number: '',
20 birthday: '', 20 birthday: '',
21 requestBody: {}, 21 requestBody: {},
  22 + is_certified:'',
  23 + idInfoData:'',
22 profession_index:[0,0,0], 24 profession_index:[0,0,0],
23 25
24 relativeData: { 26 relativeData: {
@@ -365,7 +367,16 @@ Page({ @@ -365,7 +367,16 @@ Page({
365 if (res.data && res.data.length>0) { 367 if (res.data && res.data.length>0) {
366 var id_info = JSON.parse(res.data) 368 var id_info = JSON.parse(res.data)
367 369
368 - var birth_day = id_info.birthday.year + '-' + id_info.birthday.month + '-' + id_info.birthday.day; 370 + var birth_day
  371 + if (id_info.birthday.month > 9 && id_info.birthday.day > 9) {
  372 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  373 + } else if (id_info.birthday.month > 9 && id_info.birthday.day < 10) {
  374 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-' + id_info.birthday.day;
  375 + } else if (id_info.birthday.month < 9 && id_info.birthday.day > 10) {
  376 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  377 + } else if (id_info.birthday.month < 9 && id_info.birthday.day < 10) {
  378 + birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
  379 + }
369 var cardtype_Data = that.data.cardtypeData 380 var cardtype_Data = that.data.cardtypeData
370 cardtype_Data.selected = '居民身份证' 381 cardtype_Data.selected = '居民身份证'
371 var gender_Data = that.data.genderData 382 var gender_Data = that.data.genderData
@@ -382,10 +393,13 @@ Page({ @@ -382,10 +393,13 @@ Page({
382 return 393 return
383 } 394 }
384 that.setData({ 395 that.setData({
  396 + is_certified:'active',
  397 + idInfoData: id_info,
385 name: id_info.name, 398 name: id_info.name,
386 birthday: birth_day, 399 birthday: birth_day,
387 cardtypeData: cardtype_Data, 400 cardtypeData: cardtype_Data,
388 genderData: gender_Data, 401 genderData: gender_Data,
  402 + long_birth_date: Date.parse(new Date(birth_day)) / 1000,
389 birthDate: that.data.birthDate, 403 birthDate: that.data.birthDate,
390 card_number: id_info.id_card_number 404 card_number: id_info.id_card_number
391 }) 405 })
@@ -700,13 +714,14 @@ Page({ @@ -700,13 +714,14 @@ Page({
700 url: baseUrl + 'persontax/v1/personal-taxes', 714 url: baseUrl + 'persontax/v1/personal-taxes',
701 method: "POST", 715 method: "POST",
702 data: { 716 data: {
  717 + 'certification_status':'',
703 "name": that.data.name.length > 0 ? that.data.name : formdata.name, 718 "name": that.data.name.length > 0 ? that.data.name : formdata.name,
704 "family_ties": that.data.relativeData.selected, 719 "family_ties": that.data.relativeData.selected,
705 "native": "中国", 720 "native": "中国",
706 "id_card_type": that.data.cardtypeData.selected, 721 "id_card_type": that.data.cardtypeData.selected,
707 "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number, 722 "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
708 "gender": that.data.genderData.selected, 723 "gender": that.data.genderData.selected,
709 - "birth_date": Date.parse(new Date(this.data.birthday)) / 1000, 724 + "birth_date": that.data.long_birth_date > 1000 ? that.data.long_birth_date:null,
710 "profession": { 725 "profession": {
711 "one_level_code": profession_data_info.value, 726 "one_level_code": profession_data_info.value,
712 "one_level_name": profession_data_info.label, 727 "one_level_name": profession_data_info.label,
@@ -17,6 +17,7 @@ Page({ @@ -17,6 +17,7 @@ Page({
17 cur_id: '', 17 cur_id: '',
18 isself: true, 18 isself: true,
19 isIdCard: true, 19 isIdCard: true,
  20 + is_certified:'',
20 profession_haschanges: false, 21 profession_haschanges: false,
21 name: '', 22 name: '',
22 mobile: '', 23 mobile: '',
@@ -284,7 +285,7 @@ Page({ @@ -284,7 +285,7 @@ Page({
284 this.data.relativeData.disabled = false 285 this.data.relativeData.disabled = false
285 this.data.relativeData.selected = tax_info.family_ties 286 this.data.relativeData.selected = tax_info.family_ties
286 } 287 }
287 - if (tax_info.real_auth_status == 'active') { 288 + if (tax_info.certification_status == 'active') {
288 this.data.genderData.disabled = true 289 this.data.genderData.disabled = true
289 this.data.birthDate.disabled = true 290 this.data.birthDate.disabled = true
290 this.data.cardtypeData.disabled = true 291 this.data.cardtypeData.disabled = true
@@ -528,6 +529,7 @@ Page({ @@ -528,6 +529,7 @@ Page({
528 return 529 return
529 } 530 }
530 that.setData({ 531 that.setData({
  532 + is_certified: 'active',
531 name: id_info.name, 533 name: id_info.name,
532 birthday: birth_day, 534 birthday: birth_day,
533 cardtypeData: cardtype_Data, 535 cardtypeData: cardtype_Data,
@@ -848,13 +850,14 @@ Page({ @@ -848,13 +850,14 @@ Page({
848 url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id, 850 url: baseUrl + 'persontax/v1/personal-taxes/' + that.data.cur_id,
849 method: "PUT", 851 method: "PUT",
850 data: { 852 data: {
  853 + 'certification_status': '',
851 "name": formdata.name.length > 0 ? formdata.name : that.data.name, 854 "name": formdata.name.length > 0 ? formdata.name : that.data.name,
852 "family_ties": that.data.relativeData.selected, 855 "family_ties": that.data.relativeData.selected,
853 "native": "中国", 856 "native": "中国",
854 "id_card_type": that.data.cardtypeData.selected, 857 "id_card_type": that.data.cardtypeData.selected,
855 "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number, 858 "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
856 "gender": that.data.genderData.selected, 859 "gender": that.data.genderData.selected,
857 - "birth_date": that.data.long_birth_date, 860 + "birth_date": that.data.long_birth_date > 1000 ? that.data.long_birth_date : null,
858 "profession": request_profession, 861 "profession": request_profession,
859 "education": that.data.degreeData.selected, 862 "education": that.data.degreeData.selected,
860 "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no, 863 "taxpayer_no": formdata.taxpayer_no ? formdata.taxpayer_no : that.data.taxInfo.taxpayer_no,
@@ -13,7 +13,10 @@ @@ -13,7 +13,10 @@
13 <view class='item_body'> 13 <view class='item_body'>
14 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 14 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
15 <text class='text_black_28 float_left'>姓名</text> 15 <text class='text_black_28 float_left'>姓名</text>
16 - <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.real_auth_status=='active'}}" ></input> 16 + <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
  17 +
  18 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入姓名" value='{{name}}' name='name' disabled="{{taxInfo.certification_status=='active'}}" ></input>
  19 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" name='name' disabled="{{taxInfo.certification_status=='active'}}"></input>
17 </view> 20 </view>
18 <view class="divide_line"></view> 21 <view class="divide_line"></view>
19 <!-- <view class='item_body' bindtap='openpicker'> 22 <!-- <view class='item_body' bindtap='openpicker'>
@@ -46,7 +49,10 @@ @@ -46,7 +49,10 @@
46 <view class='item_body' hidden="{{!isself}}"> 49 <view class='item_body' hidden="{{!isself}}">
47 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 50 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
48 <text class='text_black_28 float_left'>姓名</text> 51 <text class='text_black_28 float_left'>姓名</text>
49 - <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{taxInfo.real_auth_status=='active'&&name?name:'请输入姓名'}}" disabled="{{taxInfo.real_auth_status=='active'}}" ></input> 52 + <!-- <input class='input_wrap float_right' placeholder-class='text_999_28' placeholder="{{taxInfo.certification_status=='active'&&name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}"></input> -->
  53 +
  54 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入姓名" value='{{name}}' disabled="{{taxInfo.certification_status=='active'}}" ></input>
  55 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||name?name:'请输入姓名'}}" disabled="{{taxInfo.certification_status=='active'}}"></input>
50 </view> 56 </view>
51 <view class="divide_line"></view> 57 <view class="divide_line"></view>
52 58
@@ -78,13 +84,19 @@ @@ -78,13 +84,19 @@
78 <view class='item_body'> 84 <view class='item_body'>
79 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 85 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
80 <text class='text_black_28 float_left'>证照号码</text> 86 <text class='text_black_28 float_left'>证照号码</text>
81 - <view wx:if="{{isIdCard}}" > 87 + <view wx:if="{{isIdCard}}">
82 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image> 88 <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
83 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> --> 89 <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
84 - <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&card_number?card_number:'请输入证件号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.real_auth_status=='active'}}"></input> 90 + <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证件号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
  91 +<input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24'></input>
  92 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
  93 + maxlength='24'></input>
  94 +
85 </view> 95 </view>
86 <view wx:else> 96 <view wx:else>
87 - <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&card_number?card_number:'请输入证件号码'}}"placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.real_auth_status=='active'}}"></input> 97 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status==' active'}}" placeholder="请输入证件号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24'></input>
  98 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证件号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
  99 + maxlength='24'></input>
88 </view> 100 </view>
89 </view> 101 </view>
90 <view class="divide_line"></view> 102 <view class="divide_line"></view>
@@ -166,7 +178,7 @@ @@ -166,7 +178,7 @@
166 <view class="divide_line"></view> 178 <view class="divide_line"></view>
167 <view class='item_body'> 179 <view class='item_body'>
168 <text class='text_666_28 float_left'>备注</text> 180 <text class='text_666_28 float_left'>备注</text>
169 - <input class='input_wrap float_right' type='number' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注' ></input> 181 + <input class='input_wrap float_right' type='number' value='{{taxInfo.comment}}' name='comment' placeholder-class='text_999_28' placeholder='请输入备注'></input>
170 </view> 182 </view>
171 </view> 183 </view>
172 </view> 184 </view>
@@ -190,7 +202,9 @@ @@ -190,7 +202,9 @@
190 <view class='item_body'> 202 <view class='item_body'>
191 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text> 203 <text style='color:red;font-size: 28rpx;line-height: 80rpx;float:left'>*</text>
192 <text class='text_black_28 float_left'>联系电话</text> 204 <text class='text_black_28 float_left'>联系电话</text>
193 - <input class='input_wrap float_right' placeholder="{{taxInfo.real_auth_status=='active'&&mobile?mobile:'请输入电话'}}"name='mobile' type='number' disabled='{{isself}}' maxlength='11'></input> 205 + <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入电话" value='{{mobile}}' name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'}}" maxlength='11'></input>
  206 + <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||mobile?mobile:'请输入电话'}}" name='mobile' type='number' disabled="{{taxInfo.certification_status=='active'}}"
  207 + maxlength='11'></input>
194 </view> 208 </view>
195 <!-- 非必填部分02 --> 209 <!-- 非必填部分02 -->
196 <view hidden='{{!isshow02}}'> 210 <view hidden='{{!isshow02}}'>
@@ -324,8 +338,8 @@ @@ -324,8 +338,8 @@
324 <text class='text_333_28 float_right '></text> 338 <text class='text_333_28 float_right '></text>
325 </view> --> 339 </view> -->
326 <template is="picker_cell_normal" data="{{...investpersonalInfo}}" /> 340 <template is="picker_cell_normal" data="{{...investpersonalInfo}}" />
327 - <view class="divide_line" ></view>  
328 - <view class='item_body' > 341 + <view class="divide_line"></view>
  342 + <view class='item_body'>
329 <text class='text_666_28 float_left '>个人投资总额</text> 343 <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='13'></input> 344 <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> 345 </view>
1 <!--pages/main/guide/guide.wxml--> 1 <!--pages/main/guide/guide.wxml-->
2 2
3 <view class='page'> 3 <view class='page'>
4 - <image src='/images/tax_person.png' style='height:460rpx;width:690rpx;margin:30rpx ;align-items:center' bindtap='gotaxPerson'> 4 + <!-- <image src='/images/tax_person.png' style='height:460rpx;width:690rpx;margin:30rpx ;align-items:center' bindtap='gotaxPerson'>
5 </image> 5 </image>
6 <image src='/images/tax_calculate.png' style='height:460rpx;width:690rpx;margin:0 30rpx ;align-items:center' bindtap='gotaxCalculate'> 6 <image src='/images/tax_calculate.png' style='height:460rpx;width:690rpx;margin:0 30rpx ;align-items:center' bindtap='gotaxCalculate'>
7 - </image>  
8 - <!-- <image class='img_wrap' src='/images/tax_calculate.png' style='margin-top:30rpx'></image> --> 7 + </image> -->
  8 + <view class="bg_wrap">
  9 + <image class='bgimg' src='/images/guide_bg.png'></image>
  10 + </view>
  11 +
  12 + <view class='card_rectangle_bg' style='margin-top:360rpx;padding:30rpx' bindtap='gotaxPerson'>
  13 + <image class="icon_wrap" src="/images/taxperson.png"></image>
  14 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  15 + <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
  16 + <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
  17 + <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
  18 + </view>
  19 + <image class='arrow_wrap'src='/images/arrow_right.png'></image>
  20 + </view>
  21 +
  22 + <view class='card_rectangle_bg' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
  23 + <image class="icon_wrap" src="/images/taxcalculate.png"></image>
  24 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  25 + <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
  26 + <text style='font-size: 36rpx;color: #666;'>个税计算器</text>
  27 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text>
  28 + </view>
  29 + <image class='arrow_wrap float_right'src='/images/arrow_right.png'></image>
  30 + </view>
  31 +
9 </view> 32 </view>
@@ -16,12 +16,66 @@ img_wrap { @@ -16,12 +16,66 @@ img_wrap {
16 color: #fff; 16 color: #fff;
17 letter-spacing: 0; 17 letter-spacing: 0;
18 margin-left: 90rpx; 18 margin-left: 90rpx;
19 - margin-top: 20rpx 19 + margin-top: 20rpx;
20 } 20 }
21 21
22 -text_wrap2{ 22 +text_wrap2 {
23 font-family: PingFang-SC-Medium; 23 font-family: PingFang-SC-Medium;
24 -font-size: 16px;  
25 -color: #FFFFFF; 24 + font-size: 16px;
  25 + color: #fff;
  26 + letter-spacing: 0;
  27 +}
  28 +
  29 +.bgimg {
  30 + position: absolute;
  31 + height: 400rpx;
  32 + width: 100%;
  33 +}
  34 +
  35 +.card_rectangle_bg {
  36 + position: relative;
  37 + margin: 0 auto;
  38 + display: flex;
  39 + flex-direction: row;
  40 + width: 86%;
  41 + /* margin-left: 30rpx;
  42 + margin-right: 30rpx; */
  43 + background: #fff;
  44 + box-shadow: 0 4px 14px 0 rgba(208, 208, 208, 0.50);
  45 + border-radius: 8px;
  46 +}
  47 +
  48 +.bg_wrap {
  49 + position: relative;
  50 + display: flex;
  51 + flex-direction: column;
  52 + background-color: #fff;
  53 + width: 100%;
  54 +}
  55 +
  56 +.icon_wrap{
  57 + width: 100rpx;
  58 + height: 100rpx;
  59 + align-self: center
  60 +}
  61 +
  62 +text_wrap_main_black{
  63 +font-size: 36rpx;
  64 +color: #000;
26 letter-spacing: 0; 65 letter-spacing: 0;
27 -}  
  66 +text-align: left;
  67 +}
  68 +
  69 +text_wrap_sub_999{
  70 +font-size: 28rpx;
  71 +color: #999;
  72 +letter-spacing: 0;
  73 +text-align: left;
  74 +}
  75 +
  76 +.arrow_wrap {
  77 + position: relative;
  78 + width: 60rpx;
  79 + height: 60rpx;
  80 + align-self: center
  81 +}
请 注册 或 登录 后发表评论