wangyu / naturalPersonTax · 提交

提交 947650188ba2aded3d859461df7e04eb3c4bae7b

作者 wangyu
1 个父辈 b17062cc
构建： 未知

自然人演示版本修改完成

内嵌 并排对比
正在显示 9 个修改的文件 包含 160 行增加 和 51 行删除
@@ -2,6 +2,9 @@ @@ -2,6 +2,9 @@
2 "pages": [ 2 "pages": [
3 "pages/main/guide/guide", 3 "pages/main/guide/guide",
4 "pages/getPhone/getPhone", 4 "pages/getPhone/getPhone",
  5 +
  6 + "pages/main/smartchat/chat",
  7 +
5 "pages/main/taxperson/home", 8 "pages/main/taxperson/home",
6 "pages/main/taxperson/editinfo/editinfo", 9 "pages/main/taxperson/editinfo/editinfo",
7 "pages/main/taxperson/addinfo/addinfo", 10 "pages/main/taxperson/addinfo/addinfo",
@@ -509,7 +509,7 @@ Page({ @@ -509,7 +509,7 @@ Page({
509 newdata.taxperson_relative = this.data.taxperson_relativeData.selected 509 newdata.taxperson_relative = this.data.taxperson_relativeData.selected
510 break; 510 break;
511 case '4': 511 case '4':
512 - console.log('TITLE',this.data.title) 512 + console.log('TITLE', this.data.title)
513 if (!formdata.lover_name || formdata.lover_name.length < 1) { 513 if (!formdata.lover_name || formdata.lover_name.length < 1) {
514 this.showToast('请填写配偶姓名') 514 this.showToast('请填写配偶姓名')
515 return 515 return
@@ -548,7 +548,7 @@ Page({ @@ -548,7 +548,7 @@ Page({
548 this.showToast('请选择贷款期限') 548 this.showToast('请选择贷款期限')
549 return 549 return
550 } 550 }
551 - newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2] 551 + newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
552 newdata.identify_type = this.data.identifytypeData.selected 552 newdata.identify_type = this.data.identifytypeData.selected
553 newdata.loan_type = this.data.loantypeData.selected 553 newdata.loan_type = this.data.loantypeData.selected
554 newdata.payback_date = this.data.firstpaybackDate.selected 554 newdata.payback_date = this.data.firstpaybackDate.selected
@@ -576,12 +576,12 @@ Page({ @@ -576,12 +576,12 @@ Page({
576 this.showToast('请选择日期') 576 this.showToast('请选择日期')
577 return 577 return
578 } 578 }
579 - newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2] 579 + newdata.house_location = this.data.houseLocateInfo.address_value[0] + this.data.houseLocateInfo.address_value[1] + this.data.houseLocateInfo.address_value[2]
580 newdata.lease_type = this.data.leasetypeData.selected 580 newdata.lease_type = this.data.leasetypeData.selected
581 newdata.identify_type = this.data.identifytypeData.selected 581 newdata.identify_type = this.data.identifytypeData.selected
582 newdata.lease_startdate = this.data.leasestartDate.selected 582 newdata.lease_startdate = this.data.leasestartDate.selected
583 newdata.lease_enddate = this.data.leaseendDate.selected 583 newdata.lease_enddate = this.data.leaseendDate.selected
584 - Console.log('houseLocateInfo',this.data.houseLocateInfo) 584 + Console.log('houseLocateInfo', this.data.houseLocateInfo)
585 } 585 }
586 newdata.lover_cardtype = this.data.lovercardtypeData.selected 586 newdata.lover_cardtype = this.data.lovercardtypeData.selected
587 newdata.lover_birthdate = this.data.loverbirthDate.selected 587 newdata.lover_birthdate = this.data.loverbirthDate.selected
@@ -773,6 +773,12 @@ Page({ @@ -773,6 +773,12 @@ Page({
773 console.log('house_locate', e) 773 console.log('house_locate', e)
774 var house_address = this.data.houseLocateInfo; 774 var house_address = this.data.houseLocateInfo;
775 house_address.address_value = e.detail.value 775 house_address.address_value = e.detail.value
  776 + if (e.detail.value[0] == e.detail.value[1]) {
  777 + house_address.selected = e.detail.value[1] + e.detail.value[2]
  778 + } else {
  779 + house_address.selected = e.detail.value[0] + e.detail.value[1] + e.detail.value[2]
  780 +
  781 + }
776 this.setData({ 782 this.setData({
777 houseLocateInfo: house_address 783 houseLocateInfo: house_address
778 }) 784 })
@@ -65,6 +65,12 @@ Page({ @@ -65,6 +65,12 @@ Page({
65 }) 65 })
66 }, 66 },
67 67
  68 + gochat: function () {
  69 + wx.navigateTo({
  70 + url: '../smartchat/chat',
  71 + })
  72 + },
  73 +
68 /** 74 /**
69 * 生命周期函数--监听页面隐藏 75 * 生命周期函数--监听页面隐藏
70 */ 76 */
1 <!--pages/main/guide/guide.wxml--> 1 <!--pages/main/guide/guide.wxml-->
2 2
3 -<scroll-view class='page'>  
4 - <view class="bg_wrap">  
5 - <image class='bgimg' src='/images/guide_bg.jpg'></image>  
6 -  
7 - <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>  
8 - <image class="icon_wrap" src="/images/tax_person.png"></image>  
9 - <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>  
10 - <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>  
11 - <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>  
12 - <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>  
13 - </view>  
14 - <image class='arrow_wrap' src='/images/arrow_right.png'></image>  
15 - </view> 3 +<view class='page'>
  4 + <scroll-view>
  5 + <view class="bg_wrap">
16 6
17 - <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>  
18 - <image class="icon_wrap" src="/images/additional_deduction.png"></image>  
19 - <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>  
20 - <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>  
21 - <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>  
22 - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>上传可抵扣的专项附加扣除费用票据</text> 7 + <image class='bgimg' src='/images/guide_bg.jpg'></image>
  8 +
  9 + <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
  10 + <image class="icon_wrap" src="/images/tax_person.png"></image>
  11 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  12 + <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
  13 + <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>自然人信息采集</text>
  14 + <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>采集本人和家庭成员的基本信息</text>
  15 + </view>
  16 + <image class='arrow_wrap' src='/images/arrow_right.png'></image>
23 </view> 17 </view>
24 - <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>  
25 - </view>  
26 18
27 - <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>  
28 - <image class="icon_wrap" src="/images/advance_payment.png"></image>  
29 - <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>  
30 - <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>  
31 - <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>  
32 - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text> 19 + <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdditionalDiduction'>
  20 + <image class="icon_wrap" src="/images/additional_deduction.png"></image>
  21 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  22 + <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
  23 + <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
  24 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>上传可抵扣的专项附加扣除费用票据</text>
  25 + </view>
  26 + <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
33 </view> 27 </view>
34 - <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>  
35 - </view>  
36 28
37 - <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>  
38 - <image class="icon_wrap" src="/images/final_payment.png"></image>  
39 - <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>  
40 - <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>  
41 - <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>  
42 - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text> 29 + <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goAdvancePayment'>
  30 + <image class="icon_wrap" src="/images/advance_payment.png"></image>
  31 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  32 + <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
  33 + <text style='font-size: 36rpx;color: #000;font-weight:bold;'>预扣预缴</text>
  34 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看本人的个税扣缴明细</text>
  35 + </view>
  36 + <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
43 </view> 37 </view>
44 - <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>  
45 - </view>  
46 38
47 - <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>  
48 - <image class="icon_wrap" src="/images/tax_calculate.png"></image>  
49 - <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>  
50 - <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>  
51 - <text style='font-size: 36rpx;color: #666;'>个税计算器</text>  
52 - <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text> 39 + <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='goFinalPayment'>
  40 + <image class="icon_wrap" src="/images/final_payment.png"></image>
  41 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  42 + <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
  43 + <text style='font-size: 36rpx;color: #000;font-weight:bold;'>汇算清缴</text>
  44 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>查看个人年度税收信息，年度汇算清缴</text>
  45 + </view>
  46 + <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
53 </view> 47 </view>
54 - <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>  
55 - </view> -->  
56 - </view>  
57 48
58 -</scroll-view>  
  49 + <!-- <view class='card_rectangle_bg_row' style='margin-top:30rpx;padding:30rpx' bindtap='gotaxCalculate'>
  50 + <image class="icon_wrap" src="/images/tax_calculate.png"></image>
  51 + <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
  52 + <view style='display:flex;flex-direction: column;width:432rpx;margin-left:30rpx;align-self:center;'>
  53 + <text style='font-size: 36rpx;color: #666;'>个税计算器</text>
  54 + <text style='font-size:28rpx;color: #999;margin-top:6rpx'>正在开发中</text>
  55 + </view>
  56 + <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
  57 + </view> -->
  58 + </view>
  59 + </scroll-view>
  60 +
  61 + <!-- <image class='chat-img' bindtap='gochat' src='/images/selected02.png'></image> -->
  62 +
  63 +</view>
@@ -56,3 +56,11 @@ text-align: left; @@ -56,3 +56,11 @@ text-align: left;
56 height: 60rpx; 56 height: 60rpx;
57 align-self: center 57 align-self: center
58 } 58 }
  59 +
  60 +.chat-img{
  61 + width: 66rpx;
  62 + height: 66rpx;
  63 + position: fixed;
  64 + right: 40rpx;
  65 + bottom: 60rpx;
  66 +}
  1 +// pages/main/smartchat/chat.js
  2 +Page({
  3 +
  4 + /**
  5 + * Page initial data
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * Lifecycle function--Called when page load
  13 + */
  14 + onLoad: function (options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * Lifecycle function--Called when page is initially rendered
  20 + */
  21 + onReady: function () {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * Lifecycle function--Called when page show
  27 + */
  28 + onShow: function () {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * Lifecycle function--Called when page hide
  34 + */
  35 + onHide: function () {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * Lifecycle function--Called when page unload
  41 + */
  42 + onUnload: function () {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * Page event handler function--Called when user drop down
  48 + */
  49 + onPullDownRefresh: function () {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * Called when page reach bottom
  55 + */
  56 + onReachBottom: function () {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * Called when user click on the top right corner to share
  62 + */
  63 + onShareAppMessage: function () {
  64 +
  65 + }
  66 +})
  1 +{
  2 + "navigationBarTitleText": "智能助手"
  3 +}
  1 +<!--pages/main/smartchat/chat.wxml-->
  2 +<view>
  3 + <scroll-view>
  4 + <view wx:for="{{datas}}">
  5 + <view >666</view>
  6 + </view>
  7 + </scroll-view>
  8 + <view style=' width: 100%;height: 50rpx;position: fixed; bottom: 0rpx;text-align:center'>
  9 + <text>发送</text>
  10 + </view>
  11 +</view>
  1 +/* pages/main/smartchat/chat.wxss */
请 注册 或 登录 后发表评论